Skip to content

Commit c9b70ab

Browse files
author
Harish Venkatraman
committed
[Dell] z9100 port qos & buffer changes of 0330 to master
DO NOT MERGE. Please merge after or along with PR 2239 sonic-net#2239 This commit has the forward porting of changes from 20180330 to master. Unit tested by checking the broadcom registers for the values. The values in hardware reflect the correct values except for TC to PFC priority group map values. Master branch values for TC to PFC priority group map for both z9100 and s6100 in incorrect, I have a build of Oct 12 master and the values are correct in that build. Signed-off-by: Harish Venkatraman <[email protected]>
1 parent 35a0d69 commit c9b70ab

18 files changed

+527
-512
lines changed

device/dell/x86_64-dell_z9100_c2538-r0/Force10-Z9100/buffers_defaults_t1.j2 renamed to device/dell/x86_64-dell_z9100_c2538-r0/Force10-Z9100-C32/buffers_defaults_t1.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"size": "10443264",
1515
"type": "ingress",
1616
"mode": "dynamic",
17-
"xoff": "7335744"
17+
"xoff": "4625920"
1818
},
1919
"egress_lossy_pool": {
2020
"size": "8877440",
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# PG lossless profiles.
2+
# speed cable size xon xoff threshold xon_offset
3+
10000 5m 1248 2288 35776 -3 2288
4+
25000 5m 1248 2288 53248 -3 2288
5+
40000 5m 1248 2288 66560 -3 2288
6+
50000 5m 1248 2288 90272 -3 2288
7+
100000 5m 1248 2288 165568 -3 2288
8+
10000 40m 1248 2288 37024 -3 2288
9+
25000 40m 1248 2288 53248 -3 2288
10+
40000 40m 1248 2288 71552 -3 2288
11+
50000 40m 1248 2288 96096 -3 2288
12+
100000 40m 1248 2288 177632 -3 2288
13+
10000 300m 1248 2288 46176 -3 2288
14+
25000 300m 1248 2288 79040 -3 2288
15+
40000 300m 1248 2288 108160 -3 2288
16+
50000 300m 1248 2288 141856 -3 2288
17+
100000 300m 1248 2288 268736 -3 2288
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,25 @@
11
#TH Z9100 32x100
2+
23
l3_alpm_enable=2
4+
pfc_deadlock_seq_control=1
5+
bcm_stat_interval=2000000
36
bcm_num_cos=8
47
switch_bypass_mode=0
58
mmu_lossless=0
69
lpm_scaling_enable=0
10+
lpm_scaling_enable=0
711
lpm_ipv6_128b_reserved=0
812
ipv6_lpm_128b_enable=1
9-
13+
l2xmsg_mode=1
14+
oversubscribe_mode=1
1015
os=unix
1116

17+
pbmp_oversubscribe=0x3fd000000ff4000003fc000001fe
18+
pbmp_xport_xe=0x3fd000000ff4000003fc000001fe
19+
20+
serdes_if_type_xe=14
21+
serdes_if_type_ce=14
22+
1223
#Parity
1324
parity_correction=1
1425
parity_enable=1
@@ -52,134 +63,139 @@ portmap_33=132:10
5263
portmap_67=133:10
5364
portmap_101=134:10
5465
portmap_135=135:10
66+
5567
xgxs_tx_lane_map_ce0=0x0132
56-
xgxs_rx_lane_map_ce0=0x1023
57-
phy_xaui_tx_polarity_flip_ce0=0xe
58-
phy_xaui_rx_polarity_flip_ce0=0xc
5968
xgxs_tx_lane_map_ce1=0x2301
60-
xgxs_rx_lane_map_ce1=0x1302
61-
phy_xaui_tx_polarity_flip_ce1=0x2
62-
phy_xaui_rx_polarity_flip_ce1=0xd
6369
xgxs_tx_lane_map_ce2=0x0123
64-
xgxs_rx_lane_map_ce2=0x1203
65-
phy_xaui_tx_polarity_flip_ce2=0xa
66-
phy_xaui_rx_polarity_flip_ce2=0x2
6770
xgxs_tx_lane_map_ce3=0x3201
68-
xgxs_rx_lane_map_ce3=0x1302
69-
phy_xaui_tx_polarity_flip_ce3=0xb
70-
phy_xaui_rx_polarity_flip_ce3=0xf
7171
xgxs_tx_lane_map_ce4=0x3210
72-
xgxs_rx_lane_map_ce4=0x3201
73-
phy_xaui_tx_polarity_flip_ce4=0x2
74-
phy_xaui_rx_polarity_flip_ce4=0xc
7572
xgxs_tx_lane_map_ce5=0x2301
76-
xgxs_rx_lane_map_ce5=0x1302
77-
phy_xaui_tx_polarity_flip_ce5=0x0
78-
phy_xaui_rx_polarity_flip_ce5=0x2
7973
xgxs_tx_lane_map_ce6=0x0123
80-
xgxs_rx_lane_map_ce6=0x1203
81-
phy_xaui_tx_polarity_flip_ce6=0x0
82-
phy_xaui_rx_polarity_flip_ce6=0x2
8374
xgxs_tx_lane_map_ce7=0x1320
84-
xgxs_rx_lane_map_ce7=0x2301
85-
phy_xaui_tx_polarity_flip_ce7=0xa
86-
phy_xaui_rx_polarity_flip_ce7=0xd
8775
xgxs_tx_lane_map_ce8=0x1032
88-
xgxs_rx_lane_map_ce8=0x0312
89-
phy_xaui_tx_polarity_flip_ce8=0x0
90-
phy_xaui_rx_polarity_flip_ce8=0xd
9176
xgxs_tx_lane_map_ce9=0x2031
92-
xgxs_rx_lane_map_ce9=0x1302
93-
phy_xaui_tx_polarity_flip_ce9=0xb
94-
phy_xaui_rx_polarity_flip_ce9=0xa
9577
xgxs_tx_lane_map_ce10=0x1023
96-
xgxs_rx_lane_map_ce10=0x2103
97-
phy_xaui_tx_polarity_flip_ce10=0xe
98-
phy_xaui_rx_polarity_flip_ce10=0x7
9978
xgxs_tx_lane_map_ce11=0x0132
100-
xgxs_rx_lane_map_ce11=0x3210
101-
phy_xaui_tx_polarity_flip_ce11=0x6
102-
phy_xaui_rx_polarity_flip_ce11=0xf
10379
xgxs_tx_lane_map_ce12=0x0213
104-
xgxs_rx_lane_map_ce12=0x2301
105-
phy_xaui_tx_polarity_flip_ce12=0x6
106-
phy_xaui_rx_polarity_flip_ce12=0xf
10780
xgxs_tx_lane_map_ce13=0x1032
108-
xgxs_rx_lane_map_ce13=0x0213
109-
phy_xaui_tx_polarity_flip_ce13=0xf
110-
phy_xaui_rx_polarity_flip_ce13=0xd
11181
xgxs_tx_lane_map_ce14=0x0132
112-
xgxs_rx_lane_map_ce14=0x3210
113-
phy_xaui_tx_polarity_flip_ce14=0x5
114-
phy_xaui_rx_polarity_flip_ce14=0x4
11582
xgxs_tx_lane_map_ce15=0x0123
116-
xgxs_rx_lane_map_ce15=0x3210
117-
phy_xaui_tx_polarity_flip_ce15=0x8
118-
phy_xaui_rx_polarity_flip_ce15=0xb
11983
xgxs_tx_lane_map_ce16=0x0123
120-
xgxs_rx_lane_map_ce16=0x3201
121-
phy_xaui_tx_polarity_flip_ce16=0xf
122-
phy_xaui_rx_polarity_flip_ce16=0x2
12384
xgxs_tx_lane_map_ce17=0x0123
124-
xgxs_rx_lane_map_ce17=0x0213
125-
phy_xaui_tx_polarity_flip_ce17=0xf
126-
phy_xaui_rx_polarity_flip_ce17=0xd
12785
xgxs_tx_lane_map_ce18=0x1032
128-
xgxs_rx_lane_map_ce18=0x3210
129-
phy_xaui_tx_polarity_flip_ce18=0xf
130-
phy_xaui_rx_polarity_flip_ce18=0xf
13186
xgxs_tx_lane_map_ce19=0x0123
132-
xgxs_rx_lane_map_ce19=0x3210
133-
phy_xaui_tx_polarity_flip_ce19=0xf
134-
phy_xaui_rx_polarity_flip_ce19=0x0
13587
xgxs_tx_lane_map_ce20=0x2301
136-
xgxs_rx_lane_map_ce20=0x3102
137-
phy_xaui_tx_polarity_flip_ce20=0xf
138-
phy_xaui_rx_polarity_flip_ce20=0x0
13988
xgxs_tx_lane_map_ce21=0x3102
140-
xgxs_rx_lane_map_ce21=0x2103
141-
phy_xaui_tx_polarity_flip_ce21=0xf
142-
phy_xaui_rx_polarity_flip_ce21=0x5
14389
xgxs_tx_lane_map_ce22=0x1023
144-
xgxs_rx_lane_map_ce22=0x2301
145-
phy_xaui_tx_polarity_flip_ce22=0xb
146-
phy_xaui_rx_polarity_flip_ce22=0x0
14790
xgxs_tx_lane_map_ce23=0x2130
148-
xgxs_rx_lane_map_ce23=0x2310
149-
phy_xaui_tx_polarity_flip_ce23=0xa
150-
phy_xaui_rx_polarity_flip_ce23=0x2
15191
xgxs_tx_lane_map_ce24=0x2310
152-
xgxs_rx_lane_map_ce24=0x3201
153-
phy_xaui_tx_polarity_flip_ce24=0xf
154-
phy_xaui_rx_polarity_flip_ce24=0xc
15592
xgxs_tx_lane_map_ce25=0x2013
156-
xgxs_rx_lane_map_ce25=0x0123
157-
phy_xaui_tx_polarity_flip_ce25=0x0
158-
phy_xaui_rx_polarity_flip_ce25=0x8
15993
xgxs_tx_lane_map_ce26=0x0132
160-
xgxs_rx_lane_map_ce26=0x1023
161-
phy_xaui_tx_polarity_flip_ce26=0xb
162-
phy_xaui_rx_polarity_flip_ce26=0x4
16394
xgxs_tx_lane_map_ce27=0x0123
164-
xgxs_rx_lane_map_ce27=0x0213
165-
phy_xaui_tx_polarity_flip_ce27=0x7
166-
phy_xaui_rx_polarity_flip_ce27=0x7
16795
xgxs_tx_lane_map_ce28=0x0213
168-
xgxs_rx_lane_map_ce28=0x1203
169-
phy_xaui_tx_polarity_flip_ce28=0x8
170-
phy_xaui_rx_polarity_flip_ce28=0x7
17196
xgxs_tx_lane_map_ce29=0x0123
172-
xgxs_rx_lane_map_ce29=0x0213
173-
phy_xaui_tx_polarity_flip_ce29=0x3
174-
phy_xaui_rx_polarity_flip_ce29=0x9
17597
xgxs_tx_lane_map_ce30=0x2301
176-
xgxs_rx_lane_map_ce30=0x3201
177-
phy_xaui_tx_polarity_flip_ce30=0xc
178-
phy_xaui_rx_polarity_flip_ce30=0xc
17998
xgxs_tx_lane_map_ce31=0x0123
99+
100+
xgxs_rx_lane_map_ce0=0x1023
101+
xgxs_rx_lane_map_ce1=0x1302
102+
xgxs_rx_lane_map_ce2=0x1203
103+
xgxs_rx_lane_map_ce3=0x1302
104+
xgxs_rx_lane_map_ce4=0x3201
105+
xgxs_rx_lane_map_ce5=0x1302
106+
xgxs_rx_lane_map_ce6=0x1203
107+
xgxs_rx_lane_map_ce7=0x2301
108+
xgxs_rx_lane_map_ce8=0x0312
109+
xgxs_rx_lane_map_ce9=0x1302
110+
xgxs_rx_lane_map_ce10=0x2103
111+
xgxs_rx_lane_map_ce11=0x3210
112+
xgxs_rx_lane_map_ce12=0x2301
113+
xgxs_rx_lane_map_ce13=0x0213
114+
xgxs_rx_lane_map_ce14=0x3210
115+
xgxs_rx_lane_map_ce15=0x3210
116+
xgxs_rx_lane_map_ce16=0x3201
117+
xgxs_rx_lane_map_ce17=0x0213
118+
xgxs_rx_lane_map_ce18=0x3210
119+
xgxs_rx_lane_map_ce19=0x3210
120+
xgxs_rx_lane_map_ce20=0x3102
121+
xgxs_rx_lane_map_ce21=0x2103
122+
xgxs_rx_lane_map_ce22=0x2301
123+
xgxs_rx_lane_map_ce23=0x2310
124+
xgxs_rx_lane_map_ce24=0x3201
125+
xgxs_rx_lane_map_ce25=0x0123
126+
xgxs_rx_lane_map_ce26=0x1023
127+
xgxs_rx_lane_map_ce27=0x0213
128+
xgxs_rx_lane_map_ce28=0x1203
129+
xgxs_rx_lane_map_ce29=0x0213
130+
xgxs_rx_lane_map_ce30=0x3201
180131
xgxs_rx_lane_map_ce31=0x0213
132+
133+
phy_xaui_tx_polarity_flip_ce0=0xe
134+
phy_xaui_tx_polarity_flip_ce1=0x2
135+
phy_xaui_tx_polarity_flip_ce2=0xa
136+
phy_xaui_tx_polarity_flip_ce3=0xb
137+
phy_xaui_tx_polarity_flip_ce4=0x2
138+
phy_xaui_tx_polarity_flip_ce5=0x0
139+
phy_xaui_tx_polarity_flip_ce6=0x0
140+
phy_xaui_tx_polarity_flip_ce7=0xa
141+
phy_xaui_tx_polarity_flip_ce8=0x0
142+
phy_xaui_tx_polarity_flip_ce9=0xb
143+
phy_xaui_tx_polarity_flip_ce10=0xe
144+
phy_xaui_tx_polarity_flip_ce11=0x6
145+
phy_xaui_tx_polarity_flip_ce12=0x6
146+
phy_xaui_tx_polarity_flip_ce13=0xf
147+
phy_xaui_tx_polarity_flip_ce14=0x5
148+
phy_xaui_tx_polarity_flip_ce15=0x8
149+
phy_xaui_tx_polarity_flip_ce16=0xf
150+
phy_xaui_tx_polarity_flip_ce17=0xf
151+
phy_xaui_tx_polarity_flip_ce18=0xf
152+
phy_xaui_tx_polarity_flip_ce19=0xf
153+
phy_xaui_tx_polarity_flip_ce20=0xf
154+
phy_xaui_tx_polarity_flip_ce21=0xf
155+
phy_xaui_tx_polarity_flip_ce22=0xb
156+
phy_xaui_tx_polarity_flip_ce23=0xa
157+
phy_xaui_tx_polarity_flip_ce24=0xf
158+
phy_xaui_tx_polarity_flip_ce25=0x0
159+
phy_xaui_tx_polarity_flip_ce26=0xb
160+
phy_xaui_tx_polarity_flip_ce27=0x7
161+
phy_xaui_tx_polarity_flip_ce28=0x8
162+
phy_xaui_tx_polarity_flip_ce29=0x3
163+
phy_xaui_tx_polarity_flip_ce30=0xc
181164
phy_xaui_tx_polarity_flip_ce31=0x3
165+
166+
phy_xaui_rx_polarity_flip_ce0=0xc
167+
phy_xaui_rx_polarity_flip_ce1=0xd
168+
phy_xaui_rx_polarity_flip_ce2=0x2
169+
phy_xaui_rx_polarity_flip_ce3=0xf
170+
phy_xaui_rx_polarity_flip_ce4=0xc
171+
phy_xaui_rx_polarity_flip_ce5=0x2
172+
phy_xaui_rx_polarity_flip_ce6=0x2
173+
phy_xaui_rx_polarity_flip_ce7=0xd
174+
phy_xaui_rx_polarity_flip_ce8=0xd
175+
phy_xaui_rx_polarity_flip_ce9=0xa
176+
phy_xaui_rx_polarity_flip_ce10=0x7
177+
phy_xaui_rx_polarity_flip_ce11=0xf
178+
phy_xaui_rx_polarity_flip_ce12=0xf
179+
phy_xaui_rx_polarity_flip_ce13=0xd
180+
phy_xaui_rx_polarity_flip_ce14=0x4
181+
phy_xaui_rx_polarity_flip_ce15=0xb
182+
phy_xaui_rx_polarity_flip_ce16=0x2
183+
phy_xaui_rx_polarity_flip_ce17=0xd
184+
phy_xaui_rx_polarity_flip_ce18=0xf
185+
phy_xaui_rx_polarity_flip_ce19=0x0
186+
phy_xaui_rx_polarity_flip_ce20=0x0
187+
phy_xaui_rx_polarity_flip_ce21=0x5
188+
phy_xaui_rx_polarity_flip_ce22=0x0
189+
phy_xaui_rx_polarity_flip_ce23=0x2
190+
phy_xaui_rx_polarity_flip_ce24=0xc
191+
phy_xaui_rx_polarity_flip_ce25=0x8
192+
phy_xaui_rx_polarity_flip_ce26=0x4
193+
phy_xaui_rx_polarity_flip_ce27=0x7
194+
phy_xaui_rx_polarity_flip_ce28=0x7
195+
phy_xaui_rx_polarity_flip_ce29=0x9
196+
phy_xaui_rx_polarity_flip_ce30=0xc
182197
phy_xaui_rx_polarity_flip_ce31=0x8
198+
183199
dport_map_port_38=1
184200
dport_map_port_39=2
185201
dport_map_port_40=3
@@ -212,9 +228,5 @@ dport_map_port_2=29
212228
dport_map_port_1=30
213229
dport_map_port_4=31
214230
dport_map_port_3=32
215-
oversubscribe_mode=1
216-
pbmp_xport_xe=0x3fd000000ff4000003fc000001fe
217-
serdes_if_type_xe=14
218-
serdes_if_type_ce=14
219231

220232
mmu_init_config="MSFT-TH-Tier1"

device/dell/x86_64-dell_z9100_c2538-r0/Force10-Z9100-T0/buffers_defaults_t0.j2 renamed to device/dell/x86_64-dell_z9100_c2538-r0/Force10-Z9100-C8D48/buffers_defaults_t0.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"size": "11213696",
2929
"type": "ingress",
3030
"mode": "dynamic",
31-
"xoff": "6387264"
31+
"xoff": "3855488"
3232
},
3333
"egress_lossy_pool": {
3434
"size": "9532224",
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# PG lossless profiles.
2+
# speed cable size xon xoff threshold xon_offset
3+
10000 5m 1248 2288 35776 -3 2288
4+
25000 5m 1248 2288 53248 -3 2288
5+
40000 5m 1248 2288 66560 -3 2288
6+
50000 5m 1248 2288 90272 -3 2288
7+
100000 5m 1248 2288 165568 -3 2288
8+
10000 40m 1248 2288 37024 -3 2288
9+
25000 40m 1248 2288 53248 -3 2288
10+
40000 40m 1248 2288 71552 -3 2288
11+
50000 40m 1248 2288 96096 -3 2288
12+
100000 40m 1248 2288 177632 -3 2288
13+
10000 300m 1248 2288 46176 -3 2288
14+
25000 300m 1248 2288 79040 -3 2288
15+
40000 300m 1248 2288 108160 -3 2288
16+
50000 300m 1248 2288 141856 -3 2288
17+
100000 300m 1248 2288 268736 -3 2288

0 commit comments

Comments
 (0)