Skip to content

Commit 63c78c2

Browse files
nonodarknonodark
authored
[UfiSpace][Bookworm][PDDF] Update UfiSpace platfrom codes to support bookworm and add new platforms support. (#18936)
* Update old platform code. * s6301-56st * s7801-54xs * s8901-54xc * s9110-32x * s9300-32d * Update code to support Bookworm * s6301-56st * s7801-54xs * s8901-54dc * s9110-32x * s9300-32d * Add new ufispace platforms. * s9301-32d * s9301-32db * Update s9300-32d and s9301-32db bcm port config
1 parent 1e4789b commit 63c78c2

File tree

171 files changed

+26521
-3536
lines changed

Some content is hidden

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

171 files changed

+26521
-3536
lines changed

‎device/ufispace/x86_64-ufispace_s6301_56st-r0/installer.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
CONSOLE_PORT=0x3f8
22
CONSOLE_DEV=0
33
CONSOLE_SPEED=115200
4-
ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="module_blacklist=gpio_ich nomodeset pcie_aspm=off"
4+
ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="modprobe.blacklist=gpio_ich,qat_c3xxx nomodeset pcie_aspm=off"

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

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@
2121
"psu_present":
2222
{
2323
"i2c":
24+
{
25+
"valmap": { "1":true, "0":false }
26+
},
27+
"bmc":
2428
{
2529
"valmap": { "1":true, "0":false }
2630
}
@@ -33,14 +37,15 @@
3337
"valmap": { "1": true, "0":false }
3438
}
3539
},
40+
3641
"psu_support_list":
3742
[
38-
{"Mfr_id": "ASPOWER","Model": "U1A-K10150-DRB-13", "Dir": "EXHAUST"},
39-
{"Mfr_id": "ASPOWER","Model": "U1A-K0150-B-13", "Dir": "INTAKE"},
40-
{"Mfr_id": "ASPOWER","Model": "U1D-K0150-A-13", "Dir": "EXHAUST"},
41-
{"Mfr_id": "ASPOWER","Model": "U1D-K0150-B-13", "Dir": "INTAKE"}
43+
{"Manufacturer": "ASPOWER","Name": "U1A-K10150-DRB-13", "MaxSpd": "PSU_AC_FAN_MAX_SPEED", "Dir": "EXHAUST", "Type": "AC" },
44+
{"Manufacturer": "ASPOWER","Name": "U1A-K0150-B-13", "MaxSpd": "PSU_AC_FAN_MAX_SPEED", "Dir": "INTAKE", "Type": "AC"},
45+
{"Manufacturer": "ASPOWER","Name": "U1D-K0150-A-13", "MaxSpd": "PSU_DC_FAN_MAX_SPEED", "Dir": "EXHAUST", "Type": "DC"},
46+
{"Manufacturer": "ASPOWER","Name": "U1D-K0150-B-13", "MaxSpd": "PSU_DC_FAN_MAX_SPEED", "Dir": "INTAKE", "Type": "DC"}
4247
],
43-
"PSU_FAN_MAX_SPEED":"13000"
48+
"valmap": {"PSU_FAN_MAX_SPEED": "13000", "PSU_AC_FAN_MAX_SPEED": "13000", "PSU_DC_FAN_MAX_SPEED":"13000", "DEFAULT_TYPE": "AC"}
4449
},
4550

4651
"FAN":
@@ -63,15 +68,6 @@
6368

