Skip to content

Commit 70e3802

Browse files
paliLorenzo Pieralisi
authored andcommitted
PCI: aardvark: Don't touch PCIe registers if no card connected
When there is no PCIe card connected and advk_pcie_rd_conf() or advk_pcie_wr_conf() is called for PCI bus which doesn't belong to emulated root bridge, the aardvark driver throws the following error message: advk-pcie d0070000.pcie: config read/write timed out Obviously accessing PCIe registers of disconnected card is not possible. Extend check in advk_pcie_valid_device() function for validating availability of PCIe bus. If PCIe link is down, then the device is marked as Not Found and the driver does not try to access these registers. This is just an optimization to prevent accessing PCIe registers when card is disconnected. Trying to access PCIe registers of disconnected card does not cause any crash, kernel just needs to wait for a timeout. So if card disappear immediately after checking for PCIe link (before accessing PCIe registers), it does not cause any problems. Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Pali Rohár <[email protected]> Signed-off-by: Lorenzo Pieralisi <[email protected]>
1 parent b1bd571 commit 70e3802

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

drivers/pci/controller/pci-aardvark.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -644,6 +644,13 @@ static bool advk_pcie_valid_device(struct advk_pcie *pcie, struct pci_bus *bus,
644644
if ((bus->number == pcie->root_bus_nr) && PCI_SLOT(devfn) != 0)
645645
return false;
646646

647+
/*
648+
* If the link goes down after we check for link-up, nothing bad
649+
* happens but the config access times out.
650+
*/
651+
if (bus->number != pcie->root_bus_nr && !advk_pcie_link_up(pcie))
652+
return false;
653+
647654
return true;
648655
}
649656

0 commit comments

Comments
 (0)