]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
cxl/edac: Fix wrong dpa checking for PPR operation
authorLi Ming <ming.li@zohomail.com>
Fri, 11 Jul 2025 03:23:56 +0000 (11:23 +0800)
committerDave Jiang <dave.jiang@intel.com>
Fri, 11 Jul 2025 16:46:53 +0000 (09:46 -0700)
Per Table 8-143. "Get Partition Info Output Payload" in CXL r3.2 section
8.2.10.9.2.1 "Get Partition Info(Opcode 4100h)", DPA 0 is a valid
address of a CXL device. However, cxl_do_ppr() considers it as an
invalid address, so that user will get an -EINVAL when user calls the
sysfs interface of the edac driver to trigger a Post Package Repair(PPR)
operation for DPA 0 on a CXL device. The correct implementation should
be checking if the input DPA is in the DPA range of the CXL device.

Fixes: be9b359e056a ("cxl/edac: Add CXL memory device soft PPR control feature")
Signed-off-by: Li Ming <ming.li@zohomail.com>
Tested-by: Shiju Jose <shiju.jose@huawei.com>
Reviewed-by: Shiju Jose <shiju.jose@huawei.com>
Reviewed-by: Dave Jiang <dave.jiang@intel.com>
Reviewed-by: Alison Schofield <alison.schofield@intel.com>
Reviewed-by: Jonathan Cameron <jonathan.cameron@huawei.com>
Link: https://patch.msgid.link/20250711032357.127355-3-ming.li@zohomail.com
Signed-off-by: Dave Jiang <dave.jiang@intel.com>
drivers/cxl/core/edac.c

index cd3873750e78e1c973c00231aae813c02522de9c..1526d388740c7cceff85e63686a3997a11cc376b 100644 (file)
@@ -1923,8 +1923,11 @@ static int cxl_ppr_set_nibble_mask(struct device *dev, void *drv_data,
 static int cxl_do_ppr(struct device *dev, void *drv_data, u32 val)
 {
        struct cxl_ppr_context *cxl_ppr_ctx = drv_data;
+       struct cxl_memdev *cxlmd = cxl_ppr_ctx->cxlmd;
+       struct cxl_dev_state *cxlds = cxlmd->cxlds;
 
-       if (!cxl_ppr_ctx->dpa || val != EDAC_DO_MEM_REPAIR)
+       if (val != EDAC_DO_MEM_REPAIR ||
+           !cxl_resource_contains_addr(&cxlds->dpa_res, cxl_ppr_ctx->dpa))
                return -EINVAL;
 
        return cxl_mem_perform_ppr(cxl_ppr_ctx);