[Nokia][port]Modify the Nokia-IXR7250E-36x400G device data

mlok-nokia · mlok-nokia · commit 52671c4592ec · 2021-10-03T15:50:14.000-04:00
-- Based on the new BCM configuration, Modify the portcoreid for the front panel port in the port_config.ini for line card Nokia-IXR7250e-36x400G
 -- Correct the pcie.pmal file
 -- Update the platform_ndk.json with new field "update-asic-pvt"
 -- Add chassis-internal-intf to chassisdb.conf
 -- update platform_reboot

Signed-off-by: mlok &lt;marty.lok@nokia.com&gt;
diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/port_config.ini b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/port_config.ini
@@ -1,20 +1,20 @@
 # name         lanes                               alias            index  asic_port_name role  speed    coreid  coreportid  numvoq
-Ethernet0      72,73,74,75,76,77,78,79             Ethernet0        1      Eth0-ASIC0     Ext   400000   1       0           8
-Ethernet1      80,81,82,83,84,85,86,87             Ethernet1        2      Eth1-ASIC0     Ext   400000   1       1           8
-Ethernet2      88,89,90,91,92,93,94,95             Ethernet2        3      Eth2-ASIC0     Ext   400000   1       2           8
-Ethernet3      96,97,98,99,100,101,102,103         Ethernet3        4      Eth3-ASIC0     Ext   400000   1       3           8
-Ethernet4      104,105,106,107,108,109,110,111     Ethernet4        5      Eth4-ASIC0     Ext   400000   1       4           8
-Ethernet5      112,113,114,115,116,117,118,119     Ethernet5        6      Eth5-ASIC0     Ext   400000   1       5           8
-Ethernet6      120,121,122,123,124,125,126,127     Ethernet6        7      Eth6-ASIC0     Ext   400000   1       6           8
-Ethernet7      128,129,130,131,132,133,134,135     Ethernet7        8      Eth7-ASIC0     Ext   400000   1       7           8
-Ethernet8      136,137,138,139,140,141,142,143     Ethernet8        9      Eth8-ASIC0     Ext   400000   1       8           8
-Ethernet9      64,65,66,67,68,69,70,71             Ethernet9        10     Eth9-ASIC0     Ext   400000   0       1           8
-Ethernet10     56,57,58,59,60,61,62,63             Ethernet10       11     Eth10-ASIC0    Ext   400000   0       2           8
-Ethernet11     48,49,50,51,52,53,54,55             Ethernet11       12     Eth11-ASIC0    Ext   400000   0       3           8
-Ethernet12     40,41,42,43,44,45,46,47             Ethernet12       13     Eth12-ASIC0    Ext   400000   0       4           8
-Ethernet13     32,33,34,35,36,37,38,39             Ethernet13       14     Eth13-ASIC0    Ext   400000   0       5           8
-Ethernet14     24,25,26,27,28,29,30,31             Ethernet14       15     Eth14-ASIC0    Ext   400000   0       6           8
-Ethernet15     16,17,18,19,20,21,22,23             Ethernet15       16     Eth15-ASIC0    Ext   400000   0       7           8
-Ethernet16     8,9,10,11,12,13,14,15               Ethernet16       17     Eth16-ASIC0    Ext   400000   0       8           8
-Ethernet17     0,1,2,3,4,5,6,7                     Ethernet17       18     Eth17-ASIC0    Ext   400000   0       9           8
-Ethernet-IB0   115                                 Ethernet-IB0     37     Rcy-ASIC0      Int   10000    0       10          8
+Ethernet0      72,73,74,75,76,77,78,79             Ethernet0        1      Eth0-ASIC0     Ext   400000   1       1           8
+Ethernet1      80,81,82,83,84,85,86,87             Ethernet1        2      Eth1-ASIC0     Ext   400000   1       2           8
+Ethernet2      88,89,90,91,92,93,94,95             Ethernet2        3      Eth2-ASIC0     Ext   400000   1       3           8
+Ethernet3      96,97,98,99,100,101,102,103         Ethernet3        4      Eth3-ASIC0     Ext   400000   1       4           8
+Ethernet4      104,105,106,107,108,109,110,111     Ethernet4        5      Eth4-ASIC0     Ext   400000   1       5           8
+Ethernet5      112,113,114,115,116,117,118,119     Ethernet5        6      Eth5-ASIC0     Ext   400000   1       6           8
+Ethernet6      120,121,122,123,124,125,126,127     Ethernet6        7      Eth6-ASIC0     Ext   400000   1       7           8
+Ethernet7      128,129,130,131,132,133,134,135     Ethernet7        8      Eth7-ASIC0     Ext   400000   1       8           8
+Ethernet8      136,137,138,139,140,141,142,143     Ethernet8        9      Eth8-ASIC0     Ext   400000   1       9           8
+Ethernet9      64,65,66,67,68,69,70,71             Ethernet9        10     Eth9-ASIC0     Ext   400000   0       10          8
+Ethernet10     56,57,58,59,60,61,62,63             Ethernet10       11     Eth10-ASIC0    Ext   400000   0       11          8
+Ethernet11     48,49,50,51,52,53,54,55             Ethernet11       12     Eth11-ASIC0    Ext   400000   0       12          8
+Ethernet12     40,41,42,43,44,45,46,47             Ethernet12       13     Eth12-ASIC0    Ext   400000   0       13          8
+Ethernet13     32,33,34,35,36,37,38,39             Ethernet13       14     Eth13-ASIC0    Ext   400000   0       14          8
+Ethernet14     24,25,26,27,28,29,30,31             Ethernet14       15     Eth14-ASIC0    Ext   400000   0       15          8
+Ethernet15     16,17,18,19,20,21,22,23             Ethernet15       16     Eth15-ASIC0    Ext   400000   0       16          8
+Ethernet16     8,9,10,11,12,13,14,15               Ethernet16       17     Eth16-ASIC0    Ext   400000   0       17          8
+Ethernet17     0,1,2,3,4,5,6,7                     Ethernet17       18     Eth17-ASIC0    Ext   400000   0       18          8
+Ethernet-IB0   115                                 Ethernet-IB0     37     Rcy-ASIC0      Int   10000    0       19          8
diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/port_config.ini b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/port_config.ini
@@ -1,20 +1,20 @@
 # name         lanes                               alias            index  asic_port_name role  speed    coreid  coreportid  numvoq
