fpga: dfl: expose feature revision from struct dfl_device

DFL device drivers have a common need for checking feature revision
information from the DFL header, as well as other common DFL information
like the already exposed feature id and type.

This patch exposes the feature revision information directly via the DFL
device data structure.

Since the DFL core code has already read the DFL header, this this patch
saves additional mmio reads from DFL device drivers too.

Acked-by: Wu Hao <hao.wu@intel.com>
Acked-by: Matthew Gerlach <matthew.gerlach@linux.intel.com>
Signed-off-by: Martin Hundebøll <mhu@silicom.dk>
Signed-off-by: Moritz Fischer <mdf@kernel.org>

diff --git a/drivers/fpga/dfl.c b/drivers/fpga/dfl.c
index 511b20ff35a336c3f2a80107ebf8323359a86a0f..e73a7005390688a37c68eb602979b89652adc39f 100644 (file)
--- a/drivers/fpga/dfl.c
+++ b/drivers/fpga/dfl.c
@@ -381,6 +381,7 @@ dfl_dev_add(struct dfl_feature_platform_data *pdata,
 
        ddev->type = feature_dev_id_type(pdev);
        ddev->feature_id = feature->id;
+       ddev->revision = feature->revision;
        ddev->cdev = pdata->dfl_cdev;
 
        /* add mmio resource */
@@ -717,6 +718,7 @@ struct build_feature_devs_info {
  */
 struct dfl_feature_info {
        u16 fid;
+       u8 revision;
        struct resource mmio_res;
        void __iomem *ioaddr;
        struct list_head node;
@@ -796,6 +798,7 @@ static int build_info_commit_dev(struct build_feature_devs_info *binfo)
                /* save resource information for each feature */
                feature->dev = fdev;
                feature->id = finfo->fid;
+               feature->revision = finfo->revision;
 
                /*
                 * the FIU header feature has some fundamental functions (sriov
@@ -910,19 +913,17 @@ static void build_info_free(struct build_feature_devs_info *binfo)
        devm_kfree(binfo->dev, binfo);
 }
 
-static inline u32 feature_size(void __iomem *start)
+static inline u32 feature_size(u64 value)
 {
-       u64 v = readq(start + DFH);
-       u32 ofst = FIELD_GET(DFH_NEXT_HDR_OFST, v);
+       u32 ofst = FIELD_GET(DFH_NEXT_HDR_OFST, value);
        /* workaround for private features with invalid size, use 4K instead */
        return ofst ? ofst : 4096;
 }
 
-static u16 feature_id(void __iomem *start)
+static u16 feature_id(u64 value)
 {
-       u64 v = readq(start + DFH);
-       u16 id = FIELD_GET(DFH_ID, v);
-       u8 type = FIELD_GET(DFH_TYPE, v);
+       u16 id = FIELD_GET(DFH_ID, value);
+       u8 type = FIELD_GET(DFH_TYPE, value);
 
        if (type == DFH_TYPE_FIU)
                return FEATURE_ID_FIU_HEADER;
@@ -1021,10 +1022,15 @@ create_feature_instance(struct build_feature_devs_info *binfo,
        unsigned int irq_base, nr_irqs;
        struct dfl_feature_info *finfo;
        int ret;
+       u8 revision;
+       u64 v;
+
+       v = readq(binfo->ioaddr + ofst);
+       revision = FIELD_GET(DFH_REVISION, v);
 
        /* read feature size and id if inputs are invalid */
-       size = size ? size : feature_size(binfo->ioaddr + ofst);
-       fid = fid ? fid : feature_id(binfo->ioaddr + ofst);
+       size = size ? size : feature_size(v);
+       fid = fid ? fid : feature_id(v);
 
        if (binfo->len - ofst < size)
                return -EINVAL;
@@ -1038,6 +1044,7 @@ create_feature_instance(struct build_feature_devs_info *binfo,
                return -ENOMEM;
 
        finfo->fid = fid;
+       finfo->revision = revision;
        finfo->mmio_res.start = binfo->start + ofst;
        finfo->mmio_res.end = finfo->mmio_res.start + size - 1;
        finfo->mmio_res.flags = IORESOURCE_MEM;
@@ -1166,7 +1173,7 @@ static int parse_feature_private(struct build_feature_devs_info *binfo,
 {
        if (!is_feature_dev_detected(binfo)) {
                dev_err(binfo->dev, "the private feature 0x%x does not belong to any AFU.\n",
-                       feature_id(binfo->ioaddr + ofst));
+                       feature_id(readq(binfo->ioaddr + ofst)));
                return -EINVAL;
        }
 

diff --git a/drivers/fpga/dfl.h b/drivers/fpga/dfl.h
index dac9c3d45e6c34478e95ab6ae6d15a0745f8fd8d..53572c7aced076abb154f8e1699360edd9d625e9 100644 (file)
--- a/drivers/fpga/dfl.h
+++ b/drivers/fpga/dfl.h
@@ -243,6 +243,7 @@ struct dfl_feature_irq_ctx {
 struct dfl_feature {
        struct platform_device *dev;
        u16 id;
+       u8 revision;
        int resource_index;
        void __iomem *ioaddr;
        struct dfl_feature_irq_ctx *irq_ctx;

diff --git a/include/linux/dfl.h b/include/linux/dfl.h
index 6cc10982351ab2dbd2a239df68ab9af64120477a..431636a0dc7817159b0e5ea3d9eb57c400470740 100644 (file)
--- a/include/linux/dfl.h
+++ b/include/linux/dfl.h
@@ -38,6 +38,7 @@ struct dfl_device {
        int id;
        u16 type;
        u16 feature_id;
+       u8 revision;
        struct resource mmio_res;
        int *irqs;
        unsigned int num_irqs;