diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-02 14:48:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-02 14:48:25 -0700 |
| commit | 4d9c3a688a01e7dd0a33cf3ddb7b206cf867b615 (patch) | |
| tree | 4bcb7a57bb8ba3c7b5ea07ee7c52c5ad897f461b | |
| parent | cb6f55af1fb28655c9f3843bc12c0a48856c1d09 (diff) | |
| parent | 76a6b0b90d532ed9bb9f6069aa12859c185e5b99 (diff) | |
| download | linux-4d9c3a688a01e7dd0a33cf3ddb7b206cf867b615.tar.gz | |
Merge tag 'pci-v5.9-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fixes from Bjorn Helgaas:
- Fix rockchip regression in rockchip_pcie_valid_device() (Lorenzo
Pieralisi)
- Add Pali Rohár as aardvark PCI maintainer (Pali Rohár)
* tag 'pci-v5.9-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
MAINTAINERS: Add Pali Rohár as aardvark PCI maintainer
PCI: rockchip: Fix bus checks in rockchip_pcie_valid_device()
| -rw-r--r-- | MAINTAINERS | 1 | ||||
| -rw-r--r-- | drivers/pci/controller/pcie-rockchip-host.c | 11 |
2 files changed, 5 insertions, 7 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 190c7fa2ea010..33b27e62ce199 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -13182,6 +13182,7 @@ F: drivers/firmware/pcdp.* PCI DRIVER FOR AARDVARK (Marvell Armada 3700) M: Thomas Petazzoni <thomas.petazzoni@bootlin.com> +M: Pali Rohár <pali@kernel.org> L: linux-pci@vger.kernel.org L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained diff --git a/drivers/pci/controller/pcie-rockchip-host.c b/drivers/pci/controller/pcie-rockchip-host.c index 0bb2fb3e8a0b7..9705059523a6e 100644 --- a/drivers/pci/controller/pcie-rockchip-host.c +++ b/drivers/pci/controller/pcie-rockchip-host.c @@ -71,16 +71,13 @@ static void rockchip_pcie_update_txcredit_mui(struct rockchip_pcie *rockchip) static int rockchip_pcie_valid_device(struct rockchip_pcie *rockchip, struct pci_bus *bus, int dev) { - /* access only one slot on each root port */ - if (pci_is_root_bus(bus) && dev > 0) - return 0; - /* - * do not read more than one device on the bus directly attached + * Access only one slot on each root port. + * Do not read more than one device on the bus directly attached * to RC's downstream side. */ - if (pci_is_root_bus(bus->parent) && dev > 0) - return 0; + if (pci_is_root_bus(bus) || pci_is_root_bus(bus->parent)) + return dev == 0; return 1; } |