-Ethernet18     72,73,74,75,76,77,78,79             Ethernet18       19     Eth0-ASIC1     Ext   400000   1       0           8
-Ethernet19     80,81,82,83,84,85,86,87             Ethernet19       20     Eth1-ASIC1     Ext   400000   1       1           8
-Ethernet20     88,89,90,91,92,93,94,95             Ethernet20       21     Eth2-ASIC1     Ext   400000   1       2           8
-Ethernet21     96,97,98,99,100,101,102,103         Ethernet21       22     Eth3-ASIC1     Ext   400000   1       3           8
-Ethernet22     104,105,106,107,108,109,110,111     Ethernet22       23     Eth4-ASIC1     Ext   400000   1       4           8
-Ethernet23     112,113,114,115,116,117,118,119     Ethernet23       24     Eth5-ASIC1     Ext   400000   1       5           8
-Ethernet24     120,121,122,123,124,125,126,127     Ethernet24       25     Eth6-ASIC1     Ext   400000   1       6           8
-Ethernet25     128,129,130,131,132,133,134,135     Ethernet25       26     Eth7-ASIC1     Ext   400000   1       7           8
-Ethernet26     136,137,138,139,140,141,142,143     Ethernet26       27     Eth8-ASIC1     Ext   400000   1       8           8
-Ethernet27     64,65,66,67,68,69,70,71             Ethernet27       28     Eth9-ASIC1     Ext   400000   0       1           8
-Ethernet28     56,57,58,59,60,61,62,63             Ethernet28       29     Eth10-ASIC1    Ext   400000   0       2           8
-Ethernet29     48,49,50,51,52,53,54,55             Ethernet29       30     Eth11-ASIC1    Ext   400000   0       3           8
-Ethernet30     40,41,42,43,44,45,46,47             Ethernet30       31     Eth12-ASIC1    Ext   400000   0       4           8
-Ethernet31     32,33,34,35,36,37,38,39             Ethernet31       32     Eth13-ASIC1    Ext   400000   0       5           8
-Ethernet32     24,25,26,27,28,29,30,31             Ethernet32       33     Eth14-ASIC1    Ext   400000   0       6           8
-Ethernet33     16,17,18,19,20,21,22,23             Ethernet33       34     Eth15-ASIC1    Ext   400000   0       7           8
-Ethernet34     8,9,10,11,12,13,14,15               Ethernet34       35     Eth16-ASIC1    Ext   400000   0       8           8
-Ethernet35     0,1,2,3,4,5,6,7                     Ethernet35       36     Eth17-ASIC1    Ext   400000   0       9           8
-Ethernet-IB1   115                                 Ethernet-IB1     38     Rcy-ASIC1      Int   10000    0       10          8
+Ethernet18     72,73,74,75,76,77,78,79             Ethernet18       19     Eth0-ASIC1     Ext   400000   1       1           8
+Ethernet19     80,81,82,83,84,85,86,87             Ethernet19       20     Eth1-ASIC1     Ext   400000   1       2           8
+Ethernet20     88,89,90,91,92,93,94,95             Ethernet20       21     Eth2-ASIC1     Ext   400000   1       3           8
+Ethernet21     96,97,98,99,100,101,102,103         Ethernet21       22     Eth3-ASIC1     Ext   400000   1       4           8
+Ethernet22     104,105,106,107,108,109,110,111     Ethernet22       23     Eth4-ASIC1     Ext   400000   1       5           8
+Ethernet23     112,113,114,115,116,117,118,119     Ethernet23       24     Eth5-ASIC1     Ext   400000   1       6           8
+Ethernet24     120,121,122,123,124,125,126,127     Ethernet24       25     Eth6-ASIC1     Ext   400000   1       7           8
+Ethernet25     128,129,130,131,132,133,134,135     Ethernet25       26     Eth7-ASIC1     Ext   400000   1       8           8
+Ethernet26     136,137,138,139,140,141,142,143     Ethernet26       27     Eth8-ASIC1     Ext   400000   1       9           8
+Ethernet27     64,65,66,67,68,69,70,71             Ethernet27       28     Eth9-ASIC1     Ext   400000   0       10          8
+Ethernet28     56,57,58,59,60,61,62,63             Ethernet28       29     Eth10-ASIC1    Ext   400000   0       11          8
+Ethernet29     48,49,50,51,52,53,54,55             Ethernet29       30     Eth11-ASIC1    Ext   400000   0       12          8
+Ethernet30     40,41,42,43,44,45,46,47             Ethernet30       31     Eth12-ASIC1    Ext   400000   0       13          8
+Ethernet31     32,33,34,35,36,37,38,39             Ethernet31       32     Eth13-ASIC1    Ext   400000   0       14          8
+Ethernet32     24,25,26,27,28,29,30,31             Ethernet32       33     Eth14-ASIC1    Ext   400000   0       15          8
+Ethernet33     16,17,18,19,20,21,22,23             Ethernet33       34     Eth15-ASIC1    Ext   400000   0       16          8
+Ethernet34     8,9,10,11,12,13,14,15               Ethernet34       35     Eth16-ASIC1    Ext   400000   0       17          8
+Ethernet35     0,1,2,3,4,5,6,7                     Ethernet35       36     Eth17-ASIC1    Ext   400000   0       18          8
+Ethernet-IB1   115                                 Ethernet-IB1     38     Rcy-ASIC1      Int   10000    0       19          8
diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/chassisdb.conf b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/chassisdb.conf
@@ -1 +1,2 @@
 chassis_db_address=10.0.5.16
