diff options
| author | Vadim Lomovtsev <Vadim.Lomovtsev@cavium.com> | 2017-10-17 05:47:39 -0700 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-10-19 13:28:16 -0500 |
| commit | f2ddaf8dfd4a5071ad09074d2f95ab85d35c8a1e (patch) | |
| tree | 286ada132179753cffa2d52bc145d6108818447a /drivers/pci | |
| parent | 7f342678634f16795892677204366e835e450dda (diff) | |
| download | linux-stable-f2ddaf8dfd4a5071ad09074d2f95ab85d35c8a1e.tar.gz linux-stable-f2ddaf8dfd4a5071ad09074d2f95ab85d35c8a1e.tar.bz2 linux-stable-f2ddaf8dfd4a5071ad09074d2f95ab85d35c8a1e.zip | |
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: Vadim Lomovtsev <Vadim.Lomovtsev@cavium.com>
[bhelgaas: changelog, stable tag]
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: stable@vger.kernel.org # v4.12+
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/quirks.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index c23650cfd5a1..0e22cce05742 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -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; |