Merge branch 'pci/controller/broadcom'

bjorn-helgaas · bjorn-helgaas · commit cab098b6f253 · 2024-03-12T12:14:24.000-05:00
- Fix polling for MDIO write completion, which previously used the wrong
  access width so it always indicated "completed" (Jonathan Bell)

* pci/controller/broadcom:
  PCI: brcmstb: Fix broken brcm_pcie_mdio_write() polling
diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
@@ -336,7 +336,7 @@ static int brcm_pcie_mdio_write(void __iomem *base, u8 port,
 	readl(base + PCIE_RC_DL_MDIO_ADDR);
 	writel(MDIO_DATA_DONE_MASK | wrdata, base + PCIE_RC_DL_MDIO_WR_DATA);
 
-	err = readw_poll_timeout_atomic(base + PCIE_RC_DL_MDIO_WR_DATA, data,
+	err = readl_poll_timeout_atomic(base + PCIE_RC_DL_MDIO_WR_DATA, data,
 					MDIO_WT_DONE(data), 10, 100);
 	return err;
 }

Original file line number	Diff line number	Diff line change
`@@ -336,7 +336,7 @@ static int brcm_pcie_mdio_write(void __iomem *base, u8 port,`
`336`	`336`	`readl(base + PCIE_RC_DL_MDIO_ADDR);`
`337`	`337`	`writel(MDIO_DATA_DONE_MASK \| wrdata, base + PCIE_RC_DL_MDIO_WR_DATA);`
`338`	`338`
`339`		`- err = readw_poll_timeout_atomic(base + PCIE_RC_DL_MDIO_WR_DATA, data,`
	`339`	`+ err = readl_poll_timeout_atomic(base + PCIE_RC_DL_MDIO_WR_DATA, data,`
`340`	`340`	`MDIO_WT_DONE(data), 10, 100);`
`341`	`341`	`return err;`
`342`	`342`	`}`