+chassis_internal_intfs=enp12s0f2,enp5s0f4,enp5s0f4.2
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
@@ -27,6 +27,10 @@
     {
         "key": "sonic_bdb_mode",
         "intval": 0
+    },
+    { 
+      "key": "update_asic_pvt",
+      "intval": 10
     }
     ]
 }
diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/platform_reboot b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/platform_reboot
@@ -5,5 +5,6 @@ sleep 2
 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-*
 sync
 /sbin/reboot
diff --git a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/pcie.yaml b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/pcie.yaml
@@ -91,7 +91,7 @@
 - bus: '00'
   dev: '14'
   fn: '3'
-  id: 790e'
+  id: '790e'
   name: 'ISA bridge: Advanced Micro Devices, Inc. [AMD] FCH LPC Bridge (rev 51)'
 - bus: '00'
   dev: '18'
@@ -130,7 +130,7 @@
   name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh) Data Fabric: Device 18h; Function 6'
 - bus: '00'
   dev: '18'
-  fn: '7 '
+  fn: '7'
   id: '1467'
   name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh) Data Fabric: Device 18h; Function 7'
 - bus: '01'
@@ -153,57 +153,57 @@
   fn: '1'
   id: '8454'
   name: 'Ethernet controller: Broadcom Limited Device 8454 (rev 01)'
-- bus: '08'
+- bus: '09'
   dev: '00'
   fn: '0'
   id: '145a'
   name: 'Non-Essential Instrumentation [1300]: Advanced Micro Devices, Inc. [AMD] Zeppelin/Raven/Raven2 PCIe Dummy Function'
-- bus: '08'
+- bus: '09'
   dev: '00'
   fn: '2'
   id: '1456'
   name: 'Encryption controller: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh) Platform Security Processor'
-- bus: '08'
+- bus: '09'
   dev: '00'
   fn: '3'
   id: '145f'
   name: 'USB controller: Advanced Micro Devices, Inc. [AMD] Zeppelin USB 3.0 Host controller'
-- bus: '09'
+- bus: '0a'
   dev: '00'
   fn: '0'
   id: '1455'
   name: 'Non-Essential Instrumentation [1300]: Advanced Micro Devices, Inc. [AMD] Zeppelin/Renoir PCIe Dummy Function'
-- bus: '09'
+- bus: '0a'
   dev: '00'
   fn: '1'
   id: '1468'
   name: 'Encryption controller: Advanced Micro Devices, Inc. [AMD] Zeppelin Cryptographic Coprocessor NTBCCP'
-- bus: '09'
+- bus: '0a'
   dev: '00'
-  fn:  '2'
+  fn: '2'
   id: '7901'
   name: 'SATA controller: Advanced Micro Devices, Inc. [AMD] FCH SATA Controller [AHCI mode] (rev 51)'
-- bus: '09'
+- bus: '0a'
   dev: '00'
   fn: '3'
   id: '1457'
   name: 'Audio device: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh) HD Audio Controller'
-- bus: '09'
+- bus: '0a'
   dev: '00'
   fn: '4'
   id: '1458'
   name: 'Ethernet controller: Advanced Micro Devices, Inc. [AMD] Device 1458'
-- bus: '09'
+- bus: '0a'
   dev: '00'
   fn: '5'
   id: '1458'
   name: 'Ethernet controller: Advanced Micro Devices, Inc. [AMD] Device 1458'
-- bus: '09'
+- bus: '0a'
   dev: '00'
   fn: '6'
   id: '1459'
   name: 'Ethernet controller: Advanced Micro Devices, Inc. [AMD] Device 1459'
-- bus: '09'
+- bus: '0a'
   dev: '00'
   fn: '7'
   id: '1459'
diff --git a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/platform_reboot b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/platform_reboot
@@ -5,5 +5,6 @@ sleep 2
 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-*
 sync
 /sbin/reboot

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`chassis_db_address=10.0.5.16`
	`2`	`+chassis_internal_intfs=enp12s0f2,enp5s0f4,enp5s0f4.2`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,10 @@`
`27`	`27`	`{`
`28`	`28`	`"key": "sonic_bdb_mode",`
`29`	`29`	`"intval": 0`
	`30`	`+ },`
	`31`	`+ {`
	`32`	`+ "key": "update_asic_pvt",`
	`33`	`+ "intval": 10`
`30`	`34`	`}`
`31`	`35`	`]`
`32`	`36`	`}`