Update old platform code.

* s6301-56st * s7801-54xs * s8901-54xc * s9110-32x * s9300-32d
sonic-net · May 10, 2024 · 9b337c4 · 9b337c4
1 parent 4956cf3
commit 9b337c4
Show file tree

Hide file tree

Showing 80 changed files with 4,088 additions and 3,555 deletions.
diff --git a/device/ufispace/x86_64-ufispace_s6301_56st-r0/installer.conf b/device/ufispace/x86_64-ufispace_s6301_56st-r0/installer.conf
@@ -1,4 +1,4 @@
 CONSOLE_PORT=0x3f8
 CONSOLE_DEV=0
 CONSOLE_SPEED=115200
-ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="module_blacklist=gpio_ich nomodeset pcie_aspm=off"
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="modprobe.blacklist=gpio_ich,qat_c3xxx nomodeset pcie_aspm=off"
diff --git a/device/ufispace/x86_64-ufispace_s6301_56st-r0/pddf/pd-plugin.json b/device/ufispace/x86_64-ufispace_s6301_56st-r0/pddf/pd-plugin.json
@@ -21,6 +21,10 @@
         "psu_present":
         {
             "i2c":
+            {
+                "valmap": { "1":true, "0":false }
+            },
+            "bmc":
             {
                 "valmap": { "1":true, "0":false }
             }
@@ -33,14 +37,15 @@
                 "valmap": { "1": true, "0":false }
             }
         },
+
         "psu_support_list":
         [
-            {"Mfr_id": "ASPOWER","Model": "U1A-K10150-DRB-13", "Dir": "EXHAUST"},
-            {"Mfr_id": "ASPOWER","Model": "U1A-K0150-B-13", "Dir": "INTAKE"},
-            {"Mfr_id": "ASPOWER","Model": "U1D-K0150-A-13", "Dir": "EXHAUST"},
-            {"Mfr_id": "ASPOWER","Model": "U1D-K0150-B-13", "Dir": "INTAKE"}
+            {"Manufacturer": "ASPOWER","Name": "U1A-K10150-DRB-13", "MaxSpd": "PSU_AC_FAN_MAX_SPEED", "Dir": "EXHAUST", "Type": "AC" },
+            {"Manufacturer": "ASPOWER","Name": "U1A-K0150-B-13", "MaxSpd": "PSU_AC_FAN_MAX_SPEED", "Dir": "INTAKE", "Type": "AC"},
+            {"Manufacturer": "ASPOWER","Name": "U1D-K0150-A-13", "MaxSpd": "PSU_DC_FAN_MAX_SPEED", "Dir": "EXHAUST", "Type": "DC"},
+            {"Manufacturer": "ASPOWER","Name": "U1D-K0150-B-13", "MaxSpd": "PSU_DC_FAN_MAX_SPEED", "Dir": "INTAKE", "Type": "DC"}
         ],
-        "PSU_FAN_MAX_SPEED":"13000"
+        "valmap": {"PSU_FAN_MAX_SPEED": "13000", "PSU_AC_FAN_MAX_SPEED": "13000", "PSU_DC_FAN_MAX_SPEED":"13000", "DEFAULT_TYPE": "AC"}
     },
 
     "FAN":
@@ -63,15 +68,6 @@
 
         "FAN_MAX_SPEED":"25000"
     },
-
-    "LED":
-    {
-        "capability":
-        {
-            "ro": ["SYS_LED", "FAN_LED", "PSU1_LED", "PSU2_LED"],
-            "rw": ["ID_LED"]
-        }
-    },
     "REBOOT_CAUSE":
     {
         "reboot_cause_file": "/host/reboot-cause/reboot-cause.txt"

diff --git a/device/ufispace/x86_64-ufispace_s6301_56st-r0/pddf/pddf-device.json b/device/ufispace/x86_64-ufispace_s6301_56st-r0/pddf/pddf-device.json
@@ -24,9 +24,11 @@
                 "pddf_xcvr"
             ]
         },
+        "std_perm_kos": [
+            "i2c-i801",
+            "i2c-ismt"
+        ],
         "std_kos": [
-            "i2c_i801",
-            "i2c-ismt",
             "i2c_dev",
             "i2c_mux_pca954x",
             "optoe",
@@ -41,17 +43,21 @@
             "pddf_cpld_driver",
             "pddf_mux_module",
             "pddf_xcvr_module",
+            "pddf_fpgapci_driver",
             "pddf_xcvr_driver_module",
             "pddf_psu_driver_module",
             "pddf_psu_module",
+            "pddf_fpgai2c_module",
+            "pddf_fpgai2c_driver",
             "pddf_fan_driver_module",
             "pddf_fan_module",
             "pddf_led_module",
             "pddf_gpio_module"
         ],
         "custom_kos": [
             "x86-64-ufispace-s6301-56st-lpc",
-            "x86-64-ufispace-s6301-56st-sys-eeprom"
+            "x86-64-ufispace-s6301-56st-sys-eeprom",
+            "pddf_custom_psu"
         ]
     },
     "SYSTEM": {
@@ -861,7 +867,19 @@
                 { "itf":"pmbus", "dev":"PSU1-PMBUS" },
                 { "itf":"eeprom", "dev":"PSU1-EEPROM" }
             ]
