]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
dax/hmem: Gate Soft Reserved deferral on DEV_DAX_CXL
authorDan Williams <dan.j.williams@intel.com>
Sun, 22 Mar 2026 19:53:37 +0000 (19:53 +0000)
committerDave Jiang <dave.jiang@intel.com>
Fri, 27 Mar 2026 17:19:51 +0000 (10:19 -0700)
Replace IS_ENABLED(CONFIG_CXL_REGION) with IS_ENABLED(CONFIG_DEV_DAX_CXL)
so that HMEM only defers Soft Reserved ranges when CXL DAX support is
enabled. This makes the coordination between HMEM and the CXL stack more
precise and prevents deferral in unrelated CXL configurations.

Signed-off-by: Smita Koralahalli <Smita.KoralahalliChannabasappa@amd.com>
Reviewed-by: Dave Jiang <dave.jiang@intel.com>
Reviewed-by: Jonathan Cameron <jonathan.cameron@huawei.com>
Reviewed-by: Alison Schofield <alison.schofield@intel.com>
Link: https://patch.msgid.link/20260322195343.206900-5-Smita.KoralahalliChannabasappa@amd.com
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Dave Jiang <dave.jiang@intel.com>
drivers/dax/hmem/hmem.c

index 85e751675f65fdf2c7c6005534a8072789c4318d..ca752db03201cf16ee4ace4f55a45872682897f9 100644 (file)
@@ -119,7 +119,7 @@ out_put:
 static int hmem_register_device(struct device *host, int target_nid,
                                const struct resource *res)
 {
-       if (IS_ENABLED(CONFIG_CXL_REGION) &&
+       if (IS_ENABLED(CONFIG_DEV_DAX_CXL) &&
            region_intersects(res->start, resource_size(res), IORESOURCE_MEM,
                              IORES_DESC_CXL) != REGION_DISJOINT) {
                dev_dbg(host, "deferring range to CXL: %pr\n", res);