3:11 p.m.
This commit resolves the following build warning.
opae-intel-fpga-driver/drivers/fpga/intel/pcie.c: In function ‘parse_feature_afus’:
opae-intel-fpga-driver/drivers/fpga/intel/pcie.c:886:3: warning: this ‘if’ clause does not
guard... [-Wmisleading-indentation]
if (feature_is_UAFU(binfo))
^~
opae-intel-fpga-driver/drivers/fpga/intel/pcie.c:888:4: note: ...this statement, but the
latter is misleadingly indented as if it were guarded by the ‘if’
if (ret)
^~
Assuming a non-AFU feature is enumerated, it might be wrongly handled
and then causes parse_feature_afus() returns an error.
Signed-off-by: Jia Zhang <zhang.jia(a)linux.alibaba.com>
---
drivers/fpga/intel/pcie.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/fpga/intel/pcie.c b/drivers/fpga/intel/pcie.c
index f4f3d70..a84d8a0 100644
--- a/drivers/fpga/intel/pcie.c
+++ b/drivers/fpga/intel/pcie.c
@@ -883,10 +883,11 @@ static int parse_feature_afus(struct build_feature_devs_info
*binfo,
afu_hdr = (struct feature_afu_header *) (hdr + 1);
header.csr = readq(&afu_hdr->csr);
- if (feature_is_UAFU(binfo))
+ if (feature_is_UAFU(binfo)) {
ret = parse_feature_port_uafu(binfo, hdr);
if (ret)
return ret;
+ }
if (!header.next_afu)
break;
--
2.12.2
3:11 p.m.
New subject: [PATCH 2/3] pcie: Add a debug on parsing feature
Signed-off-by: Jia Zhang <zhang.jia(a)linux.alibaba.com>
---
drivers/fpga/intel/pcie.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/fpga/intel/pcie.c b/drivers/fpga/intel/pcie.c
index a84d8a0..c5483d6 100644
--- a/drivers/fpga/intel/pcie.c
+++ b/drivers/fpga/intel/pcie.c
@@ -974,6 +974,9 @@ static int parse_feature(struct build_feature_devs_info *binfo,
header.csr = readq(hdr);
+ dev_dbg(&binfo->pdev->dev, "Parsing feature type %#x id %#x\n",
+ header.type, header.id);
+
switch (header.type) {
case FEATURE_TYPE_AFU:
ret = parse_feature_afus(binfo, hdr);
--
2.12.2
3:11 p.m.
New subject: [PATCH 3/3] pcie: Support port and fme enumeration within afu
The device PCIe_DEVICE_ID_RCiEP0_SKX_P only supports fme and port
enumeration within afu. This behavior was supported by 0.9.0 but
not 0.13.0. This commit re-enables this feature.
Signed-off-by: Jia Zhang <zhang.jia(a)linux.alibaba.com>
---
drivers/fpga/intel/pcie.c | 44 ++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 42 insertions(+), 2 deletions(-)
diff --git a/drivers/fpga/intel/pcie.c b/drivers/fpga/intel/pcie.c
index c5483d6..7eb2146 100644
--- a/drivers/fpga/intel/pcie.c
+++ b/drivers/fpga/intel/pcie.c
@@ -516,6 +516,32 @@ static void build_info_free(struct build_feature_devs_info *binfo)
}
/*
+ * FPGA hardware bug, FME/PORT GUID didn't follow the UUID/GUID rules, it
+ * it reported at:
+ * https://hsdes.intel.com/appstore/article/#/1504370325
+ */
+#define FEATURE_FME_GUID "f9e17764-38f0-82fe-e346-524ae92aafbf"
+#define FEATURE_PORT_GUID "6b355b87-b06c-9642-eb42-8d139398b43a"
+
+static bool feature_is_afu_fme(struct feature_afu_header *afu_hdr)
+{
+ uuid_le u;
+
+ uuid_le_to_bin(FEATURE_FME_GUID, &u);
+
+ return !uuid_le_cmp(u, afu_hdr->guid);
+}
+
+static bool feature_is_afu_port(struct feature_afu_header *afu_hdr)
+{
+ uuid_le u;
+
+ uuid_le_to_bin(FEATURE_PORT_GUID, &u);
+
+ return !uuid_le_cmp(u, afu_hdr->guid);
+}
+
+/*
* UAFU GUID is dynamic as it can be changed after FME downloads different
* Green Bitstream to the port, so we treat the unknown GUIDs which are
* attached on port's feature list as UAFU.
@@ -883,11 +909,25 @@ static int parse_feature_afus(struct build_feature_devs_info
*binfo,
afu_hdr = (struct feature_afu_header *) (hdr + 1);
header.csr = readq(&afu_hdr->csr);
- if (feature_is_UAFU(binfo)) {
+ if (feature_is_afu_fme(afu_hdr)) {
+ ret = parse_feature_fme(binfo, hdr);
+ check_features_header(binfo->pdev, hdr, FPGA_DEVT_FME, 0);
+ binfo->pfme_hdr = hdr;
+ if (ret)
+ return ret;
+ } else if (feature_is_afu_port(afu_hdr)) {
+ ret = parse_feature_port(binfo, hdr);
+ check_features_header(binfo->pdev, hdr, FPGA_DEVT_PORT, 0);
+ enable_port_uafu(binfo, hdr);
+ if (ret)
+ return ret;
+ } else if (feature_is_UAFU(binfo)) {
ret = parse_feature_port_uafu(binfo, hdr);
if (ret)
return ret;
- }
+ } else
+ dev_info(&binfo->pdev->dev, "AFU GUID %pUl is not supported
yet.\n",
+ afu_hdr->guid.b);
if (!header.next_afu)
break;
--
2.12.2
1628
days inactive
1628
days old
2 comments
1 participants
participants (1)
-
Jia Zhang