[PDDF] Add multi PCIE FPGA controlled PSU (sonic-net#22767)

* IGNORE THIS COMMIT: Multiple FPGAs w/ I2C IP block (PR sonic-net#22748)

* [PDDF] Add multi PCIE FPGA controlled PSU

* IGNORE THIS COMMIT: Remove PDDF_DATA_ATTR_VAL and use client device table (PR sonic-net#22748)

* [PDDF] Remove attr_bdf for MultiFPGA PSU

* IGNORE THIS COMMIT: Remove multifpgapcisystem_parse() in pddfapi.py (PR sonic-net#22748)

* no-op commit to retrigger workflow

* IGNORE THIS COMMIT: Parse multifpgapciesystem appropriately (PR sonic-net#22748)

---------

Co-authored-by: Louis Maliyam <louis@nexthop.ai>

Author: 2 people

platform/pddf/i2c/modules/client/pddf_client_module.c

@@ -179,12 +179,12 @@ ssize_t store_pddf_data(struct device *dev, struct device_attribute *da, const c
                 *(int *)(ptr->addr) = num;
             break;
         case PDDF_USHORT:
-            ret = kstrtoint(buf,16,&num);
+            ret = kstrtouint(buf,16,&num);
             if (ret==0)
                 *(unsigned short *)(ptr->addr) = (unsigned short)num;
             break;
         case PDDF_UINT32:
-            ret = kstrtoint(buf,16,&num);
+            ret = kstrtouint(buf,16,&num);
             if (ret==0)
                 *(uint32_t *)(ptr->addr) = (uint32_t)num;
             break;

platform/pddf/i2c/modules/include/pddf_psu_defs.h

@@ -46,7 +46,6 @@ typedef struct PSU_DATA_ATTR
     int b;
     int r;
     void *access_data;
-
 }PSU_DATA_ATTR;
 
 typedef struct PSU_SYSFS_ATTR_DATA

platform/pddf/i2c/modules/psu/driver/pddf_psu_api.c

@@ -29,6 +29,7 @@
 #include <linux/delay.h>
 #include <linux/dmi.h>
 #include <linux/kobject.h>
+#include "pddf_multifpgapci_defs.h"
 #include "pddf_psu_defs.h"
 #include "pddf_psu_driver.h"
 
@@ -40,6 +41,7 @@
 #define psu_dbg(...)
 #endif
 
+extern void* get_device_table(char *name);
 
 #define PSU_REG_VOUT_MODE 0x20
 
@@ -442,6 +444,22 @@ ssize_t psu_store_default(struct device *dev, struct device_attribute *da, const
     return count;
 }
 
+int psu_multifpgapci_read(PSU_DATA_ATTR *adata, int *output) {
+    struct pci_dev *pci_dev = NULL;
+
+    if (ptr_multifpgapci_readpci == NULL) {
+        printk(KERN_ERR "PDDF_PSU: pddf_multifpgapci_module is not loaded");
+        return -1;
+    }
+
+    pci_dev = (struct pci_dev *)get_device_table(adata->devname);
+    if (pci_dev == NULL) {
+        printk(KERN_ERR "PDDF_PSU: Unable to get pci_dev of %s for %s\n", adata->devname, adata->aname);
+        return -1;
+    }
+    return ptr_multifpgapci_readpci(pci_dev, adata->offset, output);
+}
+
 int sonic_i2c_get_psu_byte_default(void *client, PSU_DATA_ATTR *adata, void *data)
 {
     int status = 0;
@@ -454,8 +472,24 @@ int sonic_i2c_get_psu_byte_default(void *client, PSU_DATA_ATTR *adata, void *dat
         val = board_i2c_cpld_read(adata->devaddr , adata->offset);
         if (val < 0)
             return val;
-        padata->val.intval =  ((val & adata->mask) == adata->cmpval);
-        psu_dbg(KERN_ERR "%s: byte_value = 0x%x\n", __FUNCTION__, padata->val.intval);
+    }
+    else if (strncmp(adata->devtype, "multifpgapci", strlen("multifpgapci")) == 0)
+    {
+        status = psu_multifpgapci_read(adata, &val);
+        if (status)
+          goto ret;
+    }
+    else
+    {
+        printk(KERN_ERR "%s: Unexpected devtype = ", __FUNCTION__, adata->devtype);
+    }
+
+    padata->val.intval =  ((val & adata->mask) == adata->cmpval);
+    psu_dbg(KERN_ERR "%s: byte_value = 0x%x\n", __FUNCTION__, padata->val.intval);
+
+ret:
+    if (status) {
+        printk(KERN_ERR "%s: Error status = %d", __FUNCTION__, status);
     }
 
     return status;

platform/pddf/i2c/modules/psu/pddf_psu_module.c

@@ -172,6 +172,10 @@ static ssize_t do_device_operation(struct device *dev, struct device_attribute *
     if (strncmp(buf, "add", strlen(buf)-1)==0)
     {
         adapter = i2c_get_adapter(cdata->parent_bus);
+        if (!adapter) {
+            printk(KERN_ERR "PDDF_ERROR: %s: Failed to get i2c adapter for bus %d\n", __FUNCTION__, cdata->parent_bus);
+            goto clear_data;
+        }
         board_info = i2c_get_psu_board_info(pdata, cdata);
 
         /* Populate the platform data for psu */