Skip to content

Commit 2d55827

Browse files
Pavan-Nokiamssonicbld
authored andcommitted
[armhf][Nokia-7215]Update HWSKU files for new SAI (sonic-net#18294)
1 parent fe1e96d commit 2d55827

10 files changed

+147
-44
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
429e9dc38eebb3093b21e687edf55e79
1+
78ea2f9bc238a32b68823bc7b082198d

device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/ASK-Board-M0-48x1G-4x10G.xml

Lines changed: 36 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" version="2023-05-05-1.04" profile="Askboard" dsig="md5">
2+
<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" version="2023-11-20-1.05" profile="Askboard" sid="20929980-c61f-4f1d-b08a-4e64f6d717c2">
33
<askboardplt:ASK-Board xmlns:askboardplt="urn:marvell:askboard:yang">
44
<askboardplt:typedefs>
55
<askboardplt:typedef>
@@ -82,9 +82,9 @@
8282
<askboardplt:typedef>
8383
<askboardplt:name>device-id-type</askboardplt:name>
8484
<askboardplt:type>uint32</askboardplt:type>
85-
<askboardplt:description>Device ID 0..1023</askboardplt:description>
85+
<askboardplt:description>Device ID 0..1</askboardplt:description>
8686
<askboardplt:min>0</askboardplt:min>
87-
<askboardplt:max>1023</askboardplt:max>
87+
<askboardplt:max>1</askboardplt:max>
8888
</askboardplt:typedef>
8989
<askboardplt:typedef>
9090
<askboardplt:name>port-mapping-type</askboardplt:name>
@@ -111,11 +111,9 @@
111111
<askboardplt:typedef>
112112
<askboardplt:name>txq-port-number-type</askboardplt:name>
113113
<askboardplt:type>uint32</askboardplt:type>
114-
<askboardplt:description>0 - 8 queues are configured per port (legacy mode),
115-
1...16 - the number of queues configured per port
116-
SIP 5 : Bobcat2,BobK:0..71 ;Bobcat3: 0..576 ;Aldrin2:0..99</askboardplt:description>
114+
<askboardplt:description>TXq port number </askboardplt:description>
117115
<askboardplt:min>0</askboardplt:min>
118-
<askboardplt:max>576</askboardplt:max>
116+
<askboardplt:max>99</askboardplt:max>
119117
</askboardplt:typedef>
120118
<askboardplt:typedef>
121119
<askboardplt:name>phy-smi-interface-type</askboardplt:name>
@@ -162,12 +160,14 @@
162160
</askboardplt:enum>
163161
<askboardplt:enum>
164162
<askboardplt:name>alaska-88E3140</askboardplt:name>
165-
<askboardplt:description>Specifies PHY identifier 88E3140, used for Copper with speeds of 100M/1G/10G. Uses with FW SolarFlare next generation.</askboardplt:description>
163+
<askboardplt:description>Specifies PHY identifier 88E3140, used for Copper with speeds of 100M/1G/10G.
164+
Uses with FW SolarFlare next generation.</askboardplt:description>
166165
<askboardplt:value>5</askboardplt:value>
167166
</askboardplt:enum>
168167
<askboardplt:enum>
169168
<askboardplt:name>alaska-88E3240</askboardplt:name>
170-
<askboardplt:description>Specifies PHY identifier 88E3240, used for Copper with speeds of 100M/1G/10G. Uses with FW, SolarFlare next generation.</askboardplt:description>
169+
<askboardplt:description>Specifies PHY identifier 88E3240, used for Copper with speeds of 100M/1G/10G.
170+
Uses with FW, SolarFlare next generation.</askboardplt:description>
171171
<askboardplt:value>6</askboardplt:value>
172172
</askboardplt:enum>
173173
<askboardplt:enum>
@@ -177,7 +177,8 @@
177177
</askboardplt:enum>
178178
<askboardplt:enum>
179179
<askboardplt:name>alaska-88E3220</askboardplt:name>
180-
<askboardplt:description>Specifies PHY identifier 88E3220, used for Combo port with speeds of 100M/1G/10G. Uses FW, SolarFlare next generation.</askboardplt:description>
180+
<askboardplt:description>Specifies PHY identifier 88E3220, used for Combo port with speeds of 100M/1G/10G.
181+
Uses FW, SolarFlare next generation.</askboardplt:description>
181182
<askboardplt:value>8</askboardplt:value>
182183
</askboardplt:enum>
183184
<askboardplt:enum>
@@ -212,17 +213,20 @@
212213
</askboardplt:enum>
213214
<askboardplt:enum>
214215
<askboardplt:name>alaska-88E1780</askboardplt:name>
215-
<askboardplt:description>Specifies PHY identifier 88E1780, Integrated Octal 10/100/1000 Mbps Energy Efficient Ethernet Transceiver</askboardplt:description>
216+
<askboardplt:description>Specifies PHY identifier 88E1780, Integrated Octal 10/100/1000 Mbps Energy
217+
Efficient Ethernet Transceiver</askboardplt:description>
216218
<askboardplt:value>15</askboardplt:value>
217219
</askboardplt:enum>
218220
<askboardplt:enum>
219221
<askboardplt:name>alaska-88E2540</askboardplt:name>
220-
<askboardplt:description>Specifies PHY identifier 88E2540, 4 ports 10/100/1000/2.5G/5GBASE-T Ethernet Transceiver with IEEE 1588v2 PTP Support</askboardplt:description>
222+
<askboardplt:description>Specifies PHY identifier 88E2540, 4 ports 10/100/1000/2.5G/5GBASE-T Ethernet
223+
Transceiver with IEEE 1588v2 PTP Support</askboardplt:description>
221224
<askboardplt:value>16</askboardplt:value>
222225
</askboardplt:enum>
223226
<askboardplt:enum>
224227
<askboardplt:name>alaska-88E2580</askboardplt:name>
225-
<askboardplt:description>Specifies PHY identifier 88E12580, Octal 10/100/1000/2.5G/5GBASE-T Ethernet Transceiver with IEEE 1588v2 PTP Support</askboardplt:description>
228+
<askboardplt:description>Specifies PHY identifier 88E12580, Octal 10/100/1000/2.5G/5GBASE-T Ethernet Transceiver
229+
with IEEE 1588v2 PTP Support</askboardplt:description>
226230
<askboardplt:value>17</askboardplt:value>
227231
</askboardplt:enum>
228232
</askboardplt:typedef>
@@ -510,7 +514,7 @@
510514
<askboardplt:type>uint32</askboardplt:type>
511515
<askboardplt:description>serdes lane</askboardplt:description>
512516
<askboardplt:min>0</askboardplt:min>
513-
<askboardplt:max>255</askboardplt:max>
517+
<askboardplt:max>7</askboardplt:max>
514518
</askboardplt:typedef>
515519
<askboardplt:typedef>
516520
<askboardplt:name>cpu-type</askboardplt:name>
@@ -589,12 +593,12 @@ lowercase characters.</askboardplt:description>
589593
</askboardplt:enum>
590594
<askboardplt:enum>
591595
<askboardplt:name>sip5</askboardplt:name>
592-
<askboardplt:description>SIP5: AC5, AC3x</askboardplt:description>
596+
<askboardplt:description>SIP5: AC3x</askboardplt:description>
593597
<askboardplt:value>5</askboardplt:value>
594598
</askboardplt:enum>
595599
<askboardplt:enum>
596600
<askboardplt:name>sip6</askboardplt:name>
597-
<askboardplt:description>SIP6: Falcon, AC5x, AC5P</askboardplt:description>
601+
<askboardplt:description>SIP6: Falcon, AC5x</askboardplt:description>
598602
<askboardplt:value>6</askboardplt:value>
599603
</askboardplt:enum>
600604
</askboardplt:typedef>
@@ -665,7 +669,23 @@ lowercase characters.</askboardplt:description>
665669
<askboardplt:value>1</askboardplt:value>
666670
</askboardplt:enum>
667671
</askboardplt:typedef>
672+
<askboardplt:typedef>
673+
<askboardplt:name>asic-type</askboardplt:name>
674+
<askboardplt:type>enumeration</askboardplt:type>
675+
<askboardplt:description>ASIC Type</askboardplt:description>
676+
<askboardplt:enum>
677+
<askboardplt:name>ASIC_AC3X</askboardplt:name>
678+
<askboardplt:description>AC3X</askboardplt:description>
679+
<askboardplt:value>0</askboardplt:value>
680+
</askboardplt:enum>
681+
<askboardplt:enum>
682+
<askboardplt:name>ASIC_AC5X</askboardplt:name>
683+
<askboardplt:description>AC5X</askboardplt:description>
684+
<askboardplt:value>1</askboardplt:value>
685+
</askboardplt:enum>
686+
</askboardplt:typedef>
668687
</askboardplt:typedefs>
688+
<askboardplt:ASIC_Type askboardplt:type="asic-type">ASIC_AC3X</askboardplt:ASIC_Type>
669689
<askboardplt:boardName askboardplt:type="std-string">M0-48x1G-4x10G</askboardplt:boardName>
670690
<askboardplt:osCallType askboardplt:type="board-callback-type">linux-static</askboardplt:osCallType>
671691
<askboardplt:extDrvCallType askboardplt:type="board-callback-type">linux-static</askboardplt:extDrvCallType>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
c2fad8d9eea6eb57614af010b4c7ad17
1+
a51445be255ef6afa324278ba9e191d9

device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/ASK-L1-M0-D0-48x1G-4x10G.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" version="2023-05-05-1.04" profile="Askl1" dsig="md5">
2+
<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" version="2023-11-20-1.05" profile="Askl1" sid="a9deb744-f6cb-4675-bab3-11132e7db1cd">
33
<ASKL1plt:ASK-L1 xmlns:ASKL1plt="urn:marvell:ASKL1:yang">
44
<ASKL1plt:typedefs>
55
<ASKL1plt:typedef>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
d1884cf0a6d9728290e522a41337e86e
1+
afe146bae79635a1513eba92343210b6

device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/ASK-L1-M0-D1-48x1G-4x10G.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" version="2023-05-05-1.04" profile="Askl1" dsig="md5">
2+
<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" version="2023-11-20-1.05" profile="Askl1" sid="a9deb744-f6cb-4675-bab3-11132e7db1cd">
33
<ASKL1plt:ASK-L1 xmlns:ASKL1plt="urn:marvell:ASKL1:yang">
44
<ASKL1plt:typedefs>
55
<ASKL1plt:typedef>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8fdb417a68122b4d127e5b7c6750bd68
1+
e9257245632ec82a066bef433451b17f

device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/ASK-PP-M0-48x1G-4x10G.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" version="2023-05-05-1.04" profile="Askpp" dsig="md5">
2+
<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" version="2023-11-20-1.05" profile="Askpp" sid="fdf5b1c2-b80a-47a6-ac37-47e174286524">
33
<askppplt:ASK-PP xmlns:askppplt="urn:marvell:askpp:yang">
44
<askppplt:typedefs>
55
<askppplt:typedef>
@@ -357,28 +357,28 @@
357357
<askppplt:enum>
358358
<askppplt:name>NATIVE</askppplt:name>
359359
<askppplt:description>NATIVE
360-
* the trunk members are filled
361-
* according to the order given by application.
362-
* Regular trunk may hold max of 8 members.
363-
* Cascade trunk may hold :
364-
* max of 64 members</askppplt:description>
360+
* the trunk members are filled
361+
* according to the order given by application.
362+
* Regular trunk may hold max of 8 members.
363+
* Cascade trunk may hold :
364+
* max of 64 members</askppplt:description>
365365
<askppplt:value>0</askppplt:value>
366366
</askppplt:enum>
367367
<askppplt:enum>
368368
<askppplt:name>FLEX</askppplt:name>
369369
<askppplt:description>FLEX
370-
* A mode to allows flexibility for
371-
* each Regular trunk to state it's max number of members (before starting to add members).
372-
* (this mode not effect 'cascade trunk' members)
373-
* Regular trunk may hold : max of 4K members. (each trunk set it's own limit)
374-
* Cascade trunk may hold : max of 64 members.</askppplt:description>
370+
* A mode to allows flexibility for
371+
* each Regular trunk to state it's max number of members (before starting to add members).
372+
* (this mode not effect 'cascade trunk' members)
373+
* Regular trunk may hold : max of 4K members. (each trunk set it's own limit)
374+
* Cascade trunk may hold : max of 64 members.</askppplt:description>
375375
<askppplt:value>2</askppplt:value>
376376
</askppplt:enum>
377377
</askppplt:typedef>
378378
<askppplt:typedef>
379379
<askppplt:name>number-physical-port-type</askppplt:name>
380380
<askppplt:type>enumeration</askppplt:type>
381-
<askppplt:description>ac5x 128, falcon 64,128,256, 512, 1024</askppplt:description>
381+
<askppplt:description>AC3X/AC5X 128, falcon 64, 128, 256, 512, 1024</askppplt:description>
382382
<askppplt:enum>
383383
<askppplt:name>no-ports</askppplt:name>
384384
<askppplt:description>no-ports</askppplt:description>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6a6dc37a64244b9e80f31008ea68f276
1+
999d0a26c697a35601fcef34127c216d

device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/SAI-M0-48x1G-4x10G.xml

Lines changed: 92 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" version="2023-05-05-1.04" profile="SAI" dsig="md5">
2+
<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" version="2023-11-20-1.05" profile="SAI" sid="fd56a8b4-6b41-4ead-9a27-c491bc2f95b9">
33
<SAIplt:SAI xmlns:SAIplt="urn:marvell:SAI:yang">
44
<SAIplt:typedefs>
55
<SAIplt:typedef>
66
<SAIplt:name>device-id-type</SAIplt:name>
77
<SAIplt:type>uint32</SAIplt:type>
8-
<SAIplt:description>Device ID 0..1023</SAIplt:description>
8+
<SAIplt:description>Device ID 0..1</SAIplt:description>
99
<SAIplt:min>0</SAIplt:min>
10-
<SAIplt:max>1023</SAIplt:max>
10+
<SAIplt:max>1</SAIplt:max>
1111
</SAIplt:typedef>
1212
<SAIplt:typedef>
1313
<SAIplt:name>port-id-type</SAIplt:name>
@@ -22,7 +22,7 @@
2222
<SAIplt:description>Logging Feature Options</SAIplt:description>
2323
<SAIplt:enum>
2424
<SAIplt:name>SAI_LOG_SYSLOG</SAIplt:name>
25-
<SAIplt:description>SYSLOG {Syslog service should be running to use this option}</SAIplt:description>
25+
<SAIplt:description>SYSLOG {Syslog service should be running to use this option}</SAIplt:description>
2626
<SAIplt:value>0</SAIplt:value>
2727
</SAIplt:enum>
2828
<SAIplt:enum>
@@ -32,7 +32,7 @@
3232
</SAIplt:enum>
3333
<SAIplt:enum>
3434
<SAIplt:name>SAI_LOG_FILE</SAIplt:name>
35-
<SAIplt:description>FILE {Warning !!! Use with caution. Can cause disk full issues}</SAIplt:description>
35+
<SAIplt:description>FILE {Warning !!! Use with caution. Can cause disk full issues}</SAIplt:description>
3636
<SAIplt:value>2</SAIplt:value>
3737
</SAIplt:enum>
3838
</SAIplt:typedef>
@@ -43,7 +43,92 @@
4343
<SAIplt:min>2</SAIplt:min>
4444
<SAIplt:max>30</SAIplt:max>
4545
</SAIplt:typedef>
46+
<SAIplt:typedef>
47+
<SAIplt:name>acl-feature-name-type</SAIplt:name>
48+
<SAIplt:type>enumeration</SAIplt:type>
49+
<SAIplt:description/>
50+
<SAIplt:enum>
51+
<SAIplt:name>port-sFlow</SAIplt:name>
52+
<SAIplt:description>SFlow over Port</SAIplt:description>
53+
<SAIplt:value>0</SAIplt:value>
54+
</SAIplt:enum>
55+
<SAIplt:enum>
56+
<SAIplt:name>port-counters-ipv4-ipv6</SAIplt:name>
57+
<SAIplt:description>Port ipv4/ipv6 counters</SAIplt:description>
58+
<SAIplt:value>1</SAIplt:value>
59+
</SAIplt:enum>
60+
<SAIplt:enum>
61+
<SAIplt:name>control-acl</SAIplt:name>
62+
<SAIplt:description>ACLs for control packet handling</SAIplt:description>
63+
<SAIplt:value>2</SAIplt:value>
64+
</SAIplt:enum>
65+
</SAIplt:typedef>
66+
<SAIplt:typedef>
67+
<SAIplt:name>ingress-acl-stage-type</SAIplt:name>
68+
<SAIplt:type>enumeration</SAIplt:type>
69+
<SAIplt:description/>
70+
<SAIplt:enum>
71+
<SAIplt:name>disabled</SAIplt:name>
72+
<SAIplt:description>Feature not enabled</SAIplt:description>
73+
<SAIplt:value>0</SAIplt:value>
74+
</SAIplt:enum>
75+
<SAIplt:enum>
76+
<SAIplt:name>IPCL0</SAIplt:name>
77+
<SAIplt:description>Stage IPCL0</SAIplt:description>
78+
<SAIplt:value>1</SAIplt:value>
79+
</SAIplt:enum>
80+
<SAIplt:enum>
81+
<SAIplt:name>IPCL1</SAIplt:name>
82+
<SAIplt:description>Stage IPCL1</SAIplt:description>
83+
<SAIplt:value>2</SAIplt:value>
84+
</SAIplt:enum>
85+
</SAIplt:typedef>
86+
<SAIplt:typedef>
87+
<SAIplt:name>egress-acl-stage-type</SAIplt:name>
88+
<SAIplt:type>enumeration</SAIplt:type>
89+
<SAIplt:description/>
90+
<SAIplt:enum>
91+
<SAIplt:name>disabled</SAIplt:name>
92+
<SAIplt:description>Feature not enabled</SAIplt:description>
93+
<SAIplt:value>0</SAIplt:value>
94+
</SAIplt:enum>
95+
<SAIplt:enum>
96+
<SAIplt:name>EPCL0</SAIplt:name>
97+
<SAIplt:description>Stage EPCL0</SAIplt:description>
98+
<SAIplt:value>2</SAIplt:value>
99+
</SAIplt:enum>
100+
</SAIplt:typedef>
101+
<SAIplt:typedef>
102+
<SAIplt:name>feature-priority-type</SAIplt:name>
103+
<SAIplt:type>uint32</SAIplt:type>
104+
<SAIplt:description>Feature priority</SAIplt:description>
105+
<SAIplt:min>2</SAIplt:min>
106+
<SAIplt:max>15</SAIplt:max>
107+
</SAIplt:typedef>
108+
<SAIplt:typedef>
109+
<SAIplt:name>hit-number-type</SAIplt:name>
110+
<SAIplt:type>uint32</SAIplt:type>
111+
<SAIplt:description>Hit/lookup number</SAIplt:description>
112+
<SAIplt:min>0</SAIplt:min>
113+
<SAIplt:max>3</SAIplt:max>
114+
</SAIplt:typedef>
115+
<SAIplt:typedef>
116+
<SAIplt:name>asic-type</SAIplt:name>
117+
<SAIplt:type>enumeration</SAIplt:type>
118+
<SAIplt:description>ASIC Type</SAIplt:description>
119+
<SAIplt:enum>
120+
<SAIplt:name>ASIC_AC3X</SAIplt:name>
121+
<SAIplt:description>AC3X</SAIplt:description>
122+
<SAIplt:value>0</SAIplt:value>
123+
</SAIplt:enum>
124+
<SAIplt:enum>
125+
<SAIplt:name>ASIC_AC5X</SAIplt:name>
126+
<SAIplt:description>AC5X</SAIplt:description>
127+
<SAIplt:value>1</SAIplt:value>
128+
</SAIplt:enum>
129+
</SAIplt:typedef>
46130
</SAIplt:typedefs>
131+
<SAIplt:ASIC_Type SAIplt:type="asic-type">ASIC_AC3X</SAIplt:ASIC_Type>
47132
<SAIplt:ASK-BOARD-Profile-Name SAIplt:type="string">ASK-Board-M0-48x1G-4x10G.xml</SAIplt:ASK-BOARD-Profile-Name>
48133
<SAIplt:Features>
49134
<SAIplt:RoCE SAIplt:type="boolean">false</SAIplt:RoCE>
@@ -310,17 +395,15 @@
310395
<SAIplt:sdk_port_id SAIplt:type="port-id-type">52</SAIplt:sdk_port_id>
311396
</SAIplt:port-list>
312397
</SAIplt:Ports>
313-
<SAIplt:Scaling>
398+
<SAIplt:scalingAC3>
314399
<SAIplt:max_lag_members SAIplt:type="uint32">8</SAIplt:max_lag_members>
315400
<SAIplt:max_route_ipv4 SAIplt:type="uint32">0</SAIplt:max_route_ipv4>
316401
<SAIplt:max_route_ipv6 SAIplt:type="uint32">0</SAIplt:max_route_ipv6>
317402
<SAIplt:max_Nh_Ecmp_Mbr_Per_Grp SAIplt:type="uint32">32</SAIplt:max_Nh_Ecmp_Mbr_Per_Grp>
318403
<SAIplt:max_ipv4_tunnel SAIplt:type="uint32">8</SAIplt:max_ipv4_tunnel>
319404
<SAIplt:max_ipv6_tunnel SAIplt:type="uint32">8</SAIplt:max_ipv6_tunnel>
320405
<SAIplt:max_tti SAIplt:type="uint32">1024</SAIplt:max_tti>
321-
<SAIplt:wred_size SAIplt:type="uint32">0</SAIplt:wred_size>
322-
<SAIplt:max_nat SAIplt:type="uint32">0</SAIplt:max_nat>
323-
</SAIplt:Scaling>
406+
</SAIplt:scalingAC3>
324407
<SAIplt:Counters>
325408
<SAIplt:cnc-base-list>
326409
<SAIplt:counter-base SAIplt:type="uint32">4096</SAIplt:counter-base>

0 commit comments

Comments
 (0)