summaryrefslogtreecommitdiff
path: root/drivers/cxl
diff options
context:
space:
mode:
authorYanfei Xu <yanfei.xu@intel.com>2024-08-28 16:42:30 +0800
committerDave Jiang <dave.jiang@intel.com>2024-09-09 11:33:44 -0700
commit99bf0eebc75c9085440d6dca014724e7e49b5116 (patch)
tree1a72d3e3899d682dc38bad0ba2d223e62b06cd5a /drivers/cxl
parent5c6e3d5a5da118be2ae074bd70d111994147c708 (diff)
downloadlwn-99bf0eebc75c9085440d6dca014724e7e49b5116.tar.gz
lwn-99bf0eebc75c9085440d6dca014724e7e49b5116.zip
cxl/pci: Check Mem_info_valid bit for each applicable DVSEC
In theory a device might set the mem_info_valid bit for a first range after it is ready but before as second range has reached that state. Therefore, the correct approach is to check the Mem_info_valid bit for each applicable DVSEC range against HDM_COUNT, rather than only for the DVSEC range 1. Consequently, let's move the check into the "for loop" that handles each DVSEC range. Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Signed-off-by: Yanfei Xu <yanfei.xu@intel.com> Reviewed-by: Alison Schofield <alison.schofield@intel.com> Link: https://patch.msgid.link/20240828084231.1378789-4-yanfei.xu@intel.com Signed-off-by: Dave Jiang <dave.jiang@intel.com>
Diffstat (limited to 'drivers/cxl')
-rw-r--r--drivers/cxl/core/pci.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/cxl/core/pci.c b/drivers/cxl/core/pci.c
index 37e537e50b34..043775f3f9a5 100644
--- a/drivers/cxl/core/pci.c
+++ b/drivers/cxl/core/pci.c
@@ -324,10 +324,6 @@ int cxl_dvsec_rr_decode(struct device *dev, struct cxl_port *port,
if (!hdm_count || hdm_count > 2)
return -EINVAL;
- rc = cxl_dvsec_mem_range_valid(cxlds, 0);
- if (rc)
- return rc;
-
/*
* The current DVSEC values are moot if the memory capability is
* disabled, and they will remain moot after the HDM Decoder
@@ -345,6 +341,10 @@ int cxl_dvsec_rr_decode(struct device *dev, struct cxl_port *port,
u64 base, size;
u32 temp;
+ rc = cxl_dvsec_mem_range_valid(cxlds, i);
+ if (rc)
+ return rc;
+
rc = pci_read_config_dword(
pdev, d + CXL_DVSEC_RANGE_SIZE_HIGH(i), &temp);
if (rc)