Merge branch 'for-6.7/cxl-rch-eh' into cxl/next

Restricted CXL Host (RCH) Error Handling undoes the topology munging of
CXL 1.1 to enabled some AER recovery, and lands some base infrastructure
for handling Root-Complex-Event-Collectors (RCECs) with CXL. Include
this long running series finally for v6.7.

diff --cc drivers/cxl/core/core.h
index 8e5f3d84311e583a1ab408714548edaa697634cc,f470ef5c0a6a23e69312332a806d129aa4cddfda..86d7ba23235e3bdefb567e3dc3cb656b4f9593c0
--- 1/drivers/cxl/core/core.h
--- 2/drivers/cxl/core/core.h
+++ b/drivers/cxl/core/core.h
@@@ -73,9 -73,9 +73,10 @@@ struct cxl_rcrb_info
  resource_size_t __rcrb_to_component(struct device *dev,
                                    struct cxl_rcrb_info *ri,
                                    enum cxl_rcrb which);
+ u16 cxl_rcrb_to_aer(struct device *dev, resource_size_t rcrb);
  
  extern struct rw_semaphore cxl_dpa_rwsem;
 +extern struct rw_semaphore cxl_region_rwsem;
  
  int cxl_memdev_init(void);
  void cxl_memdev_exit(void);

diff --cc drivers/cxl/core/hdm.c
Simple merge

diff --cc drivers/cxl/core/mbox.c
Simple merge

diff --cc drivers/cxl/core/port.c
Simple merge

diff --cc drivers/cxl/cxlmem.h
Simple merge

diff --cc drivers/cxl/pci.c
Simple merge

diff --cc tools/testing/cxl/test/mem.c
Simple merge