Skip to contentSkip to conversation

cxl_test: remove nvdimm requirement

PATCH In review Luis Chamberlain 2 participants 3 messages Dec 19, 2022 – Jan 4, 2023 CXL

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cxl_test: remove nvdimm requirement

There is no need for NVDIMM to test CXL, so remove this requirement.

---
 tools/testing/cxl/config_check.c | 2 --
 tools/testing/cxl/test/mock.c    | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)
tools/testing/cxl/config_check.c +0 -2
index 99b56b5f6edf..cef5f1159ba7 100644
@@ -10,7 +10,5 @@ void check(void)
 	BUILD_BUG_ON(!IS_ENABLED(CONFIG_64BIT));
 	BUILD_BUG_ON(!IS_MODULE(CONFIG_CXL_BUS));
 	BUILD_BUG_ON(!IS_MODULE(CONFIG_CXL_ACPI));
-	BUILD_BUG_ON(!IS_MODULE(CONFIG_CXL_PMEM));
 	BUILD_BUG_ON(!IS_ENABLED(CONFIG_CXL_REGION_INVALIDATION_TEST));
-	BUILD_BUG_ON(!IS_ENABLED(CONFIG_NVDIMM_SECURITY_TEST));
 }
tools/testing/cxl/test/mock.c +2 -0
index 5dface08e0de..7c71826f1aac 100644
@@ -116,6 +116,7 @@ struct acpi_pci_root *__wrap_acpi_pci_find_root(acpi_handle handle)
 }
 EXPORT_SYMBOL_GPL(__wrap_acpi_pci_find_root);
 
+#ifdef CONFIG_CXL_PMEM
 struct nvdimm_bus *
 __wrap_nvdimm_bus_register(struct device *dev,
 			   struct nvdimm_bus_descriptor *nd_desc)
@@ -130,6 +131,7 @@ __wrap_nvdimm_bus_register(struct device *dev,
 	return nvdimm_bus_register(dev, nd_desc);
 }
 EXPORT_SYMBOL_GPL(__wrap_nvdimm_bus_register);
+#endif
 
 struct cxl_hdm *__wrap_devm_cxl_setup_hdm(struct cxl_port *port)
 {
Signature · 1 line
2.35.1
#1 lore raw
Quoted 2 lines · Luis Chamberlain

There is no need for NVDIMM to test CXL, so remove this requirement.

Are you perhaps running without the new nvdimm pmem security test?

http://lore.kernel.org/r/167105505204.3034751.8113387624258581781.stgit@djiang5-desk3.ch.intel.com/

...again these types of mismatches are expected in and around the merge window when linux.git and ndctl.git get out of sync. I would skip running cxl_test for regression purposes until around -rc2 timeframe when all of the new code has settled in both repositories.

#2 lore raw
Quoted 4 lines · Dan Williams
Quoted 2 lines · Luis Chamberlain

There is no need for NVDIMM to test CXL, so remove this requirement.

Quoted 8 lines

Are you perhaps running without the new nvdimm pmem security test?

http://lore.kernel.org/r/167105505204.3034751.8113387624258581781.stgit@djiang5-desk3.ch.intel.com/

...again these types of mismatches are expected in and around the merge window when linux.git and ndctl.git get out of sync. I would skip running cxl_test for regression purposes until around -rc2 timeframe when all of the new code has settled in both repositories.

No, since one can build CXL without NVDIMM it seems this is a fair change as well.

Luis