PCI: create function symlinks in /sys/bus/pci/slots/N/

[safe/jmp/linux-2.6] / drivers / pci / pci-sysfs.c

diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index 0f6382f..941e939 100644 (file)
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -23,6 +23,7 @@
 #include <linux/mm.h>
 #include <linux/capability.h>
 #include <linux/pci-aspm.h>
+#include <linux/slab.h>
 #include "pci.h"
 
 static int sysfs_initialized;  /* = 0 */
@@ -74,7 +75,12 @@ static ssize_t local_cpus_show(struct device *dev,
        const struct cpumask *mask;
        int len;
 
+#ifdef CONFIG_NUMA
+       mask = (dev_to_node(dev) == -1) ? cpu_online_mask :
+                                         cpumask_of_node(dev_to_node(dev));
+#else
        mask = cpumask_of_pcibus(to_pci_dev(dev)->bus);
+#endif
        len = cpumask_scnprintf(buf, PAGE_SIZE-2, mask);
        buf[len++] = '\n';
        buf[len] = '\0';
@@ -88,7 +94,12 @@ static ssize_t local_cpulist_show(struct device *dev,
        const struct cpumask *mask;
        int len;
 
+#ifdef CONFIG_NUMA
+       mask = (dev_to_node(dev) == -1) ? cpu_online_mask :
+                                         cpumask_of_node(dev_to_node(dev));
+#else
        mask = cpumask_of_pcibus(to_pci_dev(dev)->bus);
+#endif
        len = cpulist_scnprintf(buf, PAGE_SIZE-2, mask);
        buf[len++] = '\n';
        buf[len] = '\0';
@@ -176,6 +187,21 @@ numa_node_show(struct device *dev, struct device_attribute *attr, char *buf)
 #endif
 
 static ssize_t
+dma_mask_bits_show(struct device *dev, struct device_attribute *attr, char *buf)
+{
+       struct pci_dev *pdev = to_pci_dev(dev);
+
+       return sprintf (buf, "%d\n", fls64(pdev->dma_mask));
+}
+
+static ssize_t
+consistent_dma_mask_bits_show(struct device *dev, struct device_attribute *attr,
+                                char *buf)
+{
+       return sprintf (buf, "%d\n", fls64(dev->coherent_dma_mask));
+}
+
+static ssize_t
 msi_bus_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
        struct pci_dev *pdev = to_pci_dev(dev);
@@ -306,6 +332,8 @@ struct device_attribute pci_dev_attrs[] = {
 #ifdef CONFIG_NUMA
        __ATTR_RO(numa_node),
 #endif
+       __ATTR_RO(dma_mask_bits),
+       __ATTR_RO(consistent_dma_mask_bits),
        __ATTR(enable, 0600, is_enabled_show, is_enabled_store),
        __ATTR(broken_parity_status,(S_IRUGO|S_IWUSR),
                broken_parity_status_show,broken_parity_status_store),
@@ -615,6 +643,7 @@ void pci_create_legacy_files(struct pci_bus *b)
        if (!b->legacy_io)
                goto kzalloc_err;
 
+       sysfs_bin_attr_init(b->legacy_io);
        b->legacy_io->attr.name = "legacy_io";
        b->legacy_io->size = 0xffff;
        b->legacy_io->attr.mode = S_IRUSR | S_IWUSR;
@@ -628,6 +657,7 @@ void pci_create_legacy_files(struct pci_bus *b)
 
        /* Allocated above after the legacy_io struct */
        b->legacy_mem = b->legacy_io + 1;
+       sysfs_bin_attr_init(b->legacy_mem);
        b->legacy_mem->attr.name = "legacy_mem";
        b->legacy_mem->size = 1024*1024;
        b->legacy_mem->attr.mode = S_IRUSR | S_IWUSR;
@@ -773,6 +803,7 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine)
        if (res_attr) {
                char *res_attr_name = (char *)(res_attr + 1);
 
+               sysfs_bin_attr_init(res_attr);
                if (write_combine) {
                        pdev->res_attr_wc[num] = res_attr;
                        sprintf(res_attr_name, "resource%d_wc", num);
@@ -945,6 +976,7 @@ static int pci_create_capabilities_sysfs(struct pci_dev *dev)
                if (!attr)
                        return -ENOMEM;
 
+               sysfs_bin_attr_init(attr);
                attr->size = dev->vpd->len;
                attr->attr.name = "vpd";
                attr->attr.mode = S_IRUSR | S_IWUSR;
@@ -979,6 +1011,39 @@ error:
        return retval;
 }
 
+static void pci_remove_slot_links(struct pci_dev *dev)
+{
+       char func[10];
+       struct pci_slot *slot;
+
+       sysfs_remove_link(&dev->dev.kobj, "slot");
+       list_for_each_entry(slot, &dev->bus->slots, list) {
+               if (slot->number != PCI_SLOT(dev->devfn))
+                       continue;
+               snprintf(func, 10, "function%d", PCI_FUNC(dev->devfn));
+               sysfs_remove_link(&slot->kobj, func);
+       }
+}
+
+static int pci_create_slot_links(struct pci_dev *dev)
+{
+       int result = 0;
+       char func[10];
+       struct pci_slot *slot;
+
+       list_for_each_entry(slot, &dev->bus->slots, list) {
+               if (slot->number != PCI_SLOT(dev->devfn))
+                       continue;
+               result = sysfs_create_link(&dev->dev.kobj, &slot->kobj, "slot");
+               if (result)
+                       goto out;
+               snprintf(func, 10, "function%d", PCI_FUNC(dev->devfn));
+               result = sysfs_create_link(&slot->kobj, &dev->dev.kobj, func);
+       }
+out:
+       return result;
+}
+
 int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev)
 {
        int retval;
@@ -1011,6 +1076,7 @@ int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev)
                        retval = -ENOMEM;
                        goto err_resource_files;
                }
+               sysfs_bin_attr_init(attr);
                attr->size = rom_size;
                attr->attr.name = "rom";
                attr->attr.mode = S_IRUSR;
@@ -1040,6 +1106,8 @@ int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev)
        if (retval)
                goto err_vga_file;
 
+       pci_create_slot_links(pdev);
+
        return 0;
 
 err_vga_file:
@@ -1089,6 +1157,8 @@ void pci_remove_sysfs_dev_files(struct pci_dev *pdev)
        if (!sysfs_initialized)
                return;
 
+       pci_remove_slot_links(pdev);
+
        pci_remove_capabilities_sysfs(pdev);
 
        if (pdev->cfg_size < PCI_CFG_SPACE_EXP_SIZE)