-        }
+        },
+        "bmc": {
+            "ipmitool": {
+                "attr_list": [
+                    {
+                        "attr_name": "psu_present",
+                        "bmc_cmd": "i2cget -y -f 2 0x58 0x0 > /dev/null 2>&1; [ $? -ne 0 ] && echo '0' || echo '1'",
+                        "raw": "1",
+                        "type": "raw"
+                    }
+                ]
+            }
+        }        
     },
     "PSU1-PMBUS": {
         "dev_info": {
@@ -877,16 +895,6 @@
                 "dev_type": "psu_pmbus"
             },
             "attr_list": [
-                {
-                    "attr_name": "psu_present",
-                    "attr_devaddr":"0x33",
-                    "attr_devtype": "cpld",
-                    "attr_devname":"CPLD1",
-                    "attr_offset": "0x59",
-                    "attr_mask": "0x1",
-                    "attr_cmpval": "0x0",
-                    "attr_len": "1"
-                },
                 {
                     "attr_name": "psu_power_good",
                     "attr_devaddr": "0x33",
@@ -951,6 +959,24 @@
                     "attr_cmpval": "0xff",
                     "attr_len": "2"
                 },
+                {
+                    "attr_name": "psu_v_out_min",
+                    "attr_devaddr": "0x58",
+                    "attr_devtype": "pmbus",
+                    "attr_offset": "0xa4",
+                    "attr_mask": "0x0",
+                    "attr_cmpval": "0xff",
+                    "attr_len": "2"
+                },
+                {
+                    "attr_name": "psu_v_out_max",
+                    "attr_devaddr": "0x58",
+                    "attr_devtype": "pmbus",
+                    "attr_offset": "0xa5",
+                    "attr_mask": "0x0",
+                    "attr_cmpval": "0xff",
+                    "attr_len": "2"
+                },
                 {
                     "attr_name": "psu_i_out",
                     "attr_devaddr": "0x58",
@@ -969,6 +995,15 @@
                     "attr_cmpval": "0xff",
                     "attr_len": "2"
                 },
+                {
+                    "attr_name": "psu_p_out_max",
+                    "attr_devaddr": "0x58",
+                    "attr_devtype": "pmbus",
+                    "attr_offset": "0xa7",
+                    "attr_mask": "0x0",
+                    "attr_cmpval": "0xff",
+                    "attr_len": "2"
+                },
                 {
                     "attr_name": "psu_fan1_speed_rpm",
                     "attr_devaddr": "0x58",
@@ -1026,7 +1061,19 @@
                 { "itf":"pmbus", "dev":"PSU2-PMBUS" },
                 { "itf":"eeprom", "dev":"PSU2-EEPROM" }
             ]
-        }
+        },
+        "bmc": {
+            "ipmitool": {
+                "attr_list": [
+                    {
+                        "attr_name": "psu_present",
+                        "bmc_cmd": "i2cget -y -f 2 0x59 0x0 > /dev/null 2>&1; [ $? -ne 0 ] && echo '0' || echo '1'",
+                        "raw": "1",
+                        "type": "raw"
+                    }
+                ]
+            }
+        }        
     },
     "PSU2-PMBUS": {
         "dev_info": {
@@ -1042,16 +1089,6 @@
                 "dev_type": "psu_pmbus"
             },
             "attr_list": [
-                {
-                    "attr_name": "psu_present",
-                    "attr_devaddr":"0x33",
-                    "attr_devtype": "cpld",
-                    "attr_devname":"CPLD1",
-                    "attr_offset": "0x59",
-                    "attr_mask": "0x2",
-                    "attr_cmpval": "0x0",
-                    "attr_len": "1"
-                },
                 {
                     "attr_name": "psu_power_good",
                     "attr_devaddr": "0x33",
@@ -1116,6 +1153,24 @@
                     "attr_cmpval": "0xff",
                     "attr_len": "2"
                 },
+                {
+                    "attr_name": "psu_v_out_min",
+                    "attr_devaddr": "0x59",
+                    "attr_devtype": "pmbus",
+                    "attr_offset": "0xa4",
+                    "attr_mask": "0x0",
+                    "attr_cmpval": "0xff",
+                    "attr_len": "2"
+                },
+                {
+                    "attr_name": "psu_v_out_max",
+                    "attr_devaddr": "0x59",
+                    "attr_devtype": "pmbus",
+                    "attr_offset": "0xa5",
+                    "attr_mask": "0x0",
+                    "attr_cmpval": "0xff",
+                    "attr_len": "2"
+                },
                 {
                     "attr_name": "psu_i_out",
                     "attr_devaddr": "0x59",
@@ -1134,6 +1189,15 @@
                     "attr_cmpval": "0xff",
                     "attr_len": "2"
                 },
+                {
+                    "attr_name": "psu_p_out_max",
+                    "attr_devaddr": "0x59",
+                    "attr_devtype": "pmbus",
+                    "attr_offset": "0xa7",
+                    "attr_mask": "0x0",
+                    "attr_cmpval": "0xff",
+                    "attr_len": "2"
+                },
                 {
                     "attr_name": "psu_fan1_speed_rpm",
                     "attr_devaddr": "0x59",
@@ -1239,7 +1303,8 @@
             "device_name": "SYS_LED"
         },
         "dev_attr": {
-            "index": "0"
+            "index": "0",
+            "flag": "ro"
         },
         "i2c": {
             "attr_list": [
@@ -1286,13 +1351,14 @@
             ]
         }
     },
-    "ID_LED": {
+    "LOC_LED": {
         "dev_info": {
             "device_type": "LED",
             "device_name": "LOC_LED"
         },
         "dev_attr": {
-            "index": "0"
+            "index": "0",
+            "flag": "rw"
         },
         "i2c": {
             "attr_list": [
@@ -1329,7 +1395,8 @@
             "device_name": "FAN_LED"
         },
         "dev_attr": {
-            "index": "0"
+            "index": "0",
+            "flag": "ro"
         },
         "i2c": {
             "attr_list": [
@@ -1382,7 +1449,8 @@
             "device_name": "PSU_LED"
         },
         "dev_attr": {
-            "index": "1"
+            "index": "1",
+            "flag": "ro"
         },
         "i2c": {
             "attr_list": [
@@ -1435,7 +1503,8 @@
             "device_name": "PSU_LED"
         },
         "dev_attr": {
-            "index": "0"
+            "index": "0",
+            "flag": "ro"
         },
         "i2c": {
             "attr_list": [

diff --git a/device/ufispace/x86_64-ufispace_s6301_56st-r0/sensors.conf b/device/ufispace/x86_64-ufispace_s6301_56st-r0/sensors.conf
diff --git a/device/ufispace/x86_64-ufispace_s7801_54xs-r0/installer.conf b/device/ufispace/x86_64-ufispace_s7801_54xs-r0/installer.conf
@@ -1,4 +1,4 @@
 CONSOLE_PORT=0x3f8
 CONSOLE_DEV=0
 CONSOLE_SPEED=115200
-ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="module_blacklist=gpio_ich nomodeset pcie_aspm=off"
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="modprobe.blacklist=gpio_ich,qat_c3xxx nomodeset pcie_aspm=off"
diff --git a/device/ufispace/x86_64-ufispace_s7801_54xs-r0/pddf/pd-plugin.json b/device/ufispace/x86_64-ufispace_s7801_54xs-r0/pddf/pd-plugin.json
@@ -55,16 +55,19 @@
 
         "psu_support_list":
         [
-            {"Manufacturer": "FSPGROUP", "Name": "YNEB0450BM",   "MaxSpd": "PSU_FAN_MAX_SPEED_AC"},
-            {"Manufacturer": "FSPGROUP", "Name": "YNEB0450AM",   "MaxSpd": "PSU_FAN_MAX_SPEED_DC"},
-            {"Manufacturer": "DELTA",    "Name": "DPS-450AB-27", "MaxSpd": "PSU_FAN_MAX_SPEED_AC"},
-            {"Manufacturer": "DELTA",    "Name": "DPS-450AB-28", "MaxSpd": "PSU_FAN_MAX_SPEED_DC"}
+            {"Manufacturer": "FSPGROUP", "Name": "YNEB0450BM",   "MaxSpd": "PSU_FAN_MAX_SPEED_AC", "Type": "AC"},
+            {"Manufacturer": "FSPGROUP", "Name": "YNEB0450AM",   "MaxSpd": "PSU_FAN_MAX_SPEED_DC", "Type": "DC"},
+            {"Manufacturer": "DELTA",    "Name": "DPS-450AB-27", "MaxSpd": "PSU_FAN_MAX_SPEED_AC", "Type": "AC"},
+            {"Manufacturer": "DELTA",    "Name": "DPS-450AB-28", "MaxSpd": "PSU_FAN_MAX_SPEED_DC", "Type": "DC"},
+            {"Manufacturer": "DELTA",    "Name": "DPS-450AB-32", "MaxSpd": "PSU_FAN_MAX_SPEED_DC", "Type": "DC"},
+            {"Manufacturer": "DELTA",    "Name": "DPS-450AB-33", "MaxSpd": "PSU_FAN_MAX_SPEED_AC", "Type": "AC"}
         ],
 
         "valmap": {
             "PSU_FAN_MAX_SPEED":"20000",
             "PSU_FAN_MAX_SPEED_AC":"20000",
-            "PSU_FAN_MAX_SPEED_DC":"18000"
+            "PSU_FAN_MAX_SPEED_DC":"18000",
+            "DEFAULT_TYPE": "AC"
         }
     },
     "FAN":