Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Tianfei zhang <tianfei.zhang@intel.com>
To:     hao.wu@intel.com, trix@redhat.com, mdf@kernel.org,
        yilun.xu@intel.com, linux-fpga@vger.kernel.org,
        linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org
Cc:     corbet@lwn.net, Tianfei Zhang <tianfei.zhang@intel.com>
Subject: [PATCH v1 2/7] fpga: dfl: check feature type before parse irq info
Date:   Mon, 14 Feb 2022 06:26:14 -0500
Message-Id: <20220214112619.219761-3-tianfei.zhang@intel.com>
In-Reply-To: <20220214112619.219761-1-tianfei.zhang@intel.com>
References: <20220214112619.219761-1-tianfei.zhang@intel.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

From: Tianfei Zhang <tianfei.zhang@intel.com>

The feature ID of "Port User Interrupt" and the
"PMCI Subsystem" are identical, 0x12, but one is for FME,
other is for Port. It should check the feature type While
parsing the irq info in parse_feature_irqs().

Signed-off-by: Tianfei Zhang <tianfei.zhang@intel.com>
---
 drivers/fpga/dfl.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/drivers/fpga/dfl.c b/drivers/fpga/dfl.c
index 599bb21d86af..26f8cf890700 100644
--- a/drivers/fpga/dfl.c
+++ b/drivers/fpga/dfl.c
@@ -940,9 +940,14 @@ 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);
+	if (type >= DFL_ID_MAX)
+		return -EINVAL;
+
 	/*
 	 * Ideally DFL framework should only read info from DFL header, but
 	 * current version DFL only provides mmio resources information for
@@ -959,16 +964,22 @@ static int parse_feature_irqs(struct build_feature_devs_info *binfo,
 	 */
 	switch (fid) {
 	case PORT_FEATURE_ID_UINT:
+		if (type != PORT_ID)
+			break;
 		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:
+		if (type != PORT_ID)
+			break;
 		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:
+		if (type != FME_ID)
+			break;
 		v = readq(base + FME_ERROR_CAP);
 		ibase = FIELD_GET(FME_ERROR_CAP_INT_VECT, v);
 		inr = FIELD_GET(FME_ERROR_CAP_SUPP_INT, v);
-- 
2.17.1