Merge tag 'pci-v5.9-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci (4d9c3a68) · Commits · 戴 / test

MAINTAINERS

+1 −0

Original line number	Diff line number	Diff line
		@@ -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

+4 −7

Original line number	Diff line number	Diff line
		@@ -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;
		}