Skip to content

Commit 9171dfc

Browse files
arndbstellarhopper
authored andcommitted
cxl: fix CONFIG_FW_LOADER dependency
When FW_LOADER is disabled, cxl fails to link: arm-linux-gnueabi-ld: drivers/cxl/core/memdev.o: in function `cxl_memdev_setup_fw_upload': memdev.c:(.text+0x90e): undefined reference to `firmware_upload_register' memdev.c:(.text+0x93c): undefined reference to `firmware_upload_unregister' In order to use the firmware_upload_register() function, both FW_LOADER and FW_UPLOAD have to be enabled, which is a bit confusing. In addition, the dependency is on the wrong symbol, as the caller is part of the cxl_core.ko module, not the cxl_mem.ko module. Fixes: 9521875 ("cxl: add a firmware update mechanism using the sysfs firmware loader") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Link: https://lore.kernel.org/r/20230703112928.332321-1-arnd@kernel.org Reviewed-by: Xiao Yang <yangx.jy@fujitsu.com> Reviewed-by: Dave Jiang <dave.jiang@intel.com> Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>
1 parent 06c2afb commit 9171dfc

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/cxl/Kconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
menuconfig CXL_BUS
33
tristate "CXL (Compute Express Link) Devices Support"
44
depends on PCI
5+
select FW_LOADER
6+
select FW_UPLOAD
57
select PCI_DOE
68
help
79
CXL is a bus that is electrically compatible with PCI Express, but
@@ -82,7 +84,6 @@ config CXL_PMEM
8284
config CXL_MEM
8385
tristate "CXL: Memory Expansion"
8486
depends on CXL_PCI
85-
select FW_UPLOAD
8687
default CXL_BUS
8788
help
8889
The CXL.mem protocol allows a device to act as a provider of "System

0 commit comments

Comments
 (0)