From: Greg Kroah-Hartman Date: Tue, 17 Mar 2026 15:39:07 +0000 (+0100) Subject: 6.19-stable patches X-Git-Tag: v6.18.19~25 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c00a46cbeaae5e2cd7cfeb074885d5ec957ec9f4;p=thirdparty%2Fkernel%2Fstable-queue.git 6.19-stable patches added patches: cxl-acpi-fix-cxl_acpi-and-cxl_pmem-kconfig-tristate-mismatch.patch --- diff --git a/queue-6.19/cxl-acpi-fix-cxl_acpi-and-cxl_pmem-kconfig-tristate-mismatch.patch b/queue-6.19/cxl-acpi-fix-cxl_acpi-and-cxl_pmem-kconfig-tristate-mismatch.patch new file mode 100644 index 0000000000..adfb3ab91a --- /dev/null +++ b/queue-6.19/cxl-acpi-fix-cxl_acpi-and-cxl_pmem-kconfig-tristate-mismatch.patch @@ -0,0 +1,48 @@ +From 93d0fcdddc9e7be9d4f42acbe57bc90dbb0fe75d Mon Sep 17 00:00:00 2001 +From: Keith Busch +Date: Thu, 5 Mar 2026 12:40:56 -0800 +Subject: cxl/acpi: Fix CXL_ACPI and CXL_PMEM Kconfig tristate mismatch + +From: Keith Busch + +commit 93d0fcdddc9e7be9d4f42acbe57bc90dbb0fe75d upstream. + +Commit e7e222ad73d9 ("cxl: Move devm_cxl_add_nvdimm_bridge() to +cxl_pmem.ko") moves devm_cxl_add_nvdimm_bridge() into the cxl_pmem file, +which has independent config compile options for built-in or module. The +call from cxl_acpi_probe() is guarded by IS_ENABLED(CONFIG_CXL_PMEM), +which evaluates to true for both =y and =m. + +When CONFIG_CXL_PMEM=m, a built-in cxl_acpi attempts to reference a +symbol exported by a module, which fails to link. CXL_PMEM cannot simply +be promoted to =y in this configuration because it depends on LIBNVDIMM, +which may itself be =m. + +Add a Kconfig dependency to prevent CXL_ACPI from being built-in when +CXL_PMEM is a module. This contrains CXL_ACPI to =m when CXL_PMEM=m, +while still allowing CXL_ACPI to be freely configured when CXL_PMEM is +either built-in or disabled. + +[ dj: Fix up commit reference formatting. ] + +Fixes: e7e222ad73d9 ("cxl: Move devm_cxl_add_nvdimm_bridge() to cxl_pmem.ko") +Signed-off-by: Keith Busch +Reviewed-by: Jonathan Cameron +Reviewed-by: Dan Williams +Link: https://patch.msgid.link/20260305204057.1516948-1-kbusch@meta.com +Signed-off-by: Dave Jiang +Signed-off-by: Greg Kroah-Hartman +--- + drivers/cxl/Kconfig | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/cxl/Kconfig ++++ b/drivers/cxl/Kconfig +@@ -58,6 +58,7 @@ config CXL_ACPI + tristate "CXL ACPI: Platform Support" + depends on ACPI + depends on ACPI_NUMA ++ depends on CXL_PMEM || !CXL_PMEM + default CXL_BUS + select ACPI_TABLE_LIB + select ACPI_HMAT diff --git a/queue-6.19/series b/queue-6.19/series index 7d03de77c7..0933a39a84 100644 --- a/queue-6.19/series +++ b/queue-6.19/series @@ -375,3 +375,4 @@ kvm-arm64-gic-set-vgic_model-before-initing-private-irqs.patch kvm-arm64-eagerly-init-vgic-dist-redist-on-vgic-creation.patch io_uring-ensure-ctx-rings-is-stable-for-task-work-flags-manipulation.patch io_uring-eventfd-use-ctx-rings_rcu-for-flags-checking.patch +cxl-acpi-fix-cxl_acpi-and-cxl_pmem-kconfig-tristate-mismatch.patch