Merge branch 'for-6.11/xor_fixes' into cxl-for-next

Series to fix XOR math for DPA to SPA translation
- Refactor and fold cxl_trace_hpa() into cxl_dpa_to_hpa()
- Complete DPA->HPA->SPA translation and correct XOR translation issue
- Add new method to verify a CXL target position
- Remove old method of CXL target position verifiation

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

diff --cc drivers/cxl/core/mbox.c
index a08f050cc1ca3ca8a785072231ade9e3a6d38ceb,eb0b08e5136f2b60160129df3aa7e738152d05f0..e5cdeafdf76e7dbcc117ccd9af949d34526804aa
--- 1/drivers/cxl/core/mbox.c
--- 2/drivers/cxl/core/mbox.c
+++ b/drivers/cxl/core/mbox.c
@@@ -875,10 -875,10 +875,10 @@@ void cxl_event_trace_record(const struc
                guard(rwsem_read)(&cxl_region_rwsem);
                guard(rwsem_read)(&cxl_dpa_rwsem);
  
 -              dpa = le64_to_cpu(evt->common.phys_addr) & CXL_DPA_MASK;
 +              dpa = le64_to_cpu(evt->media_hdr.phys_addr) & CXL_DPA_MASK;
                cxlr = cxl_dpa_to_region(cxlmd, dpa);
                if (cxlr)
-                       hpa = cxl_trace_hpa(cxlr, cxlmd, dpa);
+                       hpa = cxl_dpa_to_hpa(cxlr, cxlmd, dpa);
  
                if (event_type == CXL_CPER_EVENT_GEN_MEDIA)
                        trace_cxl_general_media(cxlmd, type, cxlr, hpa,

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

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

diff --cc drivers/cxl/core/trace.h
Simple merge

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