From: Dan Williams <dan.j.williams@intel.com>
Date: Tue, 31 Oct 2023 17:59:00 +0000 (-0700)
Subject: Merge branch 'for-6.7/cxl-rch-eh' into cxl/next
X-Git-Tag: v6.7-rc1~59^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7f946e6d830fbdf411cd0641314edf11831efc88;p=thirdparty%2Fkernel%2Flinux.git

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.
---

7f946e6d830fbdf411cd0641314edf11831efc88
diff --cc drivers/cxl/core/core.h
index 8e5f3d84311e5,f470ef5c0a6a2..86d7ba23235e3
--- a/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);