Skip to content

Commit 6aeb3df

Browse files
Merge remote-tracking branch 'origin/master' into HEAD
2 parents 59c88fe + 0d84f13 commit 6aeb3df

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+1609
-25
lines changed

.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -91,3 +91,6 @@
9191
path = platform/broadcom/saibcm-modules-dnx
9292
url = https://github.com/Azure/saibcm-modules.git
9393
branch = sdk-6.5.22-gpl-dnx
94+
[submodule "platform/broadcom/sonic-platform-modules-nokia"]
95+
path = platform/broadcom/sonic-platform-modules-nokia
96+
url = https://github.com/nokia/sonic-platform.git
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"CONTEXTS": [
3+
{
4+
"guid" : 0,
5+
"name" : "syncd0",
6+
"dbAsic" : "ASIC_DB",
7+
"dbCounters" : "COUNTERS_DB",
8+
"dbFlex": "FLEX_COUNTER_DB",
9+
"dbState" : "STATE_DB",
10+
"zmq_enable": false,
11+
"zmq_endpoint": "tcp://127.0.0.1:5555",
12+
"zmq_ntf_endpoint": "tcp://127.0.0.1:5556",
13+
"switches": [
14+
{
15+
"index" : 0,
16+
"hwinfo" : "06:00.0"
17+
}
18+
]
19+
}
20+
]
21+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# name lanes alias index asic_port_name role speed coreid coreportid numvoq
2+
Ethernet0 72,73,74,75,76,77,78,79 Ethernet0 1 Eth0-ASIC0 Ext 400000 1 0 8
3+
Ethernet1 80,81,82,83,84,85,86,87 Ethernet1 2 Eth1-ASIC0 Ext 400000 1 1 8
4+
Ethernet2 88,89,90,91,92,93,94,95 Ethernet2 3 Eth2-ASIC0 Ext 400000 1 2 8
5+
Ethernet3 96,97,98,99,100,101,102,103 Ethernet3 4 Eth3-ASIC0 Ext 400000 1 3 8
6+
Ethernet4 104,105,106,107,108,109,110,111 Ethernet4 5 Eth4-ASIC0 Ext 400000 1 4 8
7+
Ethernet5 112,113,114,115,116,117,118,119 Ethernet5 6 Eth5-ASIC0 Ext 400000 1 5 8
8+
Ethernet6 120,121,122,123,124,125,126,127 Ethernet6 7 Eth6-ASIC0 Ext 400000 1 6 8
9+
Ethernet7 128,129,130,131,132,133,134,135 Ethernet7 8 Eth7-ASIC0 Ext 400000 1 7 8
10+
Ethernet8 136,137,138,139,140,141,142,143 Ethernet8 9 Eth8-ASIC0 Ext 400000 1 8 8
11+
Ethernet9 64,65,66,67,68,69,70,71 Ethernet9 10 Eth9-ASIC0 Ext 400000 0 1 8
12+
Ethernet10 56,57,58,59,60,61,62,63 Ethernet10 11 Eth10-ASIC0 Ext 400000 0 2 8
13+
Ethernet11 48,49,50,51,52,53,54,55 Ethernet11 12 Eth11-ASIC0 Ext 400000 0 3 8
14+
Ethernet12 40,41,42,43,44,45,46,47 Ethernet12 13 Eth12-ASIC0 Ext 400000 0 4 8
15+
Ethernet13 32,33,34,35,36,37,38,39 Ethernet13 14 Eth13-ASIC0 Ext 400000 0 5 8
16+
Ethernet14 24,25,26,27,28,29,30,31 Ethernet14 15 Eth14-ASIC0 Ext 400000 0 6 8
17+
Ethernet15 16,17,18,19,20,21,22,23 Ethernet15 16 Eth15-ASIC0 Ext 400000 0 7 8
18+
Ethernet16 8,9,10,11,12,13,14,15 Ethernet16 17 Eth16-ASIC0 Ext 400000 0 8 8
19+
Ethernet17 0,1,2,3,4,5,6,7 Ethernet17 18 Eth17-ASIC0 Ext 400000 0 9 8
20+
Ethernet-IB0 115 Ethernet-IB0 37 Rcy-ASIC0 Int 10000 0 10 8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/jr2cp-nokia-18x400g-config.bcm
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"CONTEXTS": [
3+
{
4+
"guid" : 0,
5+
"name" : "syncd1",
6+
"dbAsic" : "ASIC_DB",
7+
"dbCounters" : "COUNTERS_DB",
8+
"dbFlex": "FLEX_COUNTER_DB",
9+
"dbState" : "STATE_DB",
10+
"zmq_enable": false,
11+
"zmq_endpoint": "tcp://127.0.0.1:5555",
12+
"zmq_ntf_endpoint": "tcp://127.0.0.1:5556",
13+
"switches": [
14+
{
15+
"index" : 1,
16+
"hwinfo" : "07:00.0"
17+
}
18+
]
19+
}
20+
]
21+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# name lanes alias index asic_port_name role speed coreid coreportid numvoq
2+
Ethernet18 72,73,74,75,76,77,78,79 Ethernet18 19 Eth0-ASIC1 Ext 400000 1 0 8
3+
Ethernet19 80,81,82,83,84,85,86,87 Ethernet19 20 Eth1-ASIC1 Ext 400000 1 1 8
4+
Ethernet20 88,89,90,91,92,93,94,95 Ethernet20 21 Eth2-ASIC1 Ext 400000 1 2 8
5+
Ethernet21 96,97,98,99,100,101,102,103 Ethernet21 22 Eth3-ASIC1 Ext 400000 1 3 8
6+
Ethernet22 104,105,106,107,108,109,110,111 Ethernet22 23 Eth4-ASIC1 Ext 400000 1 4 8
7+
Ethernet23 112,113,114,115,116,117,118,119 Ethernet23 24 Eth5-ASIC1 Ext 400000 1 5 8
8+
Ethernet24 120,121,122,123,124,125,126,127 Ethernet24 25 Eth6-ASIC1 Ext 400000 1 6 8
9+
Ethernet25 128,129,130,131,132,133,134,135 Ethernet25 26 Eth7-ASIC1 Ext 400000 1 7 8
10+
Ethernet26 136,137,138,139,140,141,142,143 Ethernet26 27 Eth8-ASIC1 Ext 400000 1 8 8
11+
Ethernet27 64,65,66,67,68,69,70,71 Ethernet27 28 Eth9-ASIC1 Ext 400000 0 1 8
12+
Ethernet28 56,57,58,59,60,61,62,63 Ethernet28 29 Eth10-ASIC1 Ext 400000 0 2 8
13+
Ethernet29 48,49,50,51,52,53,54,55 Ethernet29 30 Eth11-ASIC1 Ext 400000 0 3 8
14+
Ethernet30 40,41,42,43,44,45,46,47 Ethernet30 31 Eth12-ASIC1 Ext 400000 0 4 8
15+
Ethernet31 32,33,34,35,36,37,38,39 Ethernet31 32 Eth13-ASIC1 Ext 400000 0 5 8
16+
Ethernet32 24,25,26,27,28,29,30,31 Ethernet32 33 Eth14-ASIC1 Ext 400000 0 6 8
17+
Ethernet33 16,17,18,19,20,21,22,23 Ethernet33 34 Eth15-ASIC1 Ext 400000 0 7 8
18+
Ethernet34 8,9,10,11,12,13,14,15 Ethernet34 35 Eth16-ASIC1 Ext 400000 0 8 8
19+
Ethernet35 0,1,2,3,4,5,6,7 Ethernet35 36 Eth17-ASIC1 Ext 400000 0 9 8
20+
Ethernet-IB1 115 Ethernet-IB1 38 Rcy-ASIC1 Int 10000 0 10 8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/jr2cp-nokia-18x400g-config.bcm
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
NUM_ASIC=2
2+
DEV_ID_ASIC_0=06:00.0
3+
DEV_ID_ASIC_1=07:00.0
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
chassis_db_address=10.0.5.16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Nokia-IXR7250E-36x400G empty
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
CONSOLE_PORT=0x3f8
2+
CONSOLE_DEV=0
3+
CONSOLE_SPEED=115200
4+
ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="amd_iommu=off pci=resource_alignment=48@00:03.1"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,220 @@
1+
- bus: '00'
2+
dev: '00'
3+
fn: '0'
4+
id: '1450'
5+
name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh) Root Complex'
6+
- bus: '00'
7+
dev: '00'
8+
fn: '2'
9+
id: '1451'
10+
name: 'IOMMU: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh) I/O Memory Management Unit'
11+
- bus: '00'
12+
dev: '01'
13+
fn: '0'
14+
id: '1452'
15+
name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-1fh) PCIe Dummy Host Bridge'
16+
- bus: '00'
17+
dev: '01'
18+
fn: '1'
19+
id: '1453'
20+
name: 'PCI bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh) PCIe GPP Bridge'
21+
- bus: '00'
22+
dev: '01'
23+
fn: '2'
24+
id: '1453'
25+
name: 'PCI bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh) PCIe GPP Bridge'
26+
- bus: '00'
27+
dev: '02'
28+
fn: '0'
29+
id: '1452'
30+
name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-1fh) PCIe Dummy Host Bridge'
31+
- bus: '00'
32+
dev: '03'
33+
fn: '0'
34+
id: '1452'
35+
name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-1fh) PCIe Dummy Host Bridge'
36+
- bus: '00'
37+
dev: '03'
38+
fn: '1'
39+
id: '1453'
40+
name: 'PCI bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh) PCIe GPP Bridge'
41+
- bus: '00'
42+
dev: '04'
43+
fn: '0'
44+
id: '1452'
45+
name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-1fh) PCIe Dummy Host Bridge'
46+
- bus: '00'
47+
dev: '07'
48+
fn: '0'
49+
id: '1452'
50+
name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-1fh) PCIe Dummy Host Bridge'
51+
- bus: '00'
52+
dev: '07'
53+
fn: '1'
54+
id: '1454'
55+
name: 'PCI bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh) Internal PCIe GPP Bridge 0 to Bus B'
56+
- bus: '00'
57+
dev: '08'
58+
fn: '0'
59+
id: '1452'
60+
name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-1fh) PCIe Dummy Host Bridge'
61+
- bus: '00'
62+
dev: '08'
63+
fn: '1'
64+
id: '1454'
65+
name: 'PCI bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh) Internal PCIe GPP Bridge 0 to Bus B'
66+
- bus: '00'
67+
dev: '14'
68+
fn: '0'
69+
id: '790b'
70+
name: 'SMBus: Advanced Micro Devices, Inc. [AMD] FCH SMBus Controller (rev 59)'
71+
- bus: '00'
72+
dev: '14'
73+
fn: '3'
74+
id: '790e'
75+
name: 'ISA bridge: Advanced Micro Devices, Inc. [AMD] FCH LPC Bridge (rev 51)'
76+
- bus: '00'
77+
dev: '18'
78+
fn: '0'
79+
id: '1460'
80+
name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh) Data Fabric: Device 18h; Function 0'
81+
- bus: '00'
82+
dev: '18'
83+
fn: '1'
84+
id: '1461'
85+
name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh) Data Fabric: Device 18h; Function 1'
86+
- bus: '00'
87+
dev: '18'
88+
fn: '2'
89+
id: '1462'
90+
name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh) Data Fabric: Device 18h; Function 2'
91+
- bus: '00'
92+
dev: '18'
93+
fn: '3'
94+
id: '1463'
95+
name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh) Data Fabric: Device 18h; Function 3'
96+
- bus: '00'
97+
dev: '18'
98+
fn: '4'
99+
id: '1464'
100+
name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh) Data Fabric: Device 18h; Function 4'
101+
- bus: '00'
102+
dev: '18'
103+
fn: '5'
104+
id: '1465'
105+
name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh) Data Fabric: Device 18h; Function 5'
106+
- bus: '00'
107+
dev: '18'
108+
fn: '6'
109+
id: '1466'
110+
name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh) Data Fabric: Device 18h; Function 6'
111+
- bus: '00'
112+
dev: '18'
113+
fn: '7'
114+
id: '1467'
115+
name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh) Data Fabric: Device 18h; Function 7'
116+
- bus: '01'
117+
dev: '00'
118+
fn: '0'
119+
id: '157b'
120+
name: 'Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev 03)'
121+
- bus: '02'
122+
dev: '00'
123+
fn: '0'
124+
id: '2001'
125+
name: 'Unassigned class [ff00]: Alcatel Device 2001'
126+
- bus: '03'
127+
dev: '00'
128+
fn: '0'
129+
id: '8562'
130+
name: 'PCI bridge: PMC-Sierra Inc. Device 8562'
131+
- bus: '03'
132+
dev: '00'
133+
fn: '1'
134+
id: '8562'
135+
name: 'Memory controller: PMC-Sierra Inc. Device 8562'
136+
- bus: '04'
137+
dev: '00'
138+
fn: '0'
139+
id: '8562'
140+
name: 'PCI bridge: PMC-Sierra Inc. Device 8562'
141+
- bus: '04'
142+
dev: '01'
143+
fn: '0'
144+
id: '8562'
145+
name: 'PCI bridge: PMC-Sierra Inc. Device 8562'
146+
- bus: '04'
147+
dev: '02'
148+
fn: '0'
149+
id: '8562'
150+
name: 'PCI bridge: PMC-Sierra Inc. Device 8562'
151+
- bus: '04'
152+
dev: '03'
153+
fn: '0'
154+
id: '8562'
155+
name: 'PCI bridge: PMC-Sierra Inc. Device 8562'
156+
- bus: '05'
157+
dev: '00'
158+
fn: '0'
159+
id: '001a'
160+
name: 'Unassigned class [ff00]: Alcatel Device 001a (rev 35)'
161+
- bus: '06'
162+
dev: '00'
163+
fn: '0'
164+
id: '8850'
165+
name: 'Ethernet controller: Broadcom Limited Device 8850 (rev 01)'
166+
- bus: '07'
167+
dev: '00'
168+
fn: '0'
169+
id: '8850'
170+
name: 'Ethernet controller: Broadcom Limited Device 8850 (rev 01)'
171+
- bus: '08'
172+
dev: '00'
173+
fn: '0'
174+
id: '7028'
175+
name: 'Memory controller: Xilinx Corporation Device 7028'
176+
- bus: '09'
177+
dev: '00'
178+
fn: '0'
179+
id: '145a'
180+
name: 'Non-Essential Instrumentation [1300]: Advanced Micro Devices, Inc. [AMD] Zeppelin/Raven/Raven2 PCIe Dummy Function'
181+
- bus: '09'
182+
dev: '00'
183+
fn: '2'
184+
id: '1456'
185+
name: 'Encryption controller: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh) Platform Security Processor'
186+
- bus: '09'
187+
dev: '00'
188+
fn: '3'
189+
id: '145f'
190+
name: 'USB controller: Advanced Micro Devices, Inc. [AMD] Zeppelin USB 3.0 Host controller'
191+
- bus: '0a'
192+
dev: '00'
193+
fn: '0'
194+
id: '1455'
195+
name: 'Non-Essential Instrumentation [1300]: Advanced Micro Devices, Inc. [AMD] Zeppelin/Renoir PCIe Dummy Function'
196+
- bus: '0a'
197+
dev: '00'
198+
fn: '1'
199+
id: '1468'
200+
name: 'Encryption controller: Advanced Micro Devices, Inc. [AMD] Zeppelin Cryptographic Coprocessor NTBCCP'
201+
- bus: '0a'
202+
dev: '00'
203+
fn: '2'
204+
id: '7901'
205+
name: 'SATA controller: Advanced Micro Devices, Inc. [AMD] FCH SATA Controller [AHCI mode] (rev 51)'
206+
- bus: '0a'
207+
dev: '00'
208+
fn: '3'
209+
id: '1457'
210+
name: 'Audio device: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh) HD Audio Controller'
211+
- bus: '0a'
212+
dev: '00'
213+
fn: '4'
214+
id: '1458'
215+
name: 'Ethernet controller: Advanced Micro Devices, Inc. [AMD] Device 1458'
216+
- bus: '0a'
217+
dev: '00'
218+
fn: '5'
219+
id: '1458'
220+
name: 'Ethernet controller: Advanced Micro Devices, Inc. [AMD] Device 1458'

0 commit comments

Comments
 (0)