Commit f24767ca authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'cxl-fixes-6.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl 

Pull cxl fixes from Vishal Verma:

 - Update MAINTAINERS for cxl

 - A few static analysis fixes

 - Fix a Kconfig dependency for CONFIG_FW_LOADER

* tag 'cxl-fixes-6.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl:
  tools/testing/cxl: Remove unused SZ_512G macro
  cxl/acpi: Return 'rc' instead of '0' in cxl_parse_cfmws()
  cxl/acpi: Fix a use-after-free in cxl_parse_cfmws()
  cxl: Update MAINTAINERS
  cxl/mem: Fix a double shift bug
  cxl: fix CONFIG_FW_LOADER dependency
parents c442a957 70d49bbf

MAINTAINERS

+3 −1
Original line number Diff line number Diff line
@@ -5149,10 +5149,12 @@ S: Maintained 
F:	include/linux/compiler_attributes.h









COMPUTE EXPRESS LINK (CXL)









M:	Davidlohr Bueso <dave@stgolabs.net>









M:	Jonathan Cameron <jonathan.cameron@huawei.com>









M:	Dave Jiang <dave.jiang@intel.com>









M:	Alison Schofield <alison.schofield@intel.com>









M:	Vishal Verma <vishal.l.verma@intel.com>









M:	Ira Weiny <ira.weiny@intel.com>









M:	Ben Widawsky <bwidawsk@kernel.org>









M:	Dan Williams <dan.j.williams@intel.com>









L:	linux-cxl@vger.kernel.org









S:	Maintained
































drivers/cxl/Kconfig



+2
−1






























Original line number
Diff line number
Diff line







@@ -2,6 +2,8 @@







menuconfig CXL_BUS









	tristate "CXL (Compute Express Link) Devices Support"









	depends on PCI









	select FW_LOADER









	select FW_UPLOAD









	select PCI_DOE









	help









	  CXL is a bus that is electrically compatible with PCI Express, but








@@ -82,7 +84,6 @@ config CXL_PMEM







config CXL_MEM









	tristate "CXL: Memory Expansion"









	depends on CXL_PCI









	select FW_UPLOAD









	default CXL_BUS









	help









	  The CXL.mem protocol allows a device to act as a provider of "System
































drivers/cxl/acpi.c



+2
−3






























Original line number
Diff line number
Diff line







@@ -296,9 +296,8 @@ static int cxl_parse_cfmws(union acpi_subtable_headers *header, void *arg,







	else









		rc = cxl_decoder_autoremove(dev, cxld);









	if (rc) {









		dev_err(dev, "Failed to add decode range [%#llx - %#llx]\n",









			cxld->hpa_range.start, cxld->hpa_range.end);









		return 0;









		dev_err(dev, "Failed to add decode range: %pr", res);









		return rc;









	}









	dev_dbg(dev, "add: %s node: %d range [%#llx - %#llx]\n",









		dev_name(&cxld->dev),
































drivers/cxl/cxlmem.h



+1
−1






























Original line number
Diff line number
Diff line







@@ -323,7 +323,7 @@ struct cxl_mbox_activate_fw {

















/* FW state bits */









#define CXL_FW_STATE_BITS		32









#define CXL_FW_CANCEL		BIT(0)









#define CXL_FW_CANCEL			0



















/**









 * struct cxl_fw_state - Firmware upload / activation state
































tools/testing/cxl/test/cxl.c



+0
−4






























Original line number
Diff line number
Diff line







@@ -999,10 +999,6 @@ static void mock_companion(struct acpi_device *adev, struct device *dev)







#define SZ_64G (SZ_32G * 2)









#endif



















#ifndef SZ_512G









#define SZ_512G (SZ_64G * 8)









#endif



















static __init int cxl_rch_init(void)









{









	int rc, i;