From f99dbff722b404905d5da27c7f8ee906e432e4f5 Mon Sep 17 00:00:00 2001 From: carl-nokia <63672637+carl-nokia@users.noreply.github.com> Date: Wed, 6 Jan 2021 18:09:13 -0500 Subject: [PATCH] [Nokia]: Enable Telemetry for armhf and provide required qos files (#6364) * [platform][Nokia]: Add buffers and qos files for config qos reload - providing required files * [platform][armhf]: remove hardcoded disable for Telemetry on armhf Co-authored-by: Carl Keene --- .../armhf-nokia_ixs7215_52x-r0/Nokia-7215/buffers.json.j2 | 8 ++++++++ .../armhf-nokia_ixs7215_52x-r0/Nokia-7215/qos.json.j2 | 1 + platform/marvell-armhf/rules.mk | 1 - slave.mk | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/buffers.json.j2 create mode 100644 device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/qos.json.j2 diff --git a/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/buffers.json.j2 b/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/buffers.json.j2 new file mode 100644 index 0000000000..9495a66c0d --- /dev/null +++ b/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/buffers.json.j2 @@ -0,0 +1,8 @@ +{# Default values placeholder M0- Marvell SAI TBD buffers configuration #} + +{% set default_cable = '40m' %} +{% set default_ports_num = 54 -%} + +{# Port configuration to cable length look-up table #} +{# Each record describes mapping of DUT (DUT port) role and neighbor role to cable length #} +{# Roles described in the minigraph #} diff --git a/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/qos.json.j2 b/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/qos.json.j2 new file mode 100644 index 0000000000..529f1be8a5 --- /dev/null +++ b/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/qos.json.j2 @@ -0,0 +1 @@ +# this file empty temporarily until qos supported SAI Marvell diff --git a/platform/marvell-armhf/rules.mk b/platform/marvell-armhf/rules.mk index e53f9531b8..27d3167edd 100644 --- a/platform/marvell-armhf/rules.mk +++ b/platform/marvell-armhf/rules.mk @@ -10,7 +10,6 @@ include $(PLATFORM_PATH)/linux-kernel-armhf.mk include $(PLATFORM_PATH)/platform-et6448m.mk include $(PLATFORM_PATH)/platform-nokia.mk -INCLUDE_SYSTEM_TELEMETRY = "" ENABLE_SYNCD_RPC = "" INCLUDE_MGMT_FRAMEWORK = "" diff --git a/slave.mk b/slave.mk index 18e70542f8..686ecec5c5 100644 --- a/slave.mk +++ b/slave.mk @@ -116,7 +116,7 @@ ifeq ($(SONIC_INCLUDE_SYSTEM_TELEMETRY),y) INCLUDE_SYSTEM_TELEMETRY = y endif -ifneq (,$(filter $(CONFIGURED_ARCH), armhf arm64)) +ifneq (,$(filter $(CONFIGURED_ARCH), arm64)) # Workaround: Force disable Telmetry for ARM, will be removed after fixing issue # Issue: qemu crashes when it uses "go get url" # Qemu Support: https://bugs.launchpad.net/qemu/+bug/1838946