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

Merge branch 'pci/jiang-iov-fixes' into next 

* pci/jiang-iov-fixes:
  PCI: Hide remove and rescan sysfs interfaces for SR-IOV virtual functions
  PCI: Finish SR-IOV VF setup before adding the device
parents 06886e80 dfab88be

drivers/pci/iov.c

+2 −3
Original line number Diff line number Diff line
@@ -92,6 +92,8 @@ static int virtfn_add(struct pci_dev *dev, int id, int reset) 
	pci_read_config_word(dev, iov->pos + PCI_SRIOV_VF_DID, &virtfn->device);

	pci_setup_device(virtfn);

	virtfn->dev.parent = dev->dev.parent;

	virtfn->physfn = pci_dev_get(dev);

	virtfn->is_virtfn = 1;



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

		res = dev->resource + PCI_IOV_RESOURCES + i;
@@ -113,9 +115,6 @@ static int virtfn_add(struct pci_dev *dev, int id, int reset) 
	pci_device_add(virtfn, virtfn->bus);

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



	virtfn->physfn = pci_dev_get(dev);

	virtfn->is_virtfn = 1;



	rc = pci_bus_add_device(virtfn);

	sprintf(buf, "virtfn%u", id);

	rc = sysfs_create_link(&dev->dev.kobj, &virtfn->dev.kobj, buf);

drivers/pci/pci-sysfs.c

+28 −2
Original line number Diff line number Diff line
@@ -325,6 +325,8 @@ dev_rescan_store(struct device *dev, struct device_attribute *attr, 
	}

	return count;

}

struct device_attribute dev_rescan_attr = __ATTR(rescan, (S_IWUSR|S_IWGRP),

						 NULL, dev_rescan_store);



static void remove_callback(struct device *dev)

{
@@ -354,6 +356,8 @@ remove_store(struct device *dev, struct device_attribute *dummy, 
		count = ret;

	return count;

}

struct device_attribute dev_remove_attr = __ATTR(remove, (S_IWUSR|S_IWGRP),

						 NULL, remove_store);



static ssize_t

dev_bus_rescan_store(struct device *dev, struct device_attribute *attr,
@@ -504,8 +508,6 @@ struct device_attribute pci_dev_attrs[] = { 
	__ATTR(broken_parity_status,(S_IRUGO|S_IWUSR),

		broken_parity_status_show,broken_parity_status_store),

	__ATTR(msi_bus, 0644, msi_bus_show, msi_bus_store),

	__ATTR(remove, (S_IWUSR|S_IWGRP), NULL, remove_store),

	__ATTR(rescan, (S_IWUSR|S_IWGRP), NULL, dev_rescan_store),

#if defined(CONFIG_PM_RUNTIME) && defined(CONFIG_ACPI)

	__ATTR(d3cold_allowed, 0644, d3cold_allowed_show, d3cold_allowed_store),

#endif
@@ -1463,6 +1465,29 @@ static umode_t pci_dev_attrs_are_visible(struct kobject *kobj, 
	return a->mode;

}



static struct attribute *pci_dev_hp_attrs[] = {

	&dev_remove_attr.attr,

	&dev_rescan_attr.attr,

	NULL,

};



static umode_t pci_dev_hp_attrs_are_visible(struct kobject *kobj,

						struct attribute *a, int n)

{

	struct device *dev = container_of(kobj, struct device, kobj);

	struct pci_dev *pdev = to_pci_dev(dev);



	if (pdev->is_virtfn)

		return 0;



	return a->mode;

}



static struct attribute_group pci_dev_hp_attr_group = {

	.attrs = pci_dev_hp_attrs,

	.is_visible = pci_dev_hp_attrs_are_visible,

};



#ifdef CONFIG_PCI_IOV

static struct attribute *sriov_dev_attrs[] = {

	&sriov_totalvfs_attr.attr,
@@ -1494,6 +1519,7 @@ static struct attribute_group pci_dev_attr_group = { 


static const struct attribute_group *pci_dev_attr_groups[] = {

	&pci_dev_attr_group,

	&pci_dev_hp_attr_group,

#ifdef CONFIG_PCI_IOV

	&sriov_dev_attr_group,

#endif