Re: [PATCH v3 09/21] fpga: intel-dfl-pci: add enumeration for feature devices
From: Alan Tull <hidden>
Date: 2017-12-07 21:42:25
Also in:
linux-fpga, lkml
On Mon, Nov 27, 2017 at 12:42 AM, Wu Hao [off-list ref] wrote:
+/* 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 fpga_cdev *cdev;
+ struct fpga_enum_info *info;
+ resource_size_t start, len;
+ void __iomem *base;
+ int port_num, bar, i, ret = 0;
+ u32 offset;
+ u64 v;
+
+ /* allocate enumeration info via pci_dev */
+ info = 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 1 Port/AFU.
+ * check them and add related "Device Feature List" info for the next
+ * step enumeration.
+ */
+ if (feature_is_fme(base)) {
+ start = pci_resource_start(pcidev, 0);
+ len = pci_resource_len(pcidev, 0);
+
+ 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_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;
+
+ fpga_enum_info_add_dfl(info, start, len, base + offset);
+ }
+ } else if (feature_is_port(base)) {
+ start = pci_resource_start(pcidev, 0);
+ len = pci_resource_len(pcidev, 0);
+
+ fpga_enum_info_add_dfl(info, start, len, base);
+ } else {
+ ret = -ENODEV;
+ goto enum_info_free_exit;
+ }
+
+ /* start enumeration with prepared enumeration information */
+ cdev = fpga_enumerate_feature_devs(info);Hi Hao, I appreciate you separating the DFL enumeration code from this PCIe module. This made the pcie part quite small. It should work for embedded platforms just by adding a platform device whose function is to find the DFL structures at some address and then call these same fpga_enum_info_add_dfl adn fpga_enumerate_feature_devs functions. Alan
quoted hunk ↗ jump to hunk
+ 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: + fpga_enum_info_free(info); + + return ret; +} + static int cci_pci_probe(struct pci_dev *pcidev, const struct pci_device_id *pcidevid) {@@ -84,9 +264,22 @@ int cci_pci_probe(struct pci_dev *pcidev, const struct pci_device_id *pcidevid) goto release_region_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 release_region_exit; + } + + ret = cci_enumerate_feature_devs(pcidev); + if (ret) { + dev_err(&pcidev->dev, "enumeration failure %d.\n", ret); + goto remove_drvdata_exit; + } + + return ret; +remove_drvdata_exit: + cci_remove_drvdata(pcidev); release_region_exit: pci_release_regions(pcidev); disable_error_report_exit:@@ -97,6 +290,8 @@ 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); + cci_remove_drvdata(pcidev); pci_release_regions(pcidev); pci_disable_pcie_error_reporting(pcidev); pci_disable_device(pcidev); --1.8.3.1