Skip to content

Commit f2f3336

Browse files
mssonicbldmssonicbld
authored
[Ufispace] Update platform device configurations and drivers (#22871)
<!-- Please make sure you've read and understood our contributing guidelines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md failure_prs.log skip_prs.log Make sure all your commits include a signature generated with `git commit -s` ** If this is a bug fix, make sure your description includes "fixes #xxxx", or "closes #xxxx" or "resolves #xxxx" Please provide the following information: --> #### Why I did it Update platform device configruations and drivers for - s9300-32d - s9301-32d - s9301-32db - s7801-54xs - s8901-54xc - s9110-32x - s9321-64e - s9321-64eo ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it * change pddf config to retrieve psu status from cpld * update lpc driver * update dport setting in bcm port config * code alignment #### How to verify it run following commands to check if the results are correct. show interface status show platform psustatus without the fix, the values are not correct. <pre> root@sonic:~# show platform psustatus PSU Model Serial HW Rev Voltage (V) Current (A) Power (W) Status LED ----- ------- -------- -------- ------------- ------------- ----------- ----------- ----- PSU 1 N/A N/A N/A N/A N/A N/A NOT PRESENT PSU 2 N/A N/A N/A N/A N/A N/A NOT PRESENT </pre> the correct result with the fix. <pre> root@sonic:~# show platform psustatus PSU Model Serial HW Rev Voltage (V) Current (A) Power (W) Status LED ----- ------- ------------------- -------- ------------- ------------- ----------- -------- ------------ PSU 1 FSH082 A13200S90420Y332172 N/A 0.00 0.00 0.00 NOT OK yellow_blink PSU 2 FSH082 A13200S90420Y332486 N/A 12.06 22.40 270.14 OK green </pre> The show interface status for breakout mode should be correct in updated platforms. <pre> root@sonic:~# show interfaces status Interface Lanes Speed MTU FEC Alias Vlan Oper Admin Type Asym PFC ----------- ------------------------------- ------- ----- ----- --------------- ------ ------ ------- ----------------------------------------------- ---------- Ethernet0 1 50G 9100 N/A Eth0/1(Port0) routed up up N/A N/A Ethernet1 2 50G 9100 N/A Eth0/2(Port0) routed up up N/A N/A Ethernet2 3 50G 9100 N/A Eth0/3(Port0) routed up up N/A N/A Ethernet3 4 50G 9100 N/A Eth0/4(Port0) routed up up N/A N/A Ethernet4 5 50G 9100 N/A Eth0/5(Port0) routed up up N/A N/A Ethernet5 6 50G 9100 N/A Eth0/6(Port0) routed up up N/A N/A Ethernet6 7 50G 9100 N/A Eth0/7(Port0) routed up up N/A N/A Ethernet7 8 50G 9100 N/A Eth0/8(Port0) routed up up N/A N/A Ethernet8 9 50G 9100 N/A Eth1/1(Port1) routed up up N/A N/A Ethernet9 10 50G 9100 N/A Eth1/2(Port1) routed up up N/A N/A Ethernet10 11 50G 9100 N/A Eth1/3(Port1) routed up up N/A N/A Ethernet11 12 50G 9100 N/A Eth1/4(Port1) routed up up N/A N/A Ethernet12 13 50G 9100 N/A Eth1/5(Port1) routed up up N/A N/A Ethernet13 14 50G 9100 N/A Eth1/6(Port1) routed up up N/A N/A Ethernet14 15 50G 9100 N/A Eth1/7(Port1) routed up up N/A N/A Ethernet15 16 50G 9100 N/A Eth1/8(Port1) routed up up N/A N/A Ethernet16 17,18,19,20,21,22,23,24 400G 9100 N/A Eth2(Port2) routed down up QSFP-DD Double Density 8X Pluggable Transceiver N/A Ethernet24 25,26,27,28,29,30,31,32 400G 9100 N/A Eth3(Port3) routed down up QSFP-DD Double Density 8X Pluggable Transceiver N/A Ethernet32 33,34,35,36,37,38,39,40 400G 9100 N/A Eth4(Port4) routed down up QSFP-DD Double Density 8X Pluggable Transceiver N/A Ethernet40 41,42,43,44,45,46,47,48 400G 9100 N/A Eth5(Port5) routed down up QSFP-DD Double Density 8X Pluggable Transceiver N/A Ethernet48 49,50,51,52,53,54,55,56 400G 9100 N/A Eth6(Port6) routed down up N/A N/A Ethernet56 57,58,59,60,61,62,63,64 400G 9100 N/A Eth7(Port7) routed down up N/A N/A Ethernet64 65,66,67,68,69,70,71,72 400G 9100 N/A Eth8(Port8) routed down up N/A N/A Ethernet72 73,74,75,76,77,78,79,80 400G 9100 N/A Eth9(Port9) routed down up N/A N/A Ethernet80 81,82,83,84,85,86,87,88 400G 9100 N/A Eth10(Port10) routed down up N/A N/A Ethernet88 89,90,91,92,93,94,95,96 400G 9100 N/A Eth11(Port11) routed down up QSFP-DD Double Density 8X Pluggable Transceiver N/A Ethernet96 97,98,99,100,101,102,103,104 400G 9100 N/A Eth12(Port12) routed down up QSFP-DD Double Density 8X Pluggable Transceiver N/A Ethernet104 105,106,107,108,109,110,111,112 400G 9100 N/A Eth13(Port13) routed down up N/A N/A Ethernet112 113,114,115,116,117,118,119,120 400G 9100 N/A Eth14(Port14) routed down up N/A N/A Ethernet120 121,122,123,124,125,126,127,128 400G 9100 N/A Eth15(Port15) routed down up N/A N/A Ethernet128 129,130,131,132,133,134,135,136 400G 9100 N/A Eth16(Port16) routed up up QSFP-DD Double Density 8X Pluggable Transceiver N/A </pre> <!-- If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012. --> #### Which release branch to backport (provide reason below if selected) <!-- - Note we only backport fixes to a release branch, *not* features! - Please also provide a reason for the backporting below. - e.g. - [x] 202006 --> - [ ] 201811 - [ ] 201911 - [ ] 202006 - [ ] 202012 - [ ] 202106 - [ ] 202111 - [ ] 202205 - [ ] 202211 - [ ] 202305 - [x] 202505 #### Tested branch (Please provide the tested image version) <!-- - Please provide tested image version - e.g. - [x] 20201231.100 --> - [ ] <!-- image version 1 --> - [ ] <!-- image version 2 --> #### Description for the changelog <!-- Write a short (one line) summary that describes the changes in this pull request for inclusion in the changelog: --> <!-- Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU. --> #### Link to config_db schema for YANG module changes <!-- Provide a link to config_db schema for the table for which YANG model is defined Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md --> #### A picture of a cute animal (not mandatory but encouraged)
1 parent 925b474 commit f2f3336

File tree

21 files changed

+2709
-1880
lines changed

21 files changed

+2709
-1880
lines changed

‎device/ufispace/x86_64-ufispace_s6301_56st-r0/pddf/pddf-device.json

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
},
8282
"SMBUS1": {
8383
"dev_info": {
84-
"device_type": "SMBUS", "device_name": "SMBUS1", "device_parent": "SYSTEM"
84+
"device_type": "SMBUS", "device_name": "SMBUS1", "device_parent": "SYSTEM"
8585
},
8686
"i2c": {
8787
"topo_info": {
@@ -102,7 +102,7 @@
102102
},
103103
{
104104
"dev": "FAN-CTRL"
105-
}
105+
}
106106
]
107107
}
108108
},
@@ -326,7 +326,7 @@
326326
}
327327
]
328328
}
329-
},
329+
},
330330
"GPIO2": {
331331
"dev_info": {
332332
"device_type": "GPIO",
@@ -663,7 +663,7 @@
663663
}
664664
]
665665
}
666-
},
666+
},
667667
"CPLD1": {
668668
"dev_info": {
669669
"device_type": "CPLD",
@@ -851,7 +851,7 @@
851851
}
852852
]
853853
}
854-
},
854+
},
855855
"PSU1": {
856856
"dev_info": {
857857
"device_type": "PSU",
@@ -879,7 +879,7 @@
879879
}
880880
]
881881
}
882-
}
882+
}
883883
},
884884
"PSU1-PMBUS": {
885885
"dev_info": {
@@ -949,7 +949,7 @@
949949
"attr_mask": "0x0",
950950
"attr_cmpval": "0xff",
951951
"attr_len": "2"
952-
},
952+
},
953953
{
954954
"attr_name": "psu_v_out",
955955
"attr_devaddr": "0x58",
@@ -1027,25 +1027,25 @@
10271027
},
10281028
"PSU1-EEPROM":
10291029
{
1030-
"dev_info": {
1030+
"dev_info": {
10311031
"device_type":"",
10321032
"device_name":"PSU1-EEPROM",
10331033
"device_parent":"MUX1",
10341034
"virt_parent":"PSU1"
10351035
},
10361036
"i2c":
10371037
{
1038-
"topo_info":{
1038+
"topo_info":{
10391039
"parent_bus":"0x2",
10401040
"dev_addr":"0x50",
10411041
"dev_type":"eeprom"
1042-
},
1043-
"attr_list":
1044-
[
1042+
},
1043+
"attr_list":
1044+
[
10451045
{ "attr_name":"eeprom" }
10461046
]
10471047
}
1048-
},
1048+
},
10491049
"PSU2": {
10501050
"dev_info": {
10511051
"device_type": "PSU",
@@ -1073,7 +1073,7 @@
10731073
}
10741074
]
10751075
}
1076-
}
1076+
}
10771077
},
10781078
"PSU2-PMBUS": {
10791079
"dev_info": {
@@ -1143,7 +1143,7 @@
11431143
"attr_mask": "0x0",
11441144
"attr_cmpval": "0xff",
11451145
"attr_len": "2"
1146-
},
1146+
},
11471147
{
11481148
"attr_name": "psu_v_out",
11491149
"attr_devaddr": "0x59",
@@ -1218,28 +1218,28 @@
12181218
}
12191219
]
12201220
}
1221-
},
1221+
},
12221222
"PSU2-EEPROM":
12231223
{
1224-
"dev_info": {
1224+
"dev_info": {
12251225
"device_type":"",
12261226
"device_name":"PSU2-EEPROM",
12271227
"device_parent":"MUX1",
12281228
"virt_parent":"PSU2"
12291229
},
12301230
"i2c":
12311231
{
1232-
"topo_info":{
1232+
"topo_info":{
12331233
"parent_bus":"0x2",
12341234
"dev_addr":"0x51",
12351235
"dev_type":"eeprom"
1236-
},
1237-
"attr_list":
1238-
[
1236+
},
1237+
"attr_list":
1238+
[
12391239
{ "attr_name":"eeprom" }
12401240
]
12411241
}
1242-
},
1242+
},
12431243
"FAN-CTRL": {
12441244
"dev_info": {
12451245
"device_type": "FAN",
@@ -1296,7 +1296,7 @@
12961296
}
12971297
]
12981298
}
1299-
},
1299+
},
13001300
"SYS_LED": {
13011301
"dev_info": {
13021302
"device_type": "LED",
@@ -2343,4 +2343,4 @@
23432343
]
23442344
}
23452345
}
2346-
}
2346+
}

