public inbox for linux-cxl@vger.kernel.org
 help / color / mirror / Atom feed
From: Keith Busch <kbusch@meta.com>
To: <linux-cxl@vger.kernel.org>
Cc: <dan.j.williams@intel.com>, <dave.jiang@intel.com>,
	<gourry@gourry.net>, Keith Busch <kbusch@kernel.org>
Subject: [PATCH] cxl/acpi: Fix CXL_ACPI and CXL_PMEM Kconfig tristate mismatch
Date: Thu, 5 Mar 2026 12:40:56 -0800	[thread overview]
Message-ID: <20260305204057.1516948-1-kbusch@meta.com> (raw)

From: Keith Busch <kbusch@kernel.org>

Commit e7e222ad73d9 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.

Fixes: e7e222ad73d9 ("cxl: Move devm_cxl_add_nvdimm_bridge() to cxl_pmem.ko")
Signed-off-by: Keith Busch <kbusch@kernel.org>
---
 drivers/cxl/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/cxl/Kconfig b/drivers/cxl/Kconfig
index 4589bf11d3fe0..80aeb0d556bd7 100644
--- a/drivers/cxl/Kconfig
+++ b/drivers/cxl/Kconfig
@@ -59,6 +59,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
-- 
2.47.3


             reply	other threads:[~2026-03-05 20:41 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-03-05 20:40 Keith Busch [this message]
2026-03-05 22:12 ` [PATCH] cxl/acpi: Fix CXL_ACPI and CXL_PMEM Kconfig tristate mismatch Gregory Price
2026-03-05 22:43   ` Keith Busch
2026-03-05 22:56     ` Gregory Price
2026-03-05 23:26       ` Keith Busch
2026-03-06  1:07 ` dan.j.williams
2026-03-06  1:26   ` Keith Busch
2026-03-06  1:55     ` dan.j.williams
2026-03-06 10:50       ` Jonathan Cameron
2026-03-06 15:23 ` Dave Jiang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260305204057.1516948-1-kbusch@meta.com \
    --to=kbusch@meta.com \
    --cc=dan.j.williams@intel.com \
    --cc=dave.jiang@intel.com \
    --cc=gourry@gourry.net \
    --cc=kbusch@kernel.org \
    --cc=linux-cxl@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox