From: Dave Jiang <dave.jiang@intel.com>
Date: Thu, 11 Jul 2024 23:30:18 +0000 (-0700)
Subject: Merge branch 'for-6.11/xor_fixes' into cxl-for-next
X-Git-Tag: v6.11-rc1~6^2~1
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=56478475560bde71dd3ef944b5013900272db273;p=linux-block.git

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

56478475560bde71dd3ef944b5013900272db273
diff --cc drivers/cxl/core/mbox.c
index a08f050cc1ca,eb0b08e5136f..e5cdeafdf76e
--- a/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,