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

Merge branch 'pci/virtualization' 

  - add generic enable function for simple SR-IOV hardware (Alexander
    Duyck)

  - use generic SR-IOV enable for ena, nvme (Alexander Duyck)

  - add ACS quirk for Intel 7th & 8th Gen mobile (Alex Williamson)

  - add ACS quirk for Intel 300 series (Mika Westerberg)

* pci/virtualization:
  PCI/IOV: Allow PF drivers to limit total_VFs to 0
  PCI: Add "pci=noats" boot parameter
  PCI: Add ACS quirk for Intel 300 series
  PCI: Add ACS quirk for Intel 7th & 8th Gen mobile
  nvme-pci: Use pci_sriov_configure_simple() to enable VFs
  net: ena: Use pci_sriov_configure_simple() to enable VFs
  PCI/IOV: Add pci-pf-stub driver for PFs that only enable VFs
  PCI/IOV: Add pci_sriov_configure_simple()
parents 13fbadcd 8d85a7a4

Documentation/admin-guide/kernel-parameters.txt

+2 −0
Original line number Diff line number Diff line
@@ -3147,6 +3147,8 @@ 
				on: Turn realloc on

		realloc		same as realloc=on

		noari		do not use PCIe ARI.

		noats		[PCIE, Intel-IOMMU, AMD-IOMMU]

				do not use PCIe ATS (and IOMMU device IOTLB).

		pcie_scan_all	Scan all possible PCIe devices.  Otherwise we

				only look for one device below a PCIe downstream

				port.

drivers/iommu/amd_iommu.c

+8 −3
Original line number Diff line number Diff line
@@ -355,6 +355,9 @@ static bool pci_iommuv2_capable(struct pci_dev *pdev) 
	};

	int i, pos;



	if (pci_ats_disabled())

		return false;



	for (i = 0; i < 3; ++i) {

		pos = pci_find_ext_capability(pdev, caps[i]);

		if (pos == 0)
@@ -3524,9 +3527,11 @@ int amd_iommu_device_info(struct pci_dev *pdev, 


	memset(info, 0, sizeof(*info));



	if (!pci_ats_disabled()) {

		pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_ATS);

		if (pos)

			info->flags |= AMD_IOMMU_DEVICE_FLAG_ATS_SUP;

	}



	pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_PRI);

	if (pos)

drivers/iommu/intel-iommu.c

+2 −1
Original line number Diff line number Diff line
@@ -2459,7 +2459,8 @@ static struct dmar_domain *dmar_insert_one_dev_info(struct intel_iommu *iommu, 
	if (dev && dev_is_pci(dev)) {

		struct pci_dev *pdev = to_pci_dev(info->dev);



		if (ecap_dev_iotlb_support(iommu->ecap) &&

		if (!pci_ats_disabled() &&

		    ecap_dev_iotlb_support(iommu->ecap) &&

		    pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_ATS) &&

		    dmar_find_matched_atsr_unit(pdev))

			info->ats_supported = 1;

drivers/net/ethernet/amazon/ena/ena_netdev.c

+1 −27
Original line number Diff line number Diff line
@@ -3385,32 +3385,6 @@ err_disable_device: 
	return rc;

}



/*****************************************************************************/

static int ena_sriov_configure(struct pci_dev *dev, int numvfs)

{

	int rc;



	if (numvfs > 0) {

		rc = pci_enable_sriov(dev, numvfs);

		if (rc != 0) {

			dev_err(&dev->dev,

				"pci_enable_sriov failed to enable: %d vfs with the error: %d\n",

				numvfs, rc);

			return rc;

		}



		return numvfs;

	}



	if (numvfs == 0) {

		pci_disable_sriov(dev);

		return 0;

	}



	return -EINVAL;

}



/*****************************************************************************/

/*****************************************************************************/



/* ena_remove - Device Removal Routine
@@ -3526,7 +3500,7 @@ static struct pci_driver ena_pci_driver = { 
	.suspend    = ena_suspend,

	.resume     = ena_resume,

#endif

	.sriov_configure = ena_sriov_configure,

	.sriov_configure = pci_sriov_configure_simple,

};



static int __init ena_init(void)

drivers/nvme/host/pci.c

+1 −19
Original line number Diff line number Diff line
@@ -2598,24 +2598,6 @@ static void nvme_remove(struct pci_dev *pdev) 
	nvme_put_ctrl(&dev->ctrl);

}



static int nvme_pci_sriov_configure(struct pci_dev *pdev, int numvfs)

{

	int ret = 0;



	if (numvfs == 0) {

		if (pci_vfs_assigned(pdev)) {

			dev_warn(&pdev->dev,

				"Cannot disable SR-IOV VFs while assigned\n");

			return -EPERM;

		}

		pci_disable_sriov(pdev);

		return 0;

	}



	ret = pci_enable_sriov(pdev, numvfs);

	return ret ? ret : numvfs;

}



#ifdef CONFIG_PM_SLEEP

static int nvme_suspend(struct device *dev)

{
@@ -2734,7 +2716,7 @@ static struct pci_driver nvme_driver = { 
	.driver		= {

		.pm	= &nvme_dev_pm_ops,

	},

	.sriov_configure = nvme_pci_sriov_configure,

	.sriov_configure = pci_sriov_configure_simple,

	.err_handler	= &nvme_err_handler,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE