Merge pull request sonic-net#254 from gechiang/202205

202205 manual cherry pick PRs: [chassis][voq] update the sai_post_init soc file with interrupt ids sonic-net#18066 and [Nokia-IXR7250E][Devicedata] Update the device data for Nokia IXR7250… sonic-net#18063
mlok-nokia · Feb 8, 2024 · 784dc83 · 784dc83
2 parents 8ba90dc + b268cb5
commit 784dc83
Show file tree

Hide file tree

Showing 8 changed files with 120 additions and 4 deletions.
diff --git a/...4-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/jr2cp-nokia-18x100g-4x25g-config.bcm b/...4-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/jr2cp-nokia-18x100g-4x25g-config.bcm
@@ -2095,3 +2095,4 @@ sai_pfc_dlr_init_capability=0
 sai_disable_srcmacqedstmac_ctrl=1
 trunk_group_max_members=16
 sai_default_cpu_tx_tc=7
+sai_postinit_cmd_file=/usr/share/sonic/hwsku/sai_postinit_cmd.soc
diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/sai_postinit_cmd.soc b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/sai_postinit_cmd.soc
@@ -1 +1,29 @@
+INTeRrupt ENAble id=2209
+INTeRrupt ENAble id=2210
+INTeRrupt ENAble id=2211
+INTeRrupt ENAble id=2212
+INTeRrupt ENAble id=2213
+INTeRrupt ENAble id=2214
+INTeRrupt ENAble id=2215
+INTeRrupt ENAble id=2216
+INTeRrupt ENAble id=2217
+INTeRrupt ENAble id=2218
+INTeRrupt ENAble id=2219
+INTeRrupt ENAble id=2220
+INTeRrupt ENAble id=2221
+INTeRrupt ENAble id=2222
+INTeRrupt ENAble id=2223
+INTeRrupt ENAble id=2224
+INTeRrupt ENAble id=2225
+INTeRrupt ENAble id=2226
 
+INTeRrupt ENAble id=482
+INTeRrupt ENAble id=483
+INTeRrupt ENAble id=484
+INTeRrupt ENAble id=485
+INTeRrupt ENAble id=486
+INTeRrupt ENAble id=487
+INTeRrupt ENAble id=488
+
+INTeRrupt ENAble id=1597
+debug intr error
diff --git a/...4-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/jr2cp-nokia-18x100g-4x25g-config.bcm b/...4-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/jr2cp-nokia-18x100g-4x25g-config.bcm
@@ -2096,3 +2096,4 @@ sai_pfc_dlr_init_capability=0
 sai_disable_srcmacqedstmac_ctrl=1
 trunk_group_max_members=16
 sai_default_cpu_tx_tc=7
+sai_postinit_cmd_file=/usr/share/sonic/hwsku/sai_postinit_cmd.soc
diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/sai_postinit_cmd.soc b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/sai_postinit_cmd.soc
@@ -1 +1,29 @@
+INTeRrupt ENAble id=2209
+INTeRrupt ENAble id=2210
+INTeRrupt ENAble id=2211
+INTeRrupt ENAble id=2212
+INTeRrupt ENAble id=2213
+INTeRrupt ENAble id=2214
+INTeRrupt ENAble id=2215
+INTeRrupt ENAble id=2216
+INTeRrupt ENAble id=2217
+INTeRrupt ENAble id=2218
+INTeRrupt ENAble id=2219
+INTeRrupt ENAble id=2220
+INTeRrupt ENAble id=2221
+INTeRrupt ENAble id=2222
+INTeRrupt ENAble id=2223
+INTeRrupt ENAble id=2224
+INTeRrupt ENAble id=2225
+INTeRrupt ENAble id=2226
 
+INTeRrupt ENAble id=482
+INTeRrupt ENAble id=483
+INTeRrupt ENAble id=484
+INTeRrupt ENAble id=485
+INTeRrupt ENAble id=486
+INTeRrupt ENAble id=487
+INTeRrupt ENAble id=488
+
+INTeRrupt ENAble id=1597
+debug intr error
diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/sai_postinit_cmd.soc b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/sai_postinit_cmd.soc
@@ -36,3 +36,32 @@ phy set 17 reg=0xd137 data=0      lane=2
 phy set 17 reg=0xd138 data=0      lane=2
 phy set 17 reg=0xd133 data=0x1804 lane=2
 
+INTeRrupt ENAble id=2209
+INTeRrupt ENAble id=2210
+INTeRrupt ENAble id=2211
+INTeRrupt ENAble id=2212
+INTeRrupt ENAble id=2213
+INTeRrupt ENAble id=2214
+INTeRrupt ENAble id=2215
+INTeRrupt ENAble id=2216
+INTeRrupt ENAble id=2217
+INTeRrupt ENAble id=2218
+INTeRrupt ENAble id=2219
+INTeRrupt ENAble id=2220
+INTeRrupt ENAble id=2221
+INTeRrupt ENAble id=2222
+INTeRrupt ENAble id=2223
+INTeRrupt ENAble id=2224
+INTeRrupt ENAble id=2225
+INTeRrupt ENAble id=2226
+
+INTeRrupt ENAble id=482
+INTeRrupt ENAble id=483
+INTeRrupt ENAble id=484
+INTeRrupt ENAble id=485
+INTeRrupt ENAble id=486
+INTeRrupt ENAble id=487
+INTeRrupt ENAble id=488
+
+INTeRrupt ENAble id=1597
+debug intr error
diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/sai_postinit_cmd.soc b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/sai_postinit_cmd.soc
@@ -13,3 +13,32 @@ phy set 8 reg=0xd137 data=0      lane=1
 phy set 8 reg=0xd138 data=0      lane=1
 phy set 8 reg=0xd133 data=0x1802 lane=1
 
+INTeRrupt ENAble id=2209
+INTeRrupt ENAble id=2210
+INTeRrupt ENAble id=2211
+INTeRrupt ENAble id=2212
+INTeRrupt ENAble id=2213
+INTeRrupt ENAble id=2214
+INTeRrupt ENAble id=2215
+INTeRrupt ENAble id=2216
+INTeRrupt ENAble id=2217
+INTeRrupt ENAble id=2218
+INTeRrupt ENAble id=2219
+INTeRrupt ENAble id=2220
+INTeRrupt ENAble id=2221
+INTeRrupt ENAble id=2222
+INTeRrupt ENAble id=2223
+INTeRrupt ENAble id=2224
+INTeRrupt ENAble id=2225
+INTeRrupt ENAble id=2226
+
+INTeRrupt ENAble id=482
+INTeRrupt ENAble id=483
+INTeRrupt ENAble id=484
+INTeRrupt ENAble id=485
+INTeRrupt ENAble id=486
+INTeRrupt ENAble id=487
+INTeRrupt ENAble id=488
+
+INTeRrupt ENAble id=1597
+debug intr error
diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/platform_ndk.json b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/platform_ndk.json
@@ -50,11 +50,11 @@
     },
     {
       "key": "thermal_log_current_threshold",
-      "intval": 2
+      "intval": 5
     },
     {
       "key": "thermal_log_margin_threshold",
-      "intval": 2
+      "intval": 5
     },
     {
       "key": "thermal_log_min_threshold",

diff --git a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/platform_ndk.json b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/platform_ndk.json
@@ -38,11 +38,11 @@
     },
     {
       "key": "thermal_log_current_threshold",
-      "intval": 3
+      "intval": 5
     },
     {
       "key": "thermal_log_margin_threshold",
-      "intval": 3
+      "intval": 5
     },
     {
       "key": "thermal_log_min_threshold",