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

f24767ca · Linus Torvalds <[email protected]> · 2023-07-28 09:50:04 -07:00

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

Commit: f24767ca4f004f6a34411229a84394e1b94deae7
Parents: c442a957 · 70d49bbf

Merge commit. Changes below are compared with the first parent: c442a957.

Changes

5 files changed · +8 −10

File	Status	Add	Del	Content
MAINTAINERS	modified	+3	−1	View file
drivers/cxl/Kconfig	modified	+2	−1	View file
drivers/cxl/acpi.c	modified	+2	−3	View file
drivers/cxl/cxlmem.h	modified	+1	−1	View file
tools/testing/cxl/test/cxl.c	modified	+0	−4	View file

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index d516295..b87fbce 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5149,10 +5149,12 @@ S:	Maintained
 F:	include/linux/compiler_attributes.h
 
 COMPUTE EXPRESS LINK (CXL)
+M:	Davidlohr Bueso <[email protected]>
+M:	Jonathan Cameron <[email protected]>
+M:	Dave Jiang <[email protected]>
 M:	Alison Schofield <[email protected]>
 M:	Vishal Verma <[email protected]>
 M:	Ira Weiny <[email protected]>
-M:	Ben Widawsky <[email protected]>
 M:	Dan Williams <[email protected]>
 L:	[email protected]
 S:	Maintained

drivers/cxl/Kconfig

View file

diff --git a/drivers/cxl/Kconfig b/drivers/cxl/Kconfig
index fcbf829..8ea1d34 100644
--- a/drivers/cxl/Kconfig
+++ b/drivers/cxl/Kconfig
@@ -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

View file

diff --git a/drivers/cxl/acpi.c b/drivers/cxl/acpi.c
index 658e6b8..d1c5598 100644
--- a/drivers/cxl/acpi.c
+++ b/drivers/cxl/acpi.c
@@ -296,9 +296,8 @@ err_xormap:
 	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

View file

diff --git a/drivers/cxl/cxlmem.h b/drivers/cxl/cxlmem.h
index 79e99c8..4991133 100644
--- a/drivers/cxl/cxlmem.h
+++ b/drivers/cxl/cxlmem.h
@@ -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

View file

diff --git a/tools/testing/cxl/test/cxl.c b/tools/testing/cxl/test/cxl.c
index 0e78d8e..fb6ab9c 100644
--- a/tools/testing/cxl/test/cxl.c
+++ b/tools/testing/cxl/test/cxl.c
@@ -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;