Merge branch 'pci/virtualization' (1ee57ad6) · Commits · 戴 / test

drivers/pci/quirks.c

+29 −0

Original line number	Diff line number	Diff line
		@@ -4465,6 +4465,29 @@ static int pci_quirk_xgene_acs(struct pci_dev *dev, u16 acs_flags)
		PCI_ACS_SV \| PCI_ACS_RR \| PCI_ACS_CR \| PCI_ACS_UF);
		}

		/*
		* Many Zhaoxin Root Ports and Switch Downstream Ports have no ACS capability.
		* But the implementation could block peer-to-peer transactions between them
		* and provide ACS-like functionality.
		*/
		static int pci_quirk_zhaoxin_pcie_ports_acs(struct pci_dev *dev, u16 acs_flags)
		{
		if (!pci_is_pcie(dev) \|\|
		((pci_pcie_type(dev) != PCI_EXP_TYPE_ROOT_PORT) &&
		(pci_pcie_type(dev) != PCI_EXP_TYPE_DOWNSTREAM)))
		return -ENOTTY;

		switch (dev->device) {
		case 0x0710 ... 0x071e:
		case 0x0721:
		case 0x0723 ... 0x0732:
		return pci_acs_ctrl_enabled(acs_flags,
		PCI_ACS_SV \| PCI_ACS_RR \| PCI_ACS_CR \| PCI_ACS_UF);
		}

		return false;
		}

		/*
		* Many Intel PCH Root Ports do provide ACS-like features to disable peer
		* transactions and validate bus numbers in requests, but do not provide an
		@@ -4767,6 +4790,12 @@ static const struct pci_dev_acs_enabled {
		{ PCI_VENDOR_ID_BROADCOM, 0xD714, pci_quirk_brcm_acs },
		/* Amazon Annapurna Labs */
		{ PCI_VENDOR_ID_AMAZON_ANNAPURNA_LABS, 0x0031, pci_quirk_al_acs },
		/* Zhaoxin multi-function devices */
		{ PCI_VENDOR_ID_ZHAOXIN, 0x3038, pci_quirk_mf_endpoint_acs },
		{ PCI_VENDOR_ID_ZHAOXIN, 0x3104, pci_quirk_mf_endpoint_acs },
		{ PCI_VENDOR_ID_ZHAOXIN, 0x9083, pci_quirk_mf_endpoint_acs },
		/* Zhaoxin Root/Downstream Ports */
		{ PCI_VENDOR_ID_ZHAOXIN, PCI_ANY_ID, pci_quirk_zhaoxin_pcie_ports_acs },
		{ 0 }
		};

+2 −0

Original line number	Diff line number	Diff line
		@@ -2583,6 +2583,8 @@

		#define PCI_VENDOR_ID_AMAZON 0x1d0f

		#define PCI_VENDOR_ID_ZHAOXIN 0x1d17

		#define PCI_VENDOR_ID_HYGON 0x1d94

		#define PCI_VENDOR_ID_HXT 0x1dbf