1 files changed, 161 insertions, 11 deletions

diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index f39378d9da15..5d883a152789 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -404,6 +404,106 @@ static ssize_t d3cold_allowed_show(struct device *dev,
 }
 #endif
 
+#ifdef CONFIG_PCI_IOV
+static ssize_t sriov_totalvfs_show(struct device *dev,
+                                   struct device_attribute *attr,
+                                   char *buf)
+{
+        struct pci_dev *pdev = to_pci_dev(dev);
+
+        return sprintf(buf, "%u\n", pci_sriov_get_totalvfs(pdev));
+}
+
+
+static ssize_t sriov_numvfs_show(struct device *dev,
+                                 struct device_attribute *attr,
+                                 char *buf)
+{
+        struct pci_dev *pdev = to_pci_dev(dev);
+
+        return sprintf(buf, "%u\n", pdev->sriov->num_VFs);
+}
+
+/*
+ * num_vfs > 0; number of vfs to enable
+ * num_vfs = 0; disable all vfs
+ *
+ * Note: SRIOV spec doesn't allow partial VF
+ *       disable, so its all or none.
+ */
+static ssize_t sriov_numvfs_store(struct device *dev,
+                                  struct device_attribute *attr,
+                                  const char *buf, size_t count)
+{
+        struct pci_dev *pdev = to_pci_dev(dev);
+        int num_vfs_enabled = 0;
+        int num_vfs;
+        int ret = 0;
+        u16 total;
+
+        if (kstrtoint(buf, 0, &num_vfs) < 0)
+                return -EINVAL;
+
+        /* 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;
+        }
+
+        /* if enabling vf's ... */
+        total = pci_sriov_get_totalvfs(pdev);
+        /* Requested VFs to enable < totalvfs and none enabled already */
+        if ((num_vfs > 0) && (num_vfs <= total)) {
+                if (pdev->sriov->num_VFs == 0) {
+                        num_vfs_enabled =
+                                pdev->driver->sriov_configure(pdev, num_vfs);
+                        if ((num_vfs_enabled >= 0) &&
+                            (num_vfs_enabled != num_vfs)) {
+                                dev_warn(&pdev->dev,
+                                         "Only %d VFs enabled\n",
+                                         num_vfs_enabled);
+                                return count;
+                        } else if (num_vfs_enabled < 0)
+                                /* error code from driver callback */
+                                return num_vfs_enabled;
+                } else if (num_vfs == pdev->sriov->num_VFs) {
+                        dev_warn(&pdev->dev,
+                                 "%d VFs already enabled; no enable action taken\n",
+                                 num_vfs);
+                        return count;
+                } else {
+                        dev_warn(&pdev->dev,
+                                 "%d VFs already enabled. Disable before enabling %d VFs\n",
+                                 pdev->sriov->num_VFs, num_vfs);
+                        return -EINVAL;
+                }
+        }
+
+        /* disable vfs */
+        if (num_vfs == 0) {
+                if (pdev->sriov->num_VFs != 0) {
+                        ret = pdev->driver->sriov_configure(pdev, 0);
+                        return ret ? ret : count;
+                } else {
+                        dev_warn(&pdev->dev,
+                                 "All VFs disabled; no disable action taken\n");
+                        return count;
+                }
+        }
+
+        dev_err(&pdev->dev,
+                "Invalid value for number of VFs to enable: %d\n", num_vfs);
+
+        return -EINVAL;
+}
+
+static struct device_attribute sriov_totalvfs_attr = __ATTR_RO(sriov_totalvfs);
+static struct device_attribute sriov_numvfs_attr =
+                __ATTR(sriov_numvfs, (S_IRUGO|S_IWUSR|S_IWGRP),
+                       sriov_numvfs_show, sriov_numvfs_store);
+#endif /* CONFIG_PCI_IOV */
+
 struct device_attribute pci_dev_attrs[] = {
         __ATTR_RO(resource),
         __ATTR_RO(vendor),
@@ -1269,29 +1369,20 @@ int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev)
                 pdev->rom_attr = attr;
         }
 
-        if ((pdev->class >> 8) == PCI_CLASS_DISPLAY_VGA) {
-                retval = device_create_file(&pdev->dev, &vga_attr);
-                if (retval)
-                        goto err_rom_file;
-        }
-
         /* add platform-specific attributes */
         retval = pcibios_add_platform_entries(pdev);
         if (retval)
-                goto err_vga_file;
+                goto err_rom_file;
 
         /* add sysfs entries for various capabilities */
         retval = pci_create_capabilities_sysfs(pdev);
         if (retval)
-                goto err_vga_file;
+                goto err_rom_file;
 
         pci_create_firmware_label_files(pdev);
 
         return 0;
 
-err_vga_file:
-        if ((pdev->class >> 8) == PCI_CLASS_DISPLAY_VGA)
-                device_remove_file(&pdev->dev, &vga_attr);
 err_rom_file:
         if (rom_size) {
                 sysfs_remove_bin_file(&pdev->dev.kobj, pdev->rom_attr);
@@ -1377,3 +1468,62 @@ static int __init pci_sysfs_init(void)
 }
 
 late_initcall(pci_sysfs_init);
+
+static struct attribute *pci_dev_dev_attrs[] = {
+        &vga_attr.attr,
+        NULL,
+};
+
+static umode_t pci_dev_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 (a == &vga_attr.attr)
+                if ((pdev->class >> 8) != PCI_CLASS_DISPLAY_VGA)
+                        return 0;
+
+        return a->mode;
+}
+
+#ifdef CONFIG_PCI_IOV
+static struct attribute *sriov_dev_attrs[] = {
+        &sriov_totalvfs_attr.attr,
+        &sriov_numvfs_attr.attr,
+        NULL,
+};
+
+static umode_t sriov_attrs_are_visible(struct kobject *kobj,
+                                         struct attribute *a, int n)
+{
+        struct device *dev = container_of(kobj, struct device, kobj);
+
+        if (!dev_is_pf(dev))
+                return 0;
+
+        return a->mode;
+}
+
+static struct attribute_group sriov_dev_attr_group = {
+        .attrs = sriov_dev_attrs,
+        .is_visible = sriov_attrs_are_visible,
+};
+#endif /* CONFIG_PCI_IOV */
+
+static struct attribute_group pci_dev_attr_group = {
+        .attrs = pci_dev_dev_attrs,
+        .is_visible = pci_dev_attrs_are_visible,
+};
+
+static const struct attribute_group *pci_dev_attr_groups[] = {
+        &pci_dev_attr_group,
+#ifdef CONFIG_PCI_IOV
+        &sriov_dev_attr_group,
+#endif
+        NULL,
+};
+
+struct device_type pci_dev_type = {
+        .groups = pci_dev_attr_groups,
+};