leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PCI: Apply Cavium ACS quirk to ThunderX2 and ThunderX3

Browse Source 
Enhance the ACS quirk for Cavium Processors. Add the root port vendor IDs
for ThunderX2 and ThunderX3 series of processors.

[bhelgaas: add Fixes: and stable tag]
Fixes: f2ddaf8dfd ("PCI: Apply Cavium ThunderX ACS quirk to more Root Ports")
Link: https://lore.kernel.org/r/20191111024243.GA11408@dc5-eodlnx05.marvell.com
Signed-off-by: George Cherian <george.cherian@marvell.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Robert Richter <rrichter@marvell.com>
Cc: stable@vger.kernel.org	# v4.12+
This commit is contained in:
George Cherian 2019-11-11 02:43:03 +00:00 committed by Bjorn Helgaas
parent 35ff867b76
commit f338bb9f01
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/pci/quirks.c
View File

@ -4347,15 +4347,21 @@ static int pci_quirk_amd_sb_acs(struct pci_dev *dev, u16 acs_flags)
static bool pci_quirk_cavium_acs_match(struct pci_dev *dev) static bool pci_quirk_cavium_acs_match(struct pci_dev *dev)
{ {
if (!pci_is_pcie(dev) || pci_pcie_type(dev) != PCI_EXP_TYPE_ROOT_PORT)
return false;
switch (dev->device) {
/* /*
* Effectively selects all downstream ports for whole ThunderX 1 * Effectively selects all downstream ports for whole ThunderX1
* family by 0xf800 mask (which represents 8 SoCs), while the lower * (which represents 8 SoCs).
* bits of device ID are used to indicate which subdevice is used
* within the SoC.
*/ */
return (pci_is_pcie(dev) && case 0xa000 ... 0xa7ff: /* ThunderX1 */
(pci_pcie_type(dev) == PCI_EXP_TYPE_ROOT_PORT) && case 0xaf84: /* ThunderX2 */
((dev->device & 0xf800) == 0xa000)); case 0xb884: /* ThunderX3 */
return true;
default:
return false;
}
} }
static int pci_quirk_cavium_acs(struct pci_dev *dev, u16 acs_flags) static int pci_quirk_cavium_acs(struct pci_dev *dev, u16 acs_flags)