Skip to content

Commit 9b5f77e

Browse files
committed
cxl/pci: Remove endian confusion
readl() already handles endian conversion. That's the main difference between readl() and __raw_readl(). This is benign on little-endian systems, but big endian systems will end up byte-swabbing twice. Fixes: 2905cb5 ("cxl/pci: Add (hopeful) error handling support") Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com> Cc: Dave Jiang <dave.jiang@intel.com> Reviewed-by: Dave Jiang <dave.jiang@intel.com> Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Reviewed-by: Ira Weiny <ira.weiny@intel.com> Link: https://lore.kernel.org/r/167030092025.4045167.10651070153523351093.stgit@dwillia2-xfh.jf.intel.com Signed-off-by: Dan Williams <dan.j.williams@intel.com>
1 parent 372ab3b commit 9b5f77e

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

drivers/cxl/pci.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -548,15 +548,14 @@ static bool cxl_report_and_clear(struct cxl_dev_state *cxlds)
548548
return false;
549549

550550
addr = cxlds->regs.ras + CXL_RAS_UNCORRECTABLE_STATUS_OFFSET;
551-
status = le32_to_cpu((__force __le32)readl(addr));
551+
status = readl(addr);
552552
if (!(status & CXL_RAS_UNCORRECTABLE_STATUS_MASK))
553553
return false;
554554

555555
/* If multiple errors, log header points to first error from ctrl reg */
556556
if (hweight32(status) > 1) {
557557
addr = cxlds->regs.ras + CXL_RAS_CAP_CONTROL_OFFSET;
558-
fe = BIT(le32_to_cpu((__force __le32)readl(addr)) &
559-
CXL_RAS_CAP_CONTROL_FE_MASK);
558+
fe = BIT(FIELD_GET(CXL_RAS_CAP_CONTROL_FE_MASK, readl(addr)));
560559
} else {
561560
fe = status;
562561
}
@@ -641,7 +640,7 @@ static void cxl_cor_error_detected(struct pci_dev *pdev)
641640
return;
642641

643642
addr = cxlds->regs.ras + CXL_RAS_CORRECTABLE_STATUS_OFFSET;
644-
status = le32_to_cpu(readl(addr));
643+
status = readl(addr);
645644
if (status & CXL_RAS_CORRECTABLE_STATUS_MASK) {
646645
writel(status & CXL_RAS_CORRECTABLE_STATUS_MASK, addr);
647646
trace_cxl_aer_correctable_error(dev, status);

0 commit comments

Comments
 (0)