fpga: dfl: check feature type before parse irq info

Previously the feature IDs defined are unique, no matter
which feature type. But currently we want to extend its
usage to have a per-type feature ID space, so this patch
adds feature type checking as well just before look into
feature ID for different features which have irq info.

Signed-off-by: Tianfei zhang <tianfei.zhang@intel.com>
Reviewed-by: Matthew Gerlach <matthew.gerlach@linux.intel.com>
Acked-by: Wu Hao <hao.wu@intel.com>
Acked-by: Moritz Fischer <mdf@kernel.org>
Link: https://lore.kernel.org/r/20220419032942.427429-2-tianfei.zhang@intel.com
Signed-off-by: Xu Yilun <yilun.xu@intel.com>

diff --git a/drivers/fpga/dfl.c b/drivers/fpga/dfl.c
index 599bb21..6bff39f 100644 (file)
--- a/drivers/fpga/dfl.c
+++ b/drivers/fpga/dfl.c
@@ -940,9 +940,12 @@ static int parse_feature_irqs(struct build_feature_devs_info *binfo,
 {
        void __iomem *base = binfo->ioaddr + ofst;
        unsigned int i, ibase, inr = 0;
+       enum dfl_id_type type;
        int virq;
        u64 v;
 
+       type = feature_dev_id_type(binfo->feature_dev);
+
        /*
         * Ideally DFL framework should only read info from DFL header, but
         * current version DFL only provides mmio resources information for
@@ -957,22 +960,25 @@ static int parse_feature_irqs(struct build_feature_devs_info *binfo,
         * code will be added. But in order to be compatible to old version
         * DFL, the driver may still fall back to these quirks.
         */
-       switch (fid) {
-       case PORT_FEATURE_ID_UINT:
-               v = readq(base + PORT_UINT_CAP);
-               ibase = FIELD_GET(PORT_UINT_CAP_FST_VECT, v);
-               inr = FIELD_GET(PORT_UINT_CAP_INT_NUM, v);
-               break;
-       case PORT_FEATURE_ID_ERROR:
-               v = readq(base + PORT_ERROR_CAP);
-               ibase = FIELD_GET(PORT_ERROR_CAP_INT_VECT, v);
-               inr = FIELD_GET(PORT_ERROR_CAP_SUPP_INT, v);
-               break;
-       case FME_FEATURE_ID_GLOBAL_ERR:
-               v = readq(base + FME_ERROR_CAP);
-               ibase = FIELD_GET(FME_ERROR_CAP_INT_VECT, v);
-               inr = FIELD_GET(FME_ERROR_CAP_SUPP_INT, v);
-               break;
+       if (type == PORT_ID) {
+               switch (fid) {
+               case PORT_FEATURE_ID_UINT:
+                       v = readq(base + PORT_UINT_CAP);
+                       ibase = FIELD_GET(PORT_UINT_CAP_FST_VECT, v);
+                       inr = FIELD_GET(PORT_UINT_CAP_INT_NUM, v);
+                       break;
+               case PORT_FEATURE_ID_ERROR:
+                       v = readq(base + PORT_ERROR_CAP);
+                       ibase = FIELD_GET(PORT_ERROR_CAP_INT_VECT, v);
+                       inr = FIELD_GET(PORT_ERROR_CAP_SUPP_INT, v);
+                       break;
+               }
+       } else if (type == FME_ID) {
+               if (fid == FME_FEATURE_ID_GLOBAL_ERR) {
+                       v = readq(base + FME_ERROR_CAP);
+                       ibase = FIELD_GET(FME_ERROR_CAP_INT_VECT, v);
+                       inr = FIELD_GET(FME_ERROR_CAP_SUPP_INT, v);
+               }
        }
 
        if (!inr) {