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

Merge branch 'pci/virtualization' into next 

* pci/virtualization:
  PCI: Disable VF decoding before pcibios_sriov_disable() updates resources
  PCI: Add ACS quirk for APM X-Gene devices
  PCI: Mark AMD Stoney GPU ATS as broken

Conflicts:
	drivers/pci/quirks.c
parents 27e87395 0fc690a7

drivers/pci/iov.c

+4 −3
Original line number Diff line number Diff line
@@ -331,7 +331,6 @@ static int sriov_enable(struct pci_dev *dev, int nr_virtfn) 
	while (i--)

		pci_iov_remove_virtfn(dev, i, 0);



	pcibios_sriov_disable(dev);

err_pcibios:

	iov->ctrl &= ~(PCI_SRIOV_CTRL_VFE | PCI_SRIOV_CTRL_MSE);

	pci_cfg_access_lock(dev);
@@ -339,6 +338,8 @@ static int sriov_enable(struct pci_dev *dev, int nr_virtfn) 
	ssleep(1);

	pci_cfg_access_unlock(dev);



	pcibios_sriov_disable(dev);



	if (iov->link != dev->devfn)

		sysfs_remove_link(&dev->dev.kobj, "dep_link");
@@ -357,14 +358,14 @@ static void sriov_disable(struct pci_dev *dev) 
	for (i = 0; i < iov->num_VFs; i++)

		pci_iov_remove_virtfn(dev, i, 0);



	pcibios_sriov_disable(dev);



	iov->ctrl &= ~(PCI_SRIOV_CTRL_VFE | PCI_SRIOV_CTRL_MSE);

	pci_cfg_access_lock(dev);

	pci_write_config_word(dev, iov->pos + PCI_SRIOV_CTRL, iov->ctrl);

	ssleep(1);

	pci_cfg_access_unlock(dev);



	pcibios_sriov_disable(dev);



	if (iov->link != dev->devfn)

		sysfs_remove_link(&dev->dev.kobj, "dep_link");

drivers/pci/quirks.c

+29 −0
Original line number Diff line number Diff line
@@ -4137,6 +4137,18 @@ static int pci_quirk_cavium_acs(struct pci_dev *dev, u16 acs_flags) 
	return acs_flags ? 0 : 1;

}



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

{

	/*

	 * X-Gene root matching this quirk do not allow peer-to-peer

	 * transactions with others, allowing masking out these bits as if they

	 * were unimplemented in the ACS capability.

	 */

	acs_flags &= ~(PCI_ACS_SV | PCI_ACS_RR | PCI_ACS_CR | PCI_ACS_UF);



	return acs_flags ? 0 : 1;

}



/*

 * 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
@@ -4385,6 +4397,8 @@ static const struct pci_dev_acs_enabled { 
	{ 0x10df, 0x720, pci_quirk_mf_endpoint_acs }, /* Emulex Skyhawk-R */

	/* Cavium ThunderX */

	{ PCI_VENDOR_ID_CAVIUM, PCI_ANY_ID, pci_quirk_cavium_acs },

	/* APM X-Gene */

	{ PCI_VENDOR_ID_AMCC, 0xE004, pci_quirk_xgene_acs },

	{ 0 }

};
@@ -4680,3 +4694,18 @@ static void quirk_no_ext_tags(struct pci_dev *pdev) 
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, 0x0140, quirk_no_ext_tags);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, 0x0142, quirk_no_ext_tags);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, 0x0144, quirk_no_ext_tags);



#ifdef CONFIG_PCI_ATS

/*

 * Some devices have a broken ATS implementation causing IOMMU stalls.

 * Don't use ATS for those devices.

 */

static void quirk_no_ats(struct pci_dev *pdev)

{

	dev_info(&pdev->dev, "disabling ATS (broken on this device)\n");

	pdev->ats_cap = 0;

}



/* AMD Stoney platform GPU */

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x98e4, quirk_no_ats);

#endif /* CONFIG_PCI_ATS */