Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into HEAD
Browse files Browse the repository at this point in the history
  • Loading branch information
SuvarnaMeenakshi committed Aug 18, 2021
2 parents 59c88fe + 0d84f13 commit 6aeb3df
Show file tree
Hide file tree
Showing 75 changed files with 1,609 additions and 25 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -91,3 +91,6 @@
path = platform/broadcom/saibcm-modules-dnx
url = https://github.com/Azure/saibcm-modules.git
branch = sdk-6.5.22-gpl-dnx
[submodule "platform/broadcom/sonic-platform-modules-nokia"]
path = platform/broadcom/sonic-platform-modules-nokia
url = https://github.com/nokia/sonic-platform.git
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"CONTEXTS": [
{
"guid" : 0,
"name" : "syncd0",
"dbAsic" : "ASIC_DB",
"dbCounters" : "COUNTERS_DB",
"dbFlex": "FLEX_COUNTER_DB",
"dbState" : "STATE_DB",
"zmq_enable": false,
"zmq_endpoint": "tcp://127.0.0.1:5555",
"zmq_ntf_endpoint": "tcp://127.0.0.1:5556",
"switches": [
{
"index" : 0,
"hwinfo" : "06:00.0"
}
]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +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
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/jr2cp-nokia-18x400g-config.bcm
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"CONTEXTS": [
{
"guid" : 0,
"name" : "syncd1",
"dbAsic" : "ASIC_DB",
"dbCounters" : "COUNTERS_DB",
"dbFlex": "FLEX_COUNTER_DB",
"dbState" : "STATE_DB",
"zmq_enable": false,
"zmq_endpoint": "tcp://127.0.0.1:5555",
"zmq_ntf_endpoint": "tcp://127.0.0.1:5556",
"switches": [
{
"index" : 1,
"hwinfo" : "07:00.0"
}
]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +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
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/jr2cp-nokia-18x400g-config.bcm
3 changes: 3 additions & 0 deletions device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/asic.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
NUM_ASIC=2
DEV_ID_ASIC_0=06:00.0
DEV_ID_ASIC_1=07:00.0
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
chassis_db_address=10.0.5.16
1 change: 1 addition & 0 deletions device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/default_sku
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Nokia-IXR7250E-36x400G empty
4 changes: 4 additions & 0 deletions device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/installer.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
CONSOLE_PORT=0x3f8
CONSOLE_DEV=0
CONSOLE_SPEED=115200
ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="amd_iommu=off pci=resource_alignment=48@00:03.1"
220 changes: 220 additions & 0 deletions device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/pcie.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,220 @@
- bus: '00'
dev: '00'
fn: '0'
id: '1450'
name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh) Root Complex'
- bus: '00'
dev: '00'
fn: '2'
id: '1451'
name: 'IOMMU: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh) I/O Memory Management Unit'
- bus: '00'
dev: '01'
fn: '0'
id: '1452'
name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-1fh) PCIe Dummy Host Bridge'
- bus: '00'
dev: '01'
fn: '1'
id: '1453'
name: 'PCI bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh) PCIe GPP Bridge'
- bus: '00'
dev: '01'
fn: '2'
id: '1453'
name: 'PCI bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh) PCIe GPP Bridge'
- bus: '00'
dev: '02'
fn: '0'
id: '1452'
name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-1fh) PCIe Dummy Host Bridge'
- bus: '00'
dev: '03'
fn: '0'
id: '1452'
name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-1fh) PCIe Dummy Host Bridge'
- bus: '00'
dev: '03'
fn: '1'
id: '1453'
name: 'PCI bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh) PCIe GPP Bridge'
- bus: '00'
dev: '04'
fn: '0'
id: '1452'
name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-1fh) PCIe Dummy Host Bridge'
- bus: '00'
dev: '07'
fn: '0'
id: '1452'
name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-1fh) PCIe Dummy Host Bridge'
- bus: '00'
dev: '07'
fn: '1'
id: '1454'
name: 'PCI bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh) Internal PCIe GPP Bridge 0 to Bus B'
- bus: '00'
dev: '08'
fn: '0'
id: '1452'
name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-1fh) PCIe Dummy Host Bridge'
- bus: '00'
dev: '08'
fn: '1'
id: '1454'
name: 'PCI bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh) Internal PCIe GPP Bridge 0 to Bus B'
- bus: '00'
dev: '14'
fn: '0'
id: '790b'
name: 'SMBus: Advanced Micro Devices, Inc. [AMD] FCH SMBus Controller (rev 59)'
- bus: '00'
dev: '14'
fn: '3'
id: '790e'
name: 'ISA bridge: Advanced Micro Devices, Inc. [AMD] FCH LPC Bridge (rev 51)'
- bus: '00'
dev: '18'
fn: '0'
id: '1460'
name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh) Data Fabric: Device 18h; Function 0'
- bus: '00'
dev: '18'
fn: '1'
id: '1461'
name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh) Data Fabric: Device 18h; Function 1'
- bus: '00'
dev: '18'
fn: '2'
id: '1462'
name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh) Data Fabric: Device 18h; Function 2'
- bus: '00'
dev: '18'
fn: '3'
id: '1463'
name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh) Data Fabric: Device 18h; Function 3'
- bus: '00'
dev: '18'
fn: '4'
id: '1464'
name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh) Data Fabric: Device 18h; Function 4'
- bus: '00'
dev: '18'
fn: '5'
id: '1465'
name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh) Data Fabric: Device 18h; Function 5'
- bus: '00'
dev: '18'
fn: '6'
id: '1466'
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'
id: '1467'
name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh) Data Fabric: Device 18h; Function 7'
- bus: '01'
dev: '00'
fn: '0'
id: '157b'
name: 'Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev 03)'
- bus: '02'
dev: '00'
fn: '0'
id: '2001'
name: 'Unassigned class [ff00]: Alcatel Device 2001'
- bus: '03'
dev: '00'
fn: '0'
id: '8562'
name: 'PCI bridge: PMC-Sierra Inc. Device 8562'
- bus: '03'
dev: '00'
fn: '1'
id: '8562'
name: 'Memory controller: PMC-Sierra Inc. Device 8562'
- bus: '04'
dev: '00'
fn: '0'
id: '8562'
name: 'PCI bridge: PMC-Sierra Inc. Device 8562'
- bus: '04'
dev: '01'
fn: '0'
id: '8562'
name: 'PCI bridge: PMC-Sierra Inc. Device 8562'
- bus: '04'
dev: '02'
fn: '0'
id: '8562'
name: 'PCI bridge: PMC-Sierra Inc. Device 8562'
- bus: '04'
dev: '03'
fn: '0'
id: '8562'
name: 'PCI bridge: PMC-Sierra Inc. Device 8562'
- bus: '05'
dev: '00'
fn: '0'
id: '001a'
name: 'Unassigned class [ff00]: Alcatel Device 001a (rev 35)'
- bus: '06'
dev: '00'
fn: '0'
id: '8850'
name: 'Ethernet controller: Broadcom Limited Device 8850 (rev 01)'
- bus: '07'
dev: '00'
fn: '0'
id: '8850'
name: 'Ethernet controller: Broadcom Limited Device 8850 (rev 01)'
- bus: '08'
dev: '00'
fn: '0'
id: '7028'
name: 'Memory controller: Xilinx Corporation Device 7028'
- 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: '09'
dev: '00'
fn: '2'
id: '1456'
name: 'Encryption controller: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh) Platform Security Processor'
- bus: '09'
dev: '00'
fn: '3'
id: '145f'
name: 'USB controller: Advanced Micro Devices, Inc. [AMD] Zeppelin USB 3.0 Host controller'
- bus: '0a'
dev: '00'
fn: '0'
id: '1455'
name: 'Non-Essential Instrumentation [1300]: Advanced Micro Devices, Inc. [AMD] Zeppelin/Renoir PCIe Dummy Function'
- bus: '0a'
dev: '00'
fn: '1'
id: '1468'
name: 'Encryption controller: Advanced Micro Devices, Inc. [AMD] Zeppelin Cryptographic Coprocessor NTBCCP'
- bus: '0a'
dev: '00'
fn: '2'
id: '7901'
name: 'SATA controller: Advanced Micro Devices, Inc. [AMD] FCH SATA Controller [AHCI mode] (rev 51)'
- 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: '0a'
dev: '00'
fn: '4'
id: '1458'
name: 'Ethernet controller: Advanced Micro Devices, Inc. [AMD] Device 1458'
- bus: '0a'
dev: '00'
fn: '5'
id: '1458'
name: 'Ethernet controller: Advanced Micro Devices, Inc. [AMD] Device 1458'
Loading

0 comments on commit 6aeb3df

Please sign in to comment.