Commit 6585a1a1 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/virtualization' 

- Remove redundant variable init in xen (Colin Ian King)

- Add pci_pri_supported() to check device or associated PF for PRI support
  (Ashok Raj)

- Mark AMD Navi10 GPU rev 0x00 ATS as broken (Kai-Heng Feng)

- Release IVRS table in AMD ACS quirk (Hanjun Guo)

* pci/virtualization:
  PCI: Release IVRS table in AMD ACS quirk
  PCI: Mark AMD Navi10 GPU rev 0x00 ATS as broken
  PCI/ATS: Add pci_pri_supported() to check device or associated PF
  xen: Remove redundant initialization of irq
parents 4f7adb6e 090688fa

arch/x86/pci/xen.c

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ static int xen_pcifront_enable_irq(struct pci_dev *dev) 
#ifdef CONFIG_ACPI

static int xen_register_pirq(u32 gsi, int triggering, bool set_pirq)

{

	int rc, pirq = -1, irq = -1;

	int rc, pirq = -1, irq;

	struct physdev_map_pirq map_irq;

	int shareable = 0;

	char *name;

drivers/iommu/intel/iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -2554,7 +2554,7 @@ static struct dmar_domain *dmar_insert_one_dev_info(struct intel_iommu *iommu, 
			}



			if (info->ats_supported && ecap_prs(iommu->ecap) &&

			    pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_PRI))

			    pci_pri_supported(pdev))

				info->pri_supported = 1;

		}

	}

drivers/pci/ats.c

+15 −0
Original line number Diff line number Diff line
@@ -325,6 +325,21 @@ int pci_prg_resp_pasid_required(struct pci_dev *pdev) 


	return pdev->pasid_required;

}



/**

 * pci_pri_supported - Check if PRI is supported.

 * @pdev: PCI device structure

 *

 * Returns true if PRI capability is present, false otherwise.

 */

bool pci_pri_supported(struct pci_dev *pdev)

{

	/* VFs share the PF PRI */

	if (pci_physfn(pdev)->pri_cap)

		return true;

	return false;

}

EXPORT_SYMBOL_GPL(pci_pri_supported);

#endif /* CONFIG_PCI_PRI */



#ifdef CONFIG_PCI_PASID

drivers/pci/quirks.c

+6 −1
Original line number Diff line number Diff line
@@ -4409,6 +4409,8 @@ static int pci_quirk_amd_sb_acs(struct pci_dev *dev, u16 acs_flags) 
	if (ACPI_FAILURE(status))

		return -ENODEV;



	acpi_put_table(header);



	/* Filter out flags not applicable to multifunction */

	acs_flags &= (PCI_ACS_RR | PCI_ACS_CR | PCI_ACS_EC | PCI_ACS_DT);
@@ -5192,7 +5194,8 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, 0x0422, quirk_no_ext_tags); 
 */

static void quirk_amd_harvest_no_ats(struct pci_dev *pdev)

{

	if (pdev->device == 0x7340 && pdev->revision != 0xc5)

	if ((pdev->device == 0x7312 && pdev->revision != 0x00) ||

	    (pdev->device == 0x7340 && pdev->revision != 0xc5))

		return;



	pci_info(pdev, "disabling ATS\n");
@@ -5203,6 +5206,8 @@ static void quirk_amd_harvest_no_ats(struct pci_dev *pdev) 
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x98e4, quirk_amd_harvest_no_ats);

/* AMD Iceland dGPU */

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x6900, quirk_amd_harvest_no_ats);

/* AMD Navi10 dGPU */

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x7312, quirk_amd_harvest_no_ats);

/* AMD Navi14 dGPU */

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x7340, quirk_amd_harvest_no_ats);

#endif /* CONFIG_PCI_ATS */

include/linux/pci-ats.h

+4 −0
Original line number Diff line number Diff line
@@ -28,6 +28,10 @@ int pci_enable_pri(struct pci_dev *pdev, u32 reqs); 
void pci_disable_pri(struct pci_dev *pdev);

int pci_reset_pri(struct pci_dev *pdev);

int pci_prg_resp_pasid_required(struct pci_dev *pdev);

bool pci_pri_supported(struct pci_dev *pdev);

#else

static inline bool pci_pri_supported(struct pci_dev *pdev)

{ return false; }

#endif /* CONFIG_PCI_PRI */



#ifdef CONFIG_PCI_PASID