fpga: dfl-pci: add enumeration for feature devices

The Device Feature List (DFL) is implemented in MMIO and features
are linked via the DFLs. This patch enables pcie driver to prepare
enumeration information (e.g. locations of all device feature lists
in MMIO) and use common APIs provided by the Device Feature List
framework to enumerate each feature device linked.

Signed-off-by: Tim Whisonant <tim.whisonant@intel.com>
Signed-off-by: Enno Luebbers <enno.luebbers@intel.com>
Signed-off-by: Shiva Rao <shiva.rao@intel.com>
Signed-off-by: Christopher Rauer <christopher.rauer@intel.com>
Signed-off-by: Zhang Yi <yi.z.zhang@intel.com>
Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com>
Signed-off-by: Wu Hao <hao.wu@intel.com>
Acked-by: Alan Tull <atull@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/fpga/dfl-pci.c b/drivers/fpga/dfl-pci.c
index e1e1f0fbe98c26f6cc1454aba875480944efa099..66b5720582bb36ed1006d2c0acc2624d6e9ed336 100644 (file)
--- a/drivers/fpga/dfl-pci.c
+++ b/drivers/fpga/dfl-pci.c
@@ -22,9 +22,23 @@
 #include <linux/errno.h>
 #include <linux/aer.h>
 
+#include "dfl.h"
+
 #define DRV_VERSION    "0.8"
 #define DRV_NAME       "dfl-pci"
 
+struct cci_drvdata {
+       struct dfl_fpga_cdev *cdev;     /* container device */
+};
+
+static void __iomem *cci_pci_ioremap_bar(struct pci_dev *pcidev, int bar)
+{
+       if (pcim_iomap_regions(pcidev, BIT(bar), DRV_NAME))
+               return NULL;
+
+       return pcim_iomap_table(pcidev)[bar];
+}
+
 /* PCI Device ID */
 #define PCIE_DEVICE_ID_PF_INT_5_X      0xBCBD
 #define PCIE_DEVICE_ID_PF_INT_6_X      0xBCC0
@@ -45,6 +59,120 @@ static struct pci_device_id cci_pcie_id_tbl[] = {
 };
 MODULE_DEVICE_TABLE(pci, cci_pcie_id_tbl);
 
+static int cci_init_drvdata(struct pci_dev *pcidev)
+{
+       struct cci_drvdata *drvdata;
+
+       drvdata = devm_kzalloc(&pcidev->dev, sizeof(*drvdata), GFP_KERNEL);
+       if (!drvdata)
+               return -ENOMEM;
+
+       pci_set_drvdata(pcidev, drvdata);
+
+       return 0;
+}
+
+static void cci_remove_feature_devs(struct pci_dev *pcidev)
+{
+       struct cci_drvdata *drvdata = pci_get_drvdata(pcidev);
+
+       /* remove all children feature devices */
+       dfl_fpga_feature_devs_remove(drvdata->cdev);
+}
+
+/* enumerate feature devices under pci device */
+static int cci_enumerate_feature_devs(struct pci_dev *pcidev)
+{
+       struct cci_drvdata *drvdata = pci_get_drvdata(pcidev);
+       struct dfl_fpga_enum_info *info;
+       struct dfl_fpga_cdev *cdev;
+       resource_size_t start, len;
+       int port_num, bar, i, ret = 0;
+       void __iomem *base;
+       u32 offset;
+       u64 v;
+
+       /* allocate enumeration info via pci_dev */
+       info = dfl_fpga_enum_info_alloc(&pcidev->dev);
+       if (!info)
+               return -ENOMEM;
+
+       /* start to find Device Feature List from Bar 0 */
+       base = cci_pci_ioremap_bar(pcidev, 0);
+       if (!base) {
+               ret = -ENOMEM;
+               goto enum_info_free_exit;
+       }
+
+       /*
+        * PF device has FME and Ports/AFUs, and VF device only has one
+        * Port/AFU. Check them and add related "Device Feature List" info
+        * for the next step enumeration.
+        */
+       if (dfl_feature_is_fme(base)) {
+               start = pci_resource_start(pcidev, 0);
+               len = pci_resource_len(pcidev, 0);
+
+               dfl_fpga_enum_info_add_dfl(info, start, len, base);
+
+               /*
+                * find more Device Feature Lists (e.g. Ports) per information
+                * indicated by FME module.
+                */
+               v = readq(base + FME_HDR_CAP);
+               port_num = FIELD_GET(FME_CAP_NUM_PORTS, v);
+
+               WARN_ON(port_num > MAX_DFL_FPGA_PORT_NUM);
+
+               for (i = 0; i < port_num; i++) {
+                       v = readq(base + FME_HDR_PORT_OFST(i));
+
+                       /* skip ports which are not implemented. */
+                       if (!(v & FME_PORT_OFST_IMP))
+                               continue;
+
+                       /*
+                        * add Port's Device Feature List information for next
+                        * step enumeration.
+                        */
+                       bar = FIELD_GET(FME_PORT_OFST_BAR_ID, v);
+                       offset = FIELD_GET(FME_PORT_OFST_DFH_OFST, v);
+                       base = cci_pci_ioremap_bar(pcidev, bar);
+                       if (!base)
+                               continue;
+
+                       start = pci_resource_start(pcidev, bar) + offset;
+                       len = pci_resource_len(pcidev, bar) - offset;
+
+                       dfl_fpga_enum_info_add_dfl(info, start, len,
+                                                  base + offset);
+               }
+       } else if (dfl_feature_is_port(base)) {
+               start = pci_resource_start(pcidev, 0);
+               len = pci_resource_len(pcidev, 0);
+
+               dfl_fpga_enum_info_add_dfl(info, start, len, base);
+       } else {
+               ret = -ENODEV;
+               goto enum_info_free_exit;
+       }
+
+       /* start enumeration with prepared enumeration information */
+       cdev = dfl_fpga_feature_devs_enumerate(info);
+       if (IS_ERR(cdev)) {
+               dev_err(&pcidev->dev, "Enumeration failure\n");
+               ret = PTR_ERR(cdev);
+               goto enum_info_free_exit;
+       }
+
+       drvdata->cdev = cdev;
+
+enum_info_free_exit:
+       dfl_fpga_enum_info_free(info);
+
+       return ret;
+}
+
 static
 int cci_pci_probe(struct pci_dev *pcidev, const struct pci_device_id *pcidevid)
 {
@@ -76,8 +204,19 @@ int cci_pci_probe(struct pci_dev *pcidev, const struct pci_device_id *pcidevid)
                goto disable_error_report_exit;
        }
 
-       /* TODO: create and add the platform device per feature list */
-       return 0;
+       ret = cci_init_drvdata(pcidev);
+       if (ret) {
+               dev_err(&pcidev->dev, "Fail to init drvdata %d.\n", ret);
+               goto disable_error_report_exit;
+       }
+
+       ret = cci_enumerate_feature_devs(pcidev);
+       if (ret) {
+               dev_err(&pcidev->dev, "enumeration failure %d.\n", ret);
+               goto disable_error_report_exit;
+       }
+
+       return ret;
 
 disable_error_report_exit:
        pci_disable_pcie_error_reporting(pcidev);
@@ -86,6 +225,7 @@ int cci_pci_probe(struct pci_dev *pcidev, const struct pci_device_id *pcidevid)
 
 static void cci_pci_remove(struct pci_dev *pcidev)
 {
+       cci_remove_feature_devs(pcidev);
        pci_disable_pcie_error_reporting(pcidev);
 }