Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2ddaf8d authored by Vadim Lomovtsev's avatar Vadim Lomovtsev Committed by Bjorn Helgaas
Browse files

PCI: Apply Cavium ThunderX ACS quirk to more Root Ports 



Extend the Cavium ThunderX ACS quirk to cover more device IDs and restrict
it to only Root Ports.

Signed-off-by: default avatarVadim Lomovtsev <Vadim.Lomovtsev@cavium.com>
[bhelgaas: changelog, stable tag]
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Cc: stable@vger.kernel.org	# v4.12+
parent 7f342678

drivers/pci/quirks.c

+14 −1
Original line number Diff line number Diff line
@@ -4211,6 +4211,19 @@ static int pci_quirk_amd_sb_acs(struct pci_dev *dev, u16 acs_flags) 
#endif

}



static bool pci_quirk_cavium_acs_match(struct pci_dev *dev)

{

	/*

	 * Effectively selects all downstream ports for whole ThunderX 1

	 * family by 0xf800 mask (which represents 8 SoCs), while the lower

	 * bits of device ID are used to indicate which subdevice is used

	 * within the SoC.

	 */

	return (pci_is_pcie(dev) &&

		(pci_pcie_type(dev) == PCI_EXP_TYPE_ROOT_PORT) &&

		((dev->device & 0xf800) == 0xa000));

}



static int pci_quirk_cavium_acs(struct pci_dev *dev, u16 acs_flags)

{

	/*
@@ -4223,7 +4236,7 @@ static int pci_quirk_cavium_acs(struct pci_dev *dev, u16 acs_flags) 
	 */

	acs_flags &= ~(PCI_ACS_RR | PCI_ACS_CR | PCI_ACS_SV | PCI_ACS_UF);



	if (!((dev->device >= 0xa000) && (dev->device <= 0xa0ff)))

	if (!pci_quirk_cavium_acs_match(dev))

		return -ENOTTY;



	return acs_flags ? 0 : 1;