From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E89DB3EDADD; Tue, 17 Mar 2026 17:04:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773767065; cv=none; b=vCcUnECqFtIDl0W67yEyvz7Fqi9r7mOtaox54w+B8e4bI2XjPmbvOp6eHRXEwrMe7GAPUmM3AFwL1FeUafCXXR3/wH/0/r8OYGD3B3xOFGvPD26QLJFduOcnu47T+atFvxl4JfET93JlnDFcJMgD26JcGpv9667Mj+cG6yKpRog= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773767065; c=relaxed/simple; bh=/mA03QDiWAnAfCiXLFQ9+phhRK5oskhd/xf0NlMcjc0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=g5DCZQNw5kKxheXd4E/N0D2mafvf087xJJf1qVaku8J5kZmG5xTUFfQ7hWZxbQEelXA53Q8PIRlK1ZygpF4JuhWV6f1iBXWC3LOCmEJqX4o6DJlj/lpQ/mfFyieLcd2v0DHfo+XhJ7haKrjJEKhsTDB4WulV4HKu32mWy9fQRfw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=GjeuYul4; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="GjeuYul4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2BBDFC4CEF7; Tue, 17 Mar 2026 17:04:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1773767064; bh=/mA03QDiWAnAfCiXLFQ9+phhRK5oskhd/xf0NlMcjc0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GjeuYul4ZiWD2Fold6u39IW5soY71s+zVFGTSkh8GLUtue3M4Ssf192DndcJ+8NJ6 WH8wgy+k3PEP7QCD1PZpYdPyxLWLKld79BlZojbHI2Dsq2TKCBFRqiLgSN75QZxDyS u61p2EHVuvocu1czZ/8ckHX5iBiyzL65f48ZMGO4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Keith Busch , Jonathan Cameron , Dan Williams , Dave Jiang Subject: [PATCH 6.19 378/378] cxl/acpi: Fix CXL_ACPI and CXL_PMEM Kconfig tristate mismatch Date: Tue, 17 Mar 2026 17:35:35 +0100 Message-ID: <20260317163020.886316423@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260317163006.959177102@linuxfoundation.org> References: <20260317163006.959177102@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.19-stable review patch. If anyone has any objections, please let me know. ------------------ 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