Commit 8b9c1562 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/virtualization' into next 

* pci/virtualization:
  PCI: Lock each enable/disable num_vfs operation in sysfs
  PCI: Add ACS quirk for Intel Union Point
parents 0dc49eb2 5b0948df

drivers/pci/iov.c

+0 −7
Original line number Diff line number Diff line
@@ -124,7 +124,6 @@ int pci_iov_add_virtfn(struct pci_dev *dev, int id, int reset) 
	struct pci_sriov *iov = dev->sriov;

	struct pci_bus *bus;



	mutex_lock(&iov->dev->sriov->lock);

	bus = virtfn_add_bus(dev->bus, pci_iov_virtfn_bus(dev, id));

	if (!bus)

		goto failed;
@@ -162,7 +161,6 @@ int pci_iov_add_virtfn(struct pci_dev *dev, int id, int reset) 
		__pci_reset_function(virtfn);



	pci_device_add(virtfn, virtfn->bus);

	mutex_unlock(&iov->dev->sriov->lock);



	pci_bus_add_device(virtfn);

	sprintf(buf, "virtfn%u", id);
@@ -181,12 +179,10 @@ int pci_iov_add_virtfn(struct pci_dev *dev, int id, int reset) 
	sysfs_remove_link(&dev->dev.kobj, buf);

failed1:

	pci_dev_put(dev);

	mutex_lock(&iov->dev->sriov->lock);

	pci_stop_and_remove_bus_device(virtfn);

failed0:

	virtfn_remove_bus(dev->bus, bus);

failed:

	mutex_unlock(&iov->dev->sriov->lock);



	return rc;

}
@@ -195,7 +191,6 @@ void pci_iov_remove_virtfn(struct pci_dev *dev, int id, int reset) 
{

	char buf[VIRTFN_ID_LEN];

	struct pci_dev *virtfn;

	struct pci_sriov *iov = dev->sriov;



	virtfn = pci_get_domain_bus_and_slot(pci_domain_nr(dev->bus),

					     pci_iov_virtfn_bus(dev, id),
@@ -218,10 +213,8 @@ void pci_iov_remove_virtfn(struct pci_dev *dev, int id, int reset) 
	if (virtfn->dev.kobj.sd)

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



	mutex_lock(&iov->dev->sriov->lock);

	pci_stop_and_remove_bus_device(virtfn);

	virtfn_remove_bus(dev->bus, virtfn->bus);

	mutex_unlock(&iov->dev->sriov->lock);



	/* balance pci_get_domain_bus_and_slot() */

	pci_dev_put(virtfn);

drivers/pci/pci-sysfs.c

+16 −7
Original line number Diff line number Diff line
@@ -472,6 +472,7 @@ static ssize_t sriov_numvfs_store(struct device *dev, 
				  const char *buf, size_t count)

{

	struct pci_dev *pdev = to_pci_dev(dev);

	struct pci_sriov *iov = pdev->sriov;

	int ret;

	u16 num_vfs;
@@ -482,38 +483,46 @@ static ssize_t sriov_numvfs_store(struct device *dev, 
	if (num_vfs > pci_sriov_get_totalvfs(pdev))

		return -ERANGE;



	mutex_lock(&iov->dev->sriov->lock);



	if (num_vfs == pdev->sriov->num_VFs)

		return count;		/* no change */

		goto exit;



	/* is PF driver loaded w/callback */

	if (!pdev->driver || !pdev->driver->sriov_configure) {

		dev_info(&pdev->dev, "Driver doesn't support SRIOV configuration via sysfs\n");

		return -ENOSYS;

		ret = -ENOENT;

		goto exit;

	}



	if (num_vfs == 0) {

		/* disable VFs */

		ret = pdev->driver->sriov_configure(pdev, 0);

		if (ret < 0)

			return ret;

		return count;

		goto exit;

	}



	/* enable VFs */

	if (pdev->sriov->num_VFs) {

		dev_warn(&pdev->dev, "%d VFs already enabled. Disable before enabling %d VFs\n",

			 pdev->sriov->num_VFs, num_vfs);

		return -EBUSY;

		ret = -EBUSY;

		goto exit;

	}



	ret = pdev->driver->sriov_configure(pdev, num_vfs);

	if (ret < 0)

		return ret;

		goto exit;



	if (ret != num_vfs)

		dev_warn(&pdev->dev, "%d VFs requested; only %d enabled\n",

			 num_vfs, ret);



exit:

	mutex_unlock(&iov->dev->sriov->lock);



	if (ret < 0)

		return ret;



	return count;

}

drivers/pci/pci.h

+1 −1
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ struct pci_sriov { 
	u16 driver_max_VFs;	/* max num VFs driver supports */

	struct pci_dev *dev;	/* lowest numbered PF */

	struct pci_dev *self;	/* this PF */

	struct mutex lock;	/* lock for VF bus */

	struct mutex lock;	/* lock for setting sriov_numvfs in sysfs */

	resource_size_t barsz[PCI_SRIOV_NUM_BARS];	/* VF BAR size */

};

drivers/pci/quirks.c

+24 −4
Original line number Diff line number Diff line
@@ -4150,15 +4150,35 @@ static int pci_quirk_intel_pch_acs(struct pci_dev *dev, u16 acs_flags) 
 *

 * N.B. This doesn't fix what lspci shows.

 *

 * The 100 series chipset specification update includes this as errata #23[3].

 *

 * The 200 series chipset (Union Point) has the same bug according to the

 * specification update (Intel 200 Series Chipset Family Platform Controller

 * Hub, Specification Update, January 2017, Revision 001, Document# 335194-001,

 * Errata 22)[4].  Per the datasheet[5], root port PCI Device IDs for this

 * chipset include:

 *

 * 0xa290-0xa29f PCI Express Root port #{0-16}

 * 0xa2e7-0xa2ee PCI Express Root port #{17-24}

 *

 * [1] http://www.intel.com/content/www/us/en/chipsets/100-series-chipset-datasheet-vol-2.html

 * [2] http://www.intel.com/content/www/us/en/chipsets/100-series-chipset-datasheet-vol-1.html

 * [3] http://www.intel.com/content/www/us/en/chipsets/100-series-chipset-spec-update.html

 * [4] http://www.intel.com/content/www/us/en/chipsets/200-series-chipset-pch-spec-update.html

 * [5] http://www.intel.com/content/www/us/en/chipsets/200-series-chipset-pch-datasheet-vol-1.html

 */

static bool pci_quirk_intel_spt_pch_acs_match(struct pci_dev *dev)

{

	return pci_is_pcie(dev) &&

		pci_pcie_type(dev) == PCI_EXP_TYPE_ROOT_PORT &&

		((dev->device & ~0xf) == 0xa110 ||

		 (dev->device >= 0xa167 && dev->device <= 0xa16a));

	if (!pci_is_pcie(dev) || pci_pcie_type(dev) != PCI_EXP_TYPE_ROOT_PORT)

		return false;



	switch (dev->device) {

	case 0xa110 ... 0xa11f: case 0xa167 ... 0xa16a: /* Sunrise Point */

	case 0xa290 ... 0xa29f: case 0xa2e7 ... 0xa2ee: /* Union Point */

		return true;

	}



	return false;

}



#define INTEL_SPT_ACS_CTRL (PCI_ACS_CAP + 4)