Skip to content

Commit efc22a5

Browse files
committed
.github/workflows/cxl-test.cfg: remove NVDIMM requirements not needed
Trim down the nvdimm section copied from ndctl.git/README.md, remove requirements not required by the CXL test suite. Signed-off-by: Marc Herbert <marc.herbert@intel.com>
1 parent 48ba292 commit efc22a5

File tree

1 file changed

+28
-25
lines changed

1 file changed

+28
-25
lines changed

.github/workflows/cxl-test.cfg

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,16 @@
1-
# Fragment tested with kernel v6.13 + make defconfig ARCH=x86_64
2-
3-
# FIXME : this file is not enough to PASS all --suite=cxl tests yet
4-
# but it is already enough to automatically build and run.
5-
6-
7-
# Requirements missing from ndctl.git/README.md as of ndctl v80
8-
9-
CONFIG_MEMORY_HOTPLUG=y
10-
CONFIG_MEMORY_HOTREMOVE=y
1+
# CXL test requirements
112

3+
# Fragment tested with kernel v6.15 and:
4+
#
5+
# make defconfig ARCH=x86_64
6+
# ./scripts/kconfig/merge_config.sh .config $this_file
127

13-
# Duplicate of ndctl.git/README.md as of ndctl v80.
8+
# WARNING: you may or may not need to disable KASLR, see issue
9+
# https://github.com/pmem/ndctl/issues/278
1410

15-
# libnvdimm requirements
16-
CONFIG_X86_PMEM_LEGACY=m
17-
CONFIG_ZONE_DEVICE=y
18-
CONFIG_LIBNVDIMM=m
19-
CONFIG_BLK_DEV_PMEM=m
20-
CONFIG_BTT=y
21-
CONFIG_NVDIMM_PFN=y
22-
CONFIG_NVDIMM_DAX=y
23-
CONFIG_DEV_DAX_PMEM=m
24-
CONFIG_ENCRYPTED_KEYS=y
25-
CONFIG_NVDIMM_SECURITY_TEST=y
26-
CONFIG_STRICT_DEVMEM=y
27-
CONFIG_IO_STRICT_DEVMEM=y
2811

29-
# CXL test requirements
12+
# This first section is mostly a duplicate of ndctl.git/README.md as of ndctl v81
13+
# Try to keep both in sync.
3014
CONFIG_CXL_BUS=m
3115
CONFIG_CXL_PCI=m
3216
CONFIG_CXL_ACPI=m
@@ -44,6 +28,25 @@ CONFIG_DEV_DAX_CXL=m
4428
# --cxl-debug requirement (part of --cxl-test-run)
4529
CONFIG_DYNAMIC_DEBUG=y
4630

31+
32+
# These CXL test requirements are either directly in the libnvdimm
33+
# section of ndctl.git/README.md, or indirect dependencies of it.
34+
35+
# Required by CXL_PMEM
36+
CONFIG_LIBNVDIMM=m
37+
38+
# Needed by ndctl/test/cxl-security.sh specifically
39+
CONFIG_ENCRYPTED_KEYS=y
40+
CONFIG_NVDIMM_KEYS=y
41+
CONFIG_NVDIMM_SECURITY_TEST=y
42+
43+
44+
# These are required by DEV_DAX_PMEM, NVDIMM_DAX and a couple others
45+
# below but missing from ndctl.git/README.md as of ndctl v81
46+
CONFIG_MEMORY_HOTPLUG=y
47+
CONFIG_MEMORY_HOTREMOVE=y
48+
49+
4750
# Optimization: saves almost half the compilation time with just one
4851
# one-line. When making and testing changes above, comment out this line
4952
# to make the output of kconfig/merge_config.sh usable.

0 commit comments

Comments
 (0)