[PATCH v2 2/7] PCI: aardvark: set PIO_ADDR_LS correctly in advk_pcie_rd_conf()
From: helgaas@kernel.org (Bjorn Helgaas)
Date: 2017-10-05 17:25:47
Also in:
linux-pci, stable
On Thu, Sep 28, 2017 at 02:58:33PM +0200, Thomas Petazzoni wrote:
quoted hunk ↗ jump to hunk
From: Victor Gu <redacted> When setting the PIO_ADDR_LS register during a configuration read, we were properly passing the device number, function number and register number, but not the bus number, causing issues when reading the configuration of PCIe devices. Fixes: 8c39d710363c1 ("PCI: aardvark: Add Aardvark PCI host controller driver") Cc: <redacted> Signed-off-by: Victor Gu <redacted> Reviewed-by: Wilson Ding <redacted> Reviewed-by: Nadav Haklai <redacted> [Thomas: tweak commit log.] Signed-off-by: Thomas Petazzoni <redacted> --- drivers/pci/host/pci-aardvark.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)diff --git a/drivers/pci/host/pci-aardvark.c b/drivers/pci/host/pci-aardvark.c index da2881ba7737..af7a9c4a61a4 100644 --- a/drivers/pci/host/pci-aardvark.c +++ b/drivers/pci/host/pci-aardvark.c@@ -459,7 +459,7 @@ static int advk_pcie_rd_conf(struct pci_bus *bus, u32 devfn, advk_writel(pcie, reg, PIO_CTRL); /* Program the address registers */ - reg = PCIE_BDF(devfn) | PCIE_CONF_REG(where); + reg = PCIE_CONF_ADDR(bus->number, devfn, where);
I think PCIE_BDF() is now unused and should be removed.
advk_writel(pcie, reg, PIO_ADDR_LS); advk_writel(pcie, 0, PIO_ADDR_MS); -- 2.13.5 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel at lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel