Commit 014dbfe0 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/virtualization' 

- Add an ACS quirk for Loongson Root Ports that don't advertise ACS but
  don't allow peer-to-peer transactions between Root Ports; the quirk
  allows each Root Port to be in a separate IOMMU group (Huacai Chen)

* pci/virtualization:
  PCI: Add ACS quirk for Loongson PCIe
parents df115861 1f3303aa

drivers/pci/quirks.c

+23 −0
Original line number Diff line number Diff line
@@ -4991,6 +4991,18 @@ static int pci_quirk_brcm_acs(struct pci_dev *dev, u16 acs_flags) 
		PCI_ACS_SV | PCI_ACS_RR | PCI_ACS_CR | PCI_ACS_UF);

}



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

{

	/*

	 * Loongson PCIe Root Ports don't advertise an ACS capability, but

	 * they do not allow peer-to-peer transactions between Root Ports.

	 * Allow each Root Port to be in a separate IOMMU group by masking

	 * SV/RR/CR/UF bits.

	 */

	return pci_acs_ctrl_enabled(acs_flags,

		PCI_ACS_SV | PCI_ACS_RR | PCI_ACS_CR | PCI_ACS_UF);

}



/*

 * Wangxun 40G/25G/10G/1G NICs have no ACS capability, but on

 * multi-function devices, the hardware isolates the functions by
@@ -5124,6 +5136,17 @@ static const struct pci_dev_acs_enabled { 
	{ PCI_VENDOR_ID_BROADCOM, 0x1762, pci_quirk_mf_endpoint_acs },

	{ PCI_VENDOR_ID_BROADCOM, 0x1763, pci_quirk_mf_endpoint_acs },

	{ PCI_VENDOR_ID_BROADCOM, 0xD714, pci_quirk_brcm_acs },

	/* Loongson PCIe Root Ports */

	{ PCI_VENDOR_ID_LOONGSON, 0x3C09, pci_quirk_loongson_acs },

	{ PCI_VENDOR_ID_LOONGSON, 0x3C19, pci_quirk_loongson_acs },

	{ PCI_VENDOR_ID_LOONGSON, 0x3C29, pci_quirk_loongson_acs },

	{ PCI_VENDOR_ID_LOONGSON, 0x7A09, pci_quirk_loongson_acs },

	{ PCI_VENDOR_ID_LOONGSON, 0x7A19, pci_quirk_loongson_acs },

	{ PCI_VENDOR_ID_LOONGSON, 0x7A29, pci_quirk_loongson_acs },

	{ PCI_VENDOR_ID_LOONGSON, 0x7A39, pci_quirk_loongson_acs },

	{ PCI_VENDOR_ID_LOONGSON, 0x7A49, pci_quirk_loongson_acs },

	{ PCI_VENDOR_ID_LOONGSON, 0x7A59, pci_quirk_loongson_acs },

	{ PCI_VENDOR_ID_LOONGSON, 0x7A69, pci_quirk_loongson_acs },

	/* Amazon Annapurna Labs */

	{ PCI_VENDOR_ID_AMAZON_ANNAPURNA_LABS, 0x0031, pci_quirk_al_acs },

	/* Zhaoxin multi-function devices */