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 bbafccdc377e..264cfb30a310 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 @@ -1641,9 +1641,9 @@ port_fec.18.BCM8885x=9 serdes_tx_taps_1.BCM8885X=pam4:-8:128:-8:0:0:0 serdes_tx_taps_2.BCM8885X=pam4:-8:128:-8:0:0:0 -serdes_tx_taps_3.BCM8885X=pam4:-8:132:-12:4:0:0 +serdes_tx_taps_3.BCM8885X=pam4:-12:128:-12:2:0:0 serdes_tx_taps_4.BCM8885X=pam4:-8:128:-4:4:0:0 -serdes_tx_taps_5.BCM8885X=pam4:-8:128:-4:4:0:0 +serdes_tx_taps_5.BCM8885X=pam4:-4:152:0:0:0:0 serdes_tx_taps_6.BCM8885X=pam4:-8:136:0:0:0:0 serdes_tx_taps_7.BCM8885X=pam4:-8:132:-4:0:-4:0 serdes_tx_taps_8.BCM8885X=pam4:-4:144:0:0:0:0 @@ -1651,7 +1651,7 @@ serdes_tx_taps_9.BCM8885X=pam4:-8:132:-4:2:-4:0 serdes_tx_taps_10.BCM8885X=pam4:-4:144:0:0:0:0 serdes_tx_taps_11.BCM8885X=pam4:-8:132:-4:0:-4:0 serdes_tx_taps_12.BCM8885X=pam4:-4:144:0:0:0:0 -serdes_tx_taps_13.BCM8885X=pam4:-8:128:-8:4:0:0 +serdes_tx_taps_13.BCM8885X=pam4:-4:132:-4:0:0:0 serdes_tx_taps_14.BCM8885X=pam4:-4:144:0:0:0:0 serdes_tx_taps_15.BCM8885X=pam4:-8:128:-8:4:0:0 serdes_tx_taps_16.BCM8885X=pam4:-8:136:-4:4:-4:0 @@ -2052,3 +2052,6 @@ sai_recycle_port_lane_base=96 appl_param_nof_ports_per_modid=64 udh_exists=1 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 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 index 26466f89ae44..650134e7e589 100644 --- 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 @@ -1,25 +1,3 @@ -phy set 3 reg=0xd134 data=-8 lane=0 -phy set 3 reg=0xd135 data=132 lane=0 -phy set 3 reg=0xd136 data=-8 lane=0 -phy set 3 reg=0xd137 data=0 lane=0 -phy set 3 reg=0xd138 data=0 lane=0 -phy set 3 reg=0xd133 data=0x1802 lane=0 - -phy set 3 reg=0xd134 data=-8 lane=1 -phy set 3 reg=0xd135 data=132 lane=1 -phy set 3 reg=0xd136 data=-12 lane=1 -phy set 3 reg=0xd137 data=0 lane=1 -phy set 3 reg=0xd138 data=0 lane=1 -phy set 3 reg=0xd133 data=0x1800 lane=1 - -phy set 3 reg=0xd134 data=-8 lane=7 -phy set 3 reg=0xd135 data=132 lane=7 -phy set 3 reg=0xd136 data=-8 lane=7 -phy set 3 reg=0xd137 data=0 lane=7 -phy set 3 reg=0xd138 data=0 lane=7 -phy set 3 reg=0xd133 data=0x1804 lane=7 - - phy set 6 reg=0xd134 data=-8 lane=1 phy set 6 reg=0xd135 data=132 lane=1 phy set 6 reg=0xd136 data=-8 lane=1 @@ -34,3 +12,26 @@ phy set 8 reg=0xd136 data=-8 lane=1 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 + + +phy set 15 reg=0xd134 data=-8 lane=0 +phy set 15 reg=0xd135 data=144 lane=0 +phy set 15 reg=0xd136 data=-8 lane=0 +phy set 15 reg=0xd137 data=0 lane=0 +phy set 15 reg=0xd138 data=0 lane=0 +phy set 15 reg=0xd133 data=0x1800 lane=0 + +phy set 15 reg=0xd134 data=-8 lane=3 +phy set 15 reg=0xd135 data=144 lane=3 +phy set 15 reg=0xd136 data=-8 lane=3 +phy set 15 reg=0xd137 data=0 lane=3 +phy set 15 reg=0xd138 data=0 lane=3 +phy set 15 reg=0xd133 data=0x1800 lane=3 + + +phy set 17 reg=0xd134 data=-8 lane=2 +phy set 17 reg=0xd135 data=132 lane=2 +phy set 17 reg=0xd136 data=-16 lane=2 +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 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 ce7f77de5bb2..733ab75004e4 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 @@ -2054,3 +2054,6 @@ sai_recycle_port_lane_base=96 appl_param_nof_ports_per_modid=64 udh_exists=1 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 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 index db5ad5ebb264..b22dde093132 100644 --- 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 @@ -1,3 +1,11 @@ +phy set 3 reg=0xd134 data=-8 lane=4 +phy set 3 reg=0xd135 data=132 lane=4 +phy set 3 reg=0xd136 data=0 lane=4 +phy set 3 reg=0xd137 data=0 lane=4 +phy set 3 reg=0xd138 data=0 lane=4 +phy set 3 reg=0xd133 data=0x1800 lane=4 + + phy set 8 reg=0xd134 data=-8 lane=1 phy set 8 reg=0xd135 data=132 lane=1 phy set 8 reg=0xd136 data=-8 lane=1 diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/platform.json b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/platform.json index 55630de1126a..3980c99648bc 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/platform.json +++ b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/platform.json @@ -19,7 +19,8 @@ "model": false, "serial": false, "base_mac": false, - "system_eeprom_info": false + "system_eeprom_info": false, + "reboot_other_modules": false }, "thermal_temperature": { "minimum": 0, @@ -30,6 +31,94 @@ "master_psu_led_color": [], "psus": [], "thermals": [ + { + "name": "ASIC0_0--FAB0", + "controllable": false + }, + { + "name": "ASIC0_1--FAB1", + "controllable": false + }, + { + "name": "ASIC0_2--FAB2", + "controllable": false + }, + { + "name": "ASIC0_3--FAB3", + "controllable": false + }, + { + "name": "ASIC0_4--NIF0", + "controllable": false + }, + { + "name": "ASIC0_5--NIF1", + "controllable": false + }, + { + "name": "ASIC0_6--PRM", + "controllable": false + }, + { + "name": "ASIC0_7--EMI0", + "controllable": false + }, + { + "name": "ASIC0_8--EMI1", + "controllable": false + }, + { + "name": "ASIC0_dram-0x0", + "controllable": false + }, + { + "name": "ASIC0_dram-0x1", + "controllable": false + }, + { + "name": "ASIC1_0--FAB0", + "controllable": false + }, + { + "name": "ASIC1_1--FAB1", + "controllable": false + }, + { + "name": "ASIC1_2--FAB2", + "controllable": false + }, + { + "name": "ASIC1_3--FAB3", + "controllable": false + }, + { + "name": "ASIC1_4--NIF0", + "controllable": false + }, + { + "name": "ASIC1_5--NIF1", + "controllable": false + }, + { + "name": "ASIC1_6--PRM", + "controllable": false + }, + { + "name": "ASIC1_7--EMI0", + "controllable": false + }, + { + "name": "ASIC1_8--EMI1", + "controllable": false + }, + { + "name": "ASIC1_dram-0x0", + "controllable": false + }, + { + "name": "ASIC1_dram-0x1", + "controllable": false + }, { "name": "temp_1(fan)", "controllable": false @@ -43,7 +132,7 @@ "controllable": false }, { - "name": "temp_4", + "name": "temp_4(fan)", "controllable": false }, { @@ -51,7 +140,7 @@ "controllable": false }, { - "name": "temp_6(fan)", + "name": "temp_6", "controllable": false }, { @@ -69,152 +158,120 @@ { "name": "temp_10(fan)", "controllable": false + }, + { + "name": "temp_11(fan)", + "controllable": false } ], "sfps": [ { - "name": "QSFPDD_1", - "tx_disable_channel": false + "name": "QSFPDD_1" }, { - "name": "QSFPDD_2", - "tx_disable_channel": false + "name": "QSFPDD_2" }, { - "name": "QSFPDD_3", - "tx_disable_channel": false + "name": "QSFPDD_3" }, { - "name": "QSFPDD_4", - "tx_disable_channel": false + "name": "QSFPDD_4" }, { - "name": "QSFPDD_5", - "tx_disable_channel": false + "name": "QSFPDD_5" }, { - "name": "QSFPDD_6", - "tx_disable_channel": false + "name": "QSFPDD_6" }, { - "name": "QSFPDD_7", - "tx_disable_channel": false + "name": "QSFPDD_7" }, { - "name": "QSFPDD_8", - "tx_disable_channel": false + "name": "QSFPDD_8" }, { - "name": "QSFPDD_9", - "tx_disable_channel": false + "name": "QSFPDD_9" }, { - "name": "QSFPDD_10", - "tx_disable_channel": false + "name": "QSFPDD_10" }, { - "name": "QSFPDD_11", - "tx_disable_channel": false + "name": "QSFPDD_11" }, { - "name": "QSFPDD_12", - "tx_disable_channel": false + "name": "QSFPDD_12" }, { - "name": "QSFPDD_13", - "tx_disable_channel": false + "name": "QSFPDD_13" }, { - "name": "QSFPDD_14", - "tx_disable_channel": false + "name": "QSFPDD_14" }, { - "name": "QSFPDD_15", - "tx_disable_channel": false + "name": "QSFPDD_15" }, { - "name": "QSFPDD_16", - "tx_disable_channel": false + "name": "QSFPDD_16" }, { - "name": "QSFPDD_17", - "tx_disable_channel": false + "name": "QSFPDD_17" }, { - "name": "QSFPDD_18", - "tx_disable_channel": false + "name": "QSFPDD_18" }, { - "name": "QSFPDD_19", - "tx_disable_channel": false + "name": "QSFPDD_19" }, { - "name": "QSFPDD_20", - "tx_disable_channel": false + "name": "QSFPDD_20" }, { - "name": "QSFPDD_21", - "tx_disable_channel": false + "name": "QSFPDD_21" }, { - "name": "QSFPDD_22", - "tx_disable_channel": false + "name": "QSFPDD_22" }, { - "name": "QSFPDD_23", - "tx_disable_channel": false + "name": "QSFPDD_23" }, { - "name": "QSFPDD_24", - "tx_disable_channel": false + "name": "QSFPDD_24" }, { - "name": "QSFPDD_25", - "tx_disable_channel": false + "name": "QSFPDD_25" }, { - "name": "QSFPDD_26", - "tx_disable_channel": false + "name": "QSFPDD_26" }, { - "name": "QSFPDD_27", - "tx_disable_channel": false + "name": "QSFPDD_27" }, { - "name": "QSFPDD_28", - "tx_disable_channel": false + "name": "QSFPDD_28" }, { - "name": "QSFPDD_29", - "tx_disable_channel": false + "name": "QSFPDD_29" }, { - "name": "QSFPDD_30", - "tx_disable_channel": false + "name": "QSFPDD_30" }, { - "name": "QSFPDD_31", - "tx_disable_channel": false + "name": "QSFPDD_31" }, { - "name": "QSFPDD_32", - "tx_disable_channel": false + "name": "QSFPDD_32" }, { - "name": "QSFPDD_33", - "tx_disable_channel": false + "name": "QSFPDD_33" }, { - "name": "QSFPDD_34", - "tx_disable_channel": false + "name": "QSFPDD_34" }, { - "name": "QSFPDD_35", - "tx_disable_channel": false + "name": "QSFPDD_35" }, { - "name": "QSFPDD_36", - "tx_disable_channel": false + "name": "QSFPDD_36" } ] }, 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 index 039b950f03ba..2220f8747894 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/platform_ndk.json +++ b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/platform_ndk.json @@ -31,6 +31,14 @@ { "key": "update_asic_pvt", "intval": 10 + }, + { + "key": "amd_pcon", + "intval": 4 + }, + { + "key": "enable_firmware_update", + "intval": 0 } ] } diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/platform_reboot b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/platform_reboot index d128455d40fc..a32a3549bc35 100755 --- a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/platform_reboot +++ b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/platform_reboot @@ -6,5 +6,7 @@ echo "w" > /dev/watchdog kick_date=`date -u` echo "last watchdog kick $kick_date" > /var/log/nokia-watchdog-last.log rm -f /sys/firmware/efi/efivars/dump-* +touch /etc/opt/srlinux/devmgr_reboot_cause.done +rm -f /etc/opt/srlinux/reboot-cause.txt sync /sbin/reboot diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/system_health_monitoring_config.json b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/system_health_monitoring_config.json index 57006d67ecf5..1375bd80c3f8 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/system_health_monitoring_config.json +++ b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/system_health_monitoring_config.json @@ -1,7 +1,6 @@ { "services_to_ignore": [], "devices_to_ignore": [ - "asic", "fan", "psu" ], diff --git a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/platform.json b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/platform.json index 4e24bb3e8d92..e41b6fc8e5e4 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/platform.json +++ b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/platform.json @@ -16,7 +16,8 @@ "model": false, "serial": false, "base_mac": false, - "system_eeprom_info": false + "system_eeprom_info": false, + "reboot_other_modules": false }, "thermal_temperature": { "minimum": 0, @@ -149,6 +150,10 @@ "name": "temp_5(fan)", "controllable": false }, + { + "name": "temp_6(fan)", + "controllable": false + }, { "name": "sfm1_1(fan)", "controllable": false 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 index 10a09a91e0e5..a6d6bbf8a45a 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/platform_ndk.json +++ b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/platform_ndk.json @@ -19,6 +19,14 @@ { "intval": 1, "key": "disable_vfio" - } + }, + { + "key": "amd_pcon", + "intval": 1 + }, + { + "key": "enable_firmware_update", + "intval": 0 + } ] } diff --git a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/platform_reboot b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/platform_reboot index c5ff45d1848e..ba47829674a4 100755 --- a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/platform_reboot +++ b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/platform_reboot @@ -6,6 +6,8 @@ echo "w" > /dev/watchdog kick_date=`date -u` echo "last watchdog kick $kick_date" > /var/log/nokia-watchdog-last.log rm -f /sys/firmware/efi/efivars/dump-* +touch /etc/opt/srlinux/devmgr_reboot_cause.done +rm -f /etc/opt/srlinux/reboot-cause.txt sync echo "Rebooting all Linecards" python3 -c 'import sonic_platform.platform; platform_chassis = sonic_platform.platform.Platform().get_chassis(); platform_chassis.reboot_imms()'