Commit c94df621 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/virtualization' 

- Add ACS quirk for more Zhaoxin Root Ports (LeoLiuoc)

* pci/virtualization:
  PCI: Add ACS quirk for more Zhaoxin Root Ports
parents d6f5bcc2 e367e3c7

drivers/pci/quirks.c

+6 −2
Original line number Diff line number Diff line
@@ -4716,10 +4716,14 @@ static int pci_quirk_zhaoxin_pcie_ports_acs(struct pci_dev *dev, u16 acs_flags) 
	     (pci_pcie_type(dev) != PCI_EXP_TYPE_DOWNSTREAM)))

		return -ENOTTY;



	/*

	 * Future Zhaoxin Root Ports and Switch Downstream Ports will

	 * implement ACS capability in accordance with the PCIe Spec.

	 */

	switch (dev->device) {

	case 0x0710 ... 0x071e:

	case 0x0721:

	case 0x0723 ... 0x0732:

	case 0x0723 ... 0x0752:

		return pci_acs_ctrl_enabled(acs_flags,

			PCI_ACS_SV | PCI_ACS_RR | PCI_ACS_CR | PCI_ACS_UF);

	}