On 9/18/25 11:55, Jonathan Cameron wrote:

On Thu, 18 Sep 2025 10:17:27 +0100
alejandro.lucero-palau@amd.com wrote:

quoted

From: Alejandro Lucero <redacted>

Differentiate CXL memory expanders (type 3) from CXL device accelerators
(type 2) with a new function for initializing cxl_dev_state and a macro
for helping accel drivers to embed cxl_dev_state inside a private
struct.

Move structs to include/cxl as the size of the accel driver private
struct embedding cxl_dev_state needs to know the size of this struct.

Use same new initialization with the type3 pci driver.

Signed-off-by: Alejandro Lucero <redacted>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Dave Jiang <dave.jiang@intel.com>
Reviewed-by: Alison Schofield <alison.schofield@intel.com>

quoted

diff --git a/Documentation/driver-api/cxl/theory-of-operation.rst b/Documentation/driver-api/cxl/theory-of-operation.rst
index 257f513e320c..ab8ebe7722a9 100644
--- a/Documentation/driver-api/cxl/theory-of-operation.rst
+++ b/Documentation/driver-api/cxl/theory-of-operation.rst

@@ -347,6 +347,9 @@ CXL Core
  .. kernel-doc:: drivers/cxl/cxl.h
     :internal:
  
+.. kernel-doc:: include/cxl/cxl.h
+   :internal:
+

Smells like a merge conflict issue given same entry is already there.

Yes, I'll fix it.


Thanks

quoted

  .. kernel-doc:: drivers/cxl/acpi.c
     :identifiers: add_cxl_resources