‎device/ufispace/x86_64-ufispace_s7801_54xs-r0/UFISPACE-S7801-54XS/td3-x5-s7801-54xs.config.bcm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ portmap_59=57:100
379379
#FC19 not use
380380

381381
# dport
382-
dport_map_enable=1
382+
dport_map_enable=0
383383

384384
dport_map_port_1=1
385385
dport_map_port_2=2

‎device/ufispace/x86_64-ufispace_s8901_54xc-r0/UFISPACE-S8901-54XC/td3-x5-s8901-54xc.config.bcm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ portmap_59=57:100
379379
#FC19 not use
380380

381381
# dport
382-
dport_map_enable=1
382+
dport_map_enable=0
383383

384384
dport_map_port_1=1
385385
dport_map_port_2=2

‎device/ufispace/x86_64-ufispace_s9110_32x-r0/UFISPACE-S9110-32X/td3-x7-s9110-32x.config.bcm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,7 @@ portmap_123=121:100
605605
portmap_127=125:100
606606

607607

608-
dport_map_enable=1
608+
dport_map_enable=0
609609

610610
dport_map_port_1=1
611611
dport_map_port_5=2

‎device/ufispace/x86_64-ufispace_s9300_32d-r0/UFISPACE-S9300-32D/td4-s9300-32x400G.config.yml

100755100644
File mode changed.

‎device/ufispace/x86_64-ufispace_s9300_32d-r0/pddf/pd-plugin.json

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@
2424
"i2c":
2525
{
2626
"valmap": { "1":true, "0":false }
27-
},
28-
"bmc":
29-
{
30-
"valmap": { "Device Present":true, "Device Absent":false }
3127
}
3228
},
3329

@@ -36,11 +32,7 @@
3632
"i2c":
3733
{
3834
"valmap": { "1": true, "0":false }
39-
},
40-
"bmc":
41-
{
42-
"valmap": { "State Asserted":true, "State Deasserted":false }
43-
}
35+
}
4436
},
4537

4638
"psu_fan_dir":

0 commit comments

Comments
 (0)