6469
"FAN_MAX_SPEED":"25000"
6570
},
66-
67-
"LED":
68-
{
69-
"capability":
70-
{
71-
"ro": ["SYS_LED", "FAN_LED", "PSU1_LED", "PSU2_LED"],
72-
"rw": ["ID_LED"]
73-
}
74-
},
7571
"REBOOT_CAUSE":
7672
{
7773
"reboot_cause_file": "/host/reboot-cause/reboot-cause.txt"

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

Lines changed: 100 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,11 @@
2424
"pddf_xcvr"
2525
]
2626
},
27+
"std_perm_kos": [
28+
"i2c-i801",
29+
"i2c-ismt"
30+
],
2731
"std_kos": [
28-
"i2c_i801",
29-
"i2c-ismt",
3032
"i2c_dev",
3133
"i2c_mux_pca954x",
3234
"optoe",
@@ -41,17 +43,21 @@
4143
"pddf_cpld_driver",
4244
"pddf_mux_module",
4345
"pddf_xcvr_module",
46+
"pddf_fpgapci_driver",
4447
"pddf_xcvr_driver_module",
4548
"pddf_psu_driver_module",
4649
"pddf_psu_module",
50+
"pddf_fpgai2c_module",
51+
"pddf_fpgai2c_driver",
4752
"pddf_fan_driver_module",
4853
"pddf_fan_module",
4954
"pddf_led_module",
5055
"pddf_gpio_module"
5156
],
5257
"custom_kos": [
5358
"x86-64-ufispace-s6301-56st-lpc",
54-
"x86-64-ufispace-s6301-56st-sys-eeprom"
59+
"x86-64-ufispace-s6301-56st-sys-eeprom",
60+
"pddf_custom_psu"
5561
]
5662
},
5763
"SYSTEM": {
@@ -861,7 +867,19 @@
861867
{ "itf":"pmbus", "dev":"PSU1-PMBUS" },
862868
{ "itf":"eeprom", "dev":"PSU1-EEPROM" }
863869
]
864-
}
870+
},
871+
"bmc": {
872+
"ipmitool": {
873+
"attr_list": [
874+
{
875+
"attr_name": "psu_present",
876+
"bmc_cmd": "i2cget -y -f 2 0x58 0x0 > /dev/null 2>&1; [ $? -ne 0 ] && echo '0' || echo '1'",
877+
"raw": "1",
878+
"type": "raw"
879+
}
880+
]
881+
}
882+
}
865883
},
866884
"PSU1-PMBUS": {
867885
"dev_info": {
@@ -877,16 +895,6 @@
877895
"dev_type": "psu_pmbus"
878896
},
879897
"attr_list": [
880-
{
881-
"attr_name": "psu_present",
882-
"attr_devaddr":"0x33",
883-
"attr_devtype": "cpld",
884-
"attr_devname":"CPLD1",
885-
"attr_offset": "0x59",
886-
"attr_mask": "0x1",
887-
"attr_cmpval": "0x0",
888-
"attr_len": "1"
889-
},
890898
{
891899
"attr_name": "psu_power_good",
892900
"attr_devaddr": "0x33",
@@ -951,6 +959,24 @@
951959
"attr_cmpval": "0xff",
952960
"attr_len": "2"
953961
},
962+
{
963+
"attr_name": "psu_v_out_min",
964+
"attr_devaddr": "0x58",
965+
"attr_devtype": "pmbus",
966+
"attr_offset": "0xa4",
967+
"attr_mask": "0x0",
968+
"attr_cmpval": "0xff",
969+
"attr_len": "2"
970+
},
971+
{
972+
"attr_name": "psu_v_out_max",
973+
"attr_devaddr": "0x58",
974+
"attr_devtype": "pmbus",
975+
"attr_offset": "0xa5",
976+
"attr_mask": "0x0",
977+
"attr_cmpval": "0xff",
978+
"attr_len": "2"
979+
},
954980
{
955981
"attr_name": "psu_i_out",
956982
"attr_devaddr": "0x58",
@@ -969,6 +995,15 @@
969995
"attr_cmpval": "0xff",
970996
"attr_len": "2"
971997
},
998+
{
999+
"attr_name": "psu_p_out_max",
1000+
"attr_devaddr": "0x58",
1001+
"attr_devtype": "pmbus",
1002+
"attr_offset": "0xa7",
1003+
"attr_mask": "0x0",
1004+
"attr_cmpval": "0xff",
1005+
"attr_len": "2"
1006+
},
9721007
{
9731008
"attr_name": "psu_fan1_speed_rpm",
9741009
"attr_devaddr": "0x58",
@@ -1026,7 +1061,19 @@
10261061
{ "itf":"pmbus", "dev":"PSU2-PMBUS" },
10271062
{ "itf":"eeprom", "dev":"PSU2-EEPROM" }
10281063
]
1029-
}
1064+
},
1065+
"bmc": {
1066+
"ipmitool": {
1067+
"attr_list": [
1068+
{
1069+
"attr_name": "psu_present",
1070+
"bmc_cmd": "i2cget -y -f 2 0x59 0x0 > /dev/null 2>&1; [ $? -ne 0 ] && echo '0' || echo '1'",
1071+
"raw": "1",
1072+
"type": "raw"
1073+
}
1074+
]
1075+
}
1076+
}
10301077
},
10311078
"PSU2-PMBUS": {
10321079
"dev_info": {
@@ -1042,16 +1089,6 @@
10421089
"dev_type": "psu_pmbus"
10431090
},
10441091
"attr_list": [
1045-
{
1046-
"attr_name": "psu_present",
1047-
"attr_devaddr":"0x33",
1048-
"attr_devtype": "cpld",
1049-
"attr_devname":"CPLD1",
1050-
"attr_offset": "0x59",
1051-
"attr_mask": "0x2",
1052-
"attr_cmpval": "0x0",
1053-
"attr_len": "1"
1054-
},
10551092
{
10561093
"attr_name": "psu_power_good",
10571094
"attr_devaddr": "0x33",
@@ -1116,6 +1153,24 @@
11161153
"attr_cmpval": "0xff",
11171154
"attr_len": "2"
11181155
},
1156+
{
1157+
"attr_name": "psu_v_out_min",
1158+
"attr_devaddr": "0x59",
1159+
"attr_devtype": "pmbus",
1160+
"attr_offset": "0xa4",
1161+
"attr_mask": "0x0",
1162+
"attr_cmpval": "0xff",
1163+
"attr_len": "2"
1164+
},
1165+
{
1166+
"attr_name": "psu_v_out_max",
1167+
"attr_devaddr": "0x59",
1168+
"attr_devtype": "pmbus",
1169+
"attr_offset": "0xa5",
1170+
"attr_mask": "0x0",
1171+
"attr_cmpval": "0xff",
1172+
"attr_len": "2"
1173+
},
11191174
{
11201175
"attr_name": "psu_i_out",
11211176
"attr_devaddr": "0x59",
@@ -1134,6 +1189,15 @@
11341189
"attr_cmpval": "0xff",
11351190
"attr_len": "2"
11361191
},
1192+
{
1193+
"attr_name": "psu_p_out_max",
1194+
"attr_devaddr": "0x59",
1195+
"attr_devtype": "pmbus",
1196+
"attr_offset": "0xa7",
1197+
"attr_mask": "0x0",
1198+
"attr_cmpval": "0xff",
1199+
"attr_len": "2"
1200+
},
11371201
{
11381202
"attr_name": "psu_fan1_speed_rpm",
11391203
"attr_devaddr": "0x59",
@@ -1239,7 +1303,8 @@
12391303
"device_name": "SYS_LED"
12401304
},
12411305
"dev_attr": {
1242-
"index": "0"
1306+
"index": "0",
1307+
"flag": "ro"
12431308
},
12441309
"i2c": {
12451310
"attr_list": [
@@ -1286,13 +1351,14 @@
12861351
]
12871352
}
12881353
},
1289-
"ID_LED": {
1354+
"LOC_LED": {
12901355
"dev_info": {
12911356
"device_type": "LED",
12921357
"device_name": "LOC_LED"
12931358
},
12941359
"dev_attr": {
1295-
"index": "0"
1360+
"index": "0",
1361+
"flag": "rw"
12961362
},
12971363
"i2c": {
12981364
"attr_list": [
@@ -1329,7 +1395,8 @@
13291395
"device_name": "FAN_LED"
13301396
},
13311397
"dev_attr": {
1332-
"index": "0"
1398+
"index": "0",
1399+
"flag": "ro"
13331400
},
13341401
"i2c": {
13351402
"attr_list": [
@@ -1382,7 +1449,8 @@
13821449
"device_name": "PSU_LED"
13831450
},
13841451
"dev_attr": {
1385-
"index": "1"
1452+
"index": "1",
1453+
"flag": "ro"
13861454
},
13871455
"i2c": {
13881456
"attr_list": [
@@ -1435,7 +1503,8 @@
14351503
"device_name": "PSU_LED"
14361504
},
14371505
"dev_attr": {
1438-
"index": "0"
1506+
"index": "0",
1507+
"flag": "ro"
14391508
},
14401509
"i2c": {
14411510
"attr_list": [

‎device/ufispace/x86_64-ufispace_s6301_56st-r0/sensors.conf

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎device/ufispace/x86_64-ufispace_s7801_54xs-r0/installer.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
CONSOLE_PORT=0x3f8
22
CONSOLE_DEV=0
33
CONSOLE_SPEED=115200
4-
ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="module_blacklist=gpio_ich nomodeset pcie_aspm=off"
4+
ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="modprobe.blacklist=gpio_ich,qat_c3xxx nomodeset pcie_aspm=off"

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,19 @@
5555

5656
"psu_support_list":
5757
[
58-
{"Manufacturer": "FSPGROUP", "Name": "YNEB0450BM", "MaxSpd": "PSU_FAN_MAX_SPEED_AC"},
59-
{"Manufacturer": "FSPGROUP", "Name": "YNEB0450AM", "MaxSpd": "PSU_FAN_MAX_SPEED_DC"},
60-
{"Manufacturer": "DELTA", "Name": "DPS-450AB-27", "MaxSpd": "PSU_FAN_MAX_SPEED_AC"},
61-
{"Manufacturer": "DELTA", "Name": "DPS-450AB-28", "MaxSpd": "PSU_FAN_MAX_SPEED_DC"}
58+
{"Manufacturer": "FSPGROUP", "Name": "YNEB0450BM", "MaxSpd": "PSU_FAN_MAX_SPEED_AC", "Type": "AC"},
59+
{"Manufacturer": "FSPGROUP", "Name": "YNEB0450AM", "MaxSpd": "PSU_FAN_MAX_SPEED_DC", "Type": "DC"},
60+
{"Manufacturer": "DELTA", "Name": "DPS-450AB-27", "MaxSpd": "PSU_FAN_MAX_SPEED_AC", "Type": "AC"},
61+
{"Manufacturer": "DELTA", "Name": "DPS-450AB-28", "MaxSpd": "PSU_FAN_MAX_SPEED_DC", "Type": "DC"},
62+
{"Manufacturer": "DELTA", "Name": "DPS-450AB-32", "MaxSpd": "PSU_FAN_MAX_SPEED_DC", "Type": "DC"},
63+
{"Manufacturer": "DELTA", "Name": "DPS-450AB-33", "MaxSpd": "PSU_FAN_MAX_SPEED_AC", "Type": "AC"}
6264
],
6365

6466
"valmap": {
6567
"PSU_FAN_MAX_SPEED":"20000",
6668
"PSU_FAN_MAX_SPEED_AC":"20000",
67-
"PSU_FAN_MAX_SPEED_DC":"18000"
69+
"PSU_FAN_MAX_SPEED_DC":"18000",
70+
"DEFAULT_TYPE": "AC"
6871
}
6972
},
7073
"FAN":

0 commit comments

Comments
 (0)