fpga: dfl: Allow Port to be linked to FME's DFL

Currently we use PORTn_OFFSET to locate PORT DFLs, and PORT DFLs are not
connected FME DFL. But for some cases (e.g. Intel Open FPGA Stack device),
PORT DFLs are connected to FME DFL directly, so we don't need to search
PORT DFLs via PORTn_OFFSET again. If BAR value of PORTn_OFFSET is 0x7
(FME_PORT_OFST_BAR_SKIP) then driver will skip searching the DFL for that
port. If BAR value is invalid, return -EINVAL.

Signed-off-by: Matthew Gerlach <matthew.gerlach@linux.intel.com>
Signed-off-by: Tianfei Zhang <tianfei.zhang@intel.com>
Acked-by: Wu Hao <hao.wu@intel.com>
Link: https://lore.kernel.org/r/20220505100617.703672-1-tianfei.zhang@intel.com
Signed-off-by: Xu Yilun <yilun.xu@intel.com>

diff --git a/drivers/fpga/dfl-pci.c b/drivers/fpga/dfl-pci.c
index 717ac97..fd1fa55 100644 (file)
--- a/drivers/fpga/dfl-pci.c
+++ b/drivers/fpga/dfl-pci.c
@@ -259,6 +259,15 @@ static int find_dfls_by_default(struct pci_dev *pcidev,
                         */
                        bar = FIELD_GET(FME_PORT_OFST_BAR_ID, v);
                        offset = FIELD_GET(FME_PORT_OFST_DFH_OFST, v);
+                       if (bar == FME_PORT_OFST_BAR_SKIP) {
+                               continue;
+                       } else if (bar >= PCI_STD_NUM_BARS) {
+                               dev_err(&pcidev->dev, "bad BAR %d for port %d\n",
+                                       bar, i);
+                               ret = -EINVAL;
+                               break;
+                       }
+
                        start = pci_resource_start(pcidev, bar) + offset;
                        len = pci_resource_len(pcidev, bar) - offset;
 

diff --git a/drivers/fpga/dfl.h b/drivers/fpga/dfl.h
index 53572c7..06cfcd5 100644 (file)
--- a/drivers/fpga/dfl.h
+++ b/drivers/fpga/dfl.h
@@ -89,6 +89,7 @@
 #define FME_HDR_NEXT_AFU       NEXT_AFU
 #define FME_HDR_CAP            0x30
 #define FME_HDR_PORT_OFST(n)   (0x38 + ((n) * 0x8))
+#define FME_PORT_OFST_BAR_SKIP 7
 #define FME_HDR_BITSTREAM_ID   0x60
 #define FME_HDR_BITSTREAM_MD   0x68