From 3802585d0738425c859821db3b8046698ab46e2d Mon Sep 17 00:00:00 2001 From: saksarav-nokia Date: Thu, 28 Jul 2022 12:23:31 -0400 Subject: [PATCH] [Nokia][Nokia-IXR7250E-36x400G] Updated BCM config file to disable the cmic dma abort during cold boot (#11378) * [Nokia][Nokia-IXR7250E-36x400G] Updated BCM config file to disable the cmic dma abort during cold boot Signed-off-by: Sakthivadivu Saravanaraj * [Nokia][Nokia-IXR7250E-36x400G] Added cmic_dma_abort_in_cold_boot to src/sonic-device-data/tests/permitted_list Signed-off-by: Sakthivadivu Saravanaraj * [NOKIA][Nokia-IXR7250E-36x100G & Nokia-IXR7250E-36x400G] Modified the header settings used for recycle port Ethernet-Rec Signed-off-by: Sakthivadivu Saravanaraj --- .../0/jr2cp-nokia-18x100g-4x25g-config.bcm | 4 ++-- .../1/jr2cp-nokia-18x100g-4x25g-config.bcm | 4 ++-- .../Nokia-IXR7250E-36x400G/0/jr2cp-nokia-18x400g-config.bcm | 5 +++-- .../Nokia-IXR7250E-36x400G/1/jr2cp-nokia-18x400g-config.bcm | 5 +++-- src/sonic-device-data/tests/permitted_list | 1 + 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/jr2cp-nokia-18x100g-4x25g-config.bcm b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/jr2cp-nokia-18x100g-4x25g-config.bcm index 0fae026933..72c101facb 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/jr2cp-nokia-18x100g-4x25g-config.bcm +++ b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/jr2cp-nokia-18x100g-4x25g-config.bcm @@ -1496,7 +1496,7 @@ tm_port_header_type_in_202.BCM8885X=INJECTED_2_PP tm_port_header_type_in_203.BCM8885X=INJECTED_2_PP tm_port_header_type_in_232.BCM8885X=INJECTED_2 tm_port_header_type_in_19.BCM8885X=ETH -tm_port_header_type_in_20.BCM8885X=INJECTED_2 +tm_port_header_type_in_20.BCM8885X=ETH tm_port_header_type_out_0.BCM8885X=CPU tm_port_header_type_out_200.BCM8885X=ETH tm_port_header_type_out_201.BCM8885X=ETH @@ -1504,7 +1504,7 @@ tm_port_header_type_out_202.BCM8885X=ETH tm_port_header_type_out_203.BCM8885X=ETH tm_port_header_type_out_232.BCM8885X=CPU tm_port_header_type_out_19.BCM8885X=ETH -tm_port_header_type_out_20.BCM8885X=RAW +tm_port_header_type_out_20.BCM8885X=ETH tslam_intr_enable.BCM8885X=0 tslam_timeout_usec.BCM8885X=1000000 ucode_port_0.BCM8885X=CPU.0:core_0.0 diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/jr2cp-nokia-18x100g-4x25g-config.bcm b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/jr2cp-nokia-18x100g-4x25g-config.bcm index 33af71fd8a..cc6d41ea3d 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/jr2cp-nokia-18x100g-4x25g-config.bcm +++ b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/jr2cp-nokia-18x100g-4x25g-config.bcm @@ -1515,7 +1515,7 @@ tm_port_header_type_in_202.BCM8885X=INJECTED_2_PP tm_port_header_type_in_203.BCM8885X=INJECTED_2_PP tm_port_header_type_in_232.BCM8885X=INJECTED_2 tm_port_header_type_in_19.BCM8885X=ETH -tm_port_header_type_in_20.BCM8885X=INJECTED_2 +tm_port_header_type_in_20.BCM8885X=ETH tm_port_header_type_out_0.BCM8885X=CPU tm_port_header_type_out_200.BCM8885X=ETH tm_port_header_type_out_201.BCM8885X=ETH @@ -1523,7 +1523,7 @@ tm_port_header_type_out_202.BCM8885X=ETH tm_port_header_type_out_203.BCM8885X=ETH tm_port_header_type_out_232.BCM8885X=CPU tm_port_header_type_out_19.BCM8885X=ETH -tm_port_header_type_out_20.BCM8885X=RAW +tm_port_header_type_out_20.BCM8885X=ETH tslam_intr_enable.BCM8885X=0 tslam_timeout_usec.BCM8885X=1000000 ucode_port_0.BCM8885X=CPU.0:core_0.0 diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/jr2cp-nokia-18x400g-config.bcm b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/jr2cp-nokia-18x400g-config.bcm index 264cfb30a3..5303bb263b 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/jr2cp-nokia-18x400g-config.bcm +++ b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/jr2cp-nokia-18x400g-config.bcm @@ -1515,7 +1515,7 @@ tm_port_header_type_in_202.BCM8885X=INJECTED_2_PP tm_port_header_type_in_203.BCM8885X=INJECTED_2_PP tm_port_header_type_in_232.BCM8885X=INJECTED_2 tm_port_header_type_in_19.BCM8885X=ETH -tm_port_header_type_in_20.BCM8885X=INJECTED_2 +tm_port_header_type_in_20.BCM8885X=ETH tm_port_header_type_out_0.BCM8885X=CPU tm_port_header_type_out_200.BCM8885X=ETH tm_port_header_type_out_201.BCM8885X=ETH @@ -1523,7 +1523,7 @@ tm_port_header_type_out_202.BCM8885X=ETH tm_port_header_type_out_203.BCM8885X=ETH tm_port_header_type_out_232.BCM8885X=CPU tm_port_header_type_out_19.BCM8885X=ETH -tm_port_header_type_out_20.BCM8885X=RAW +tm_port_header_type_out_20.BCM8885X=ETH tslam_intr_enable.BCM8885X=0 tslam_timeout_usec.BCM8885X=1000000 ucode_port_0.BCM8885X=CPU.0:core_0.0 @@ -2055,3 +2055,4 @@ modreg IPS_FORCE_LOCAL_OR_FABRIC FORCE_FABRIC=1 xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2 xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4 +cmic_dma_abort_in_cold_boot=0 diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/jr2cp-nokia-18x400g-config.bcm b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/jr2cp-nokia-18x400g-config.bcm index 733ab75004..eb58c1ca42 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/jr2cp-nokia-18x400g-config.bcm +++ b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/jr2cp-nokia-18x400g-config.bcm @@ -1515,7 +1515,7 @@ tm_port_header_type_in_202.BCM8885X=INJECTED_2_PP tm_port_header_type_in_203.BCM8885X=INJECTED_2_PP tm_port_header_type_in_232.BCM8885X=INJECTED_2 tm_port_header_type_in_19.BCM8885X=ETH -tm_port_header_type_in_20.BCM8885X=INJECTED_2 +tm_port_header_type_in_20.BCM8885X=ETH tm_port_header_type_out_0.BCM8885X=CPU tm_port_header_type_out_200.BCM8885X=ETH tm_port_header_type_out_201.BCM8885X=ETH @@ -1523,7 +1523,7 @@ tm_port_header_type_out_202.BCM8885X=ETH tm_port_header_type_out_203.BCM8885X=ETH tm_port_header_type_out_232.BCM8885X=CPU tm_port_header_type_out_19.BCM8885X=ETH -tm_port_header_type_out_20.BCM8885X=RAW +tm_port_header_type_out_20.BCM8885X=ETH tslam_intr_enable.BCM8885X=0 tslam_timeout_usec.BCM8885X=1000000 ucode_port_0.BCM8885X=CPU.0:core_0.0 @@ -2057,3 +2057,4 @@ modreg IPS_FORCE_LOCAL_OR_FABRIC FORCE_FABRIC=1 xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2 xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4 +cmic_dma_abort_in_cold_boot=0 diff --git a/src/sonic-device-data/tests/permitted_list b/src/sonic-device-data/tests/permitted_list index 3175e096cd..41932882a3 100644 --- a/src/sonic-device-data/tests/permitted_list +++ b/src/sonic-device-data/tests/permitted_list @@ -319,3 +319,4 @@ system_ref_core_clock_khz xflow_macsec_secure_chan_to_num_secure_assoc_encrypt xflow_macsec_secure_chan_to_num_secure_assoc_decrypt sai_mdio_access_clause22 +cmic_dma_abort_in_cold_boot