> On Wed, Apr 27, 2022 at 09:16:56AM -0400, Tianfei Zhang wrote:
> > From: Matthew Gerlach <matthew.gerlach@xxxxxxxxxxxxxxx>
> >
> > 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@xxxxxxxxxxxxxxx>
> > Signed-off-by: Tianfei Zhang <tianfei.zhang@xxxxxxxxx>
>
> Acked-by: Xu Yilun <yilun.xu@xxxxxxxxx>
>
Hi Tianfei
Please use break instead of goto (just synced with Yilun), then add
Acked-by: Wu Hao <hao.wu@xxxxxxxxx>
Thanks
Hao
> > ---
> > v4: move the location of FME_PORT_OFST_BAR_SKIP definition.
> > v3: remove dev_dbg and use goto instead of break.
> > v2: return -EINVAL if bar number invalid.
> > ---
> > drivers/fpga/dfl-pci.c | 10 ++++++++++
> > drivers/fpga/dfl.h | 1 +
> > 2 files changed, 11 insertions(+)
> >
> > diff --git a/drivers/fpga/dfl-pci.c b/drivers/fpga/dfl-pci.c
> > index 86ed9e4223d3..dac45f96c326 100644
> > --- a/drivers/fpga/dfl-pci.c
> > +++ b/drivers/fpga/dfl-pci.c
> > @@ -263,6 +263,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;
> > + goto unmap_exit;
> > + }
> > +
> > start = pci_resource_start(pcidev, bar) + offset;
> > len = pci_resource_len(pcidev, bar) - offset;
> >
> > @@ -277,6 +286,7 @@ static int find_dfls_by_default(struct pci_dev *pcidev,
> > ret = -ENODEV;
> > }
> >
> > +unmap_exit:
> > /* release I/O mappings for next step enumeration */
> > pcim_iounmap_regions(pcidev, BIT(0));
> >
> > diff --git a/drivers/fpga/dfl.h b/drivers/fpga/dfl.h
> > index 53572c7aced0..06cfcd5e84bb 100644
> > --- 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
> >
> > --
> > 2.26.2
