r8169: Fix receive buffer length when MTU is between 1515 and 1536
[safe/jmp/linux-2.6] / drivers / pci / bus.c
index 529d9d7..cef28a7 100644 (file)
@@ -41,9 +41,14 @@ pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res,
                void *alignf_data)
 {
        int i, ret = -ENOMEM;
+       resource_size_t max = -1;
 
        type_mask |= IORESOURCE_IO | IORESOURCE_MEM;
 
+       /* don't allocate too high if the pref mem doesn't support 64bit*/
+       if (!(res->flags & IORESOURCE_MEM_64))
+               max = PCIBIOS_MAX_MEM_32;
+
        for (i = 0; i < PCI_BUS_NUM_RESOURCES; i++) {
                struct resource *r = bus->resource[i];
                if (!r)
@@ -62,7 +67,7 @@ pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res,
                /* Ok, try it out.. */
                ret = allocate_resource(r, res, size,
                                        r->start ? : min,
-                                       -1, align,
+                                       max, align,
                                        alignf, alignf_data);
                if (ret == 0)
                        break;
@@ -71,7 +76,7 @@ pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res,
 }
 
 /**
- * add a single device
+ * pci_bus_add_device - add a single device
  * @dev: device to add
  *
  * This adds a single pci device to the global
@@ -91,6 +96,37 @@ int pci_bus_add_device(struct pci_dev *dev)
 }
 
 /**
+ * pci_bus_add_child - add a child bus
+ * @bus: bus to add
+ *
+ * This adds sysfs entries for a single bus
+ */
+int pci_bus_add_child(struct pci_bus *bus)
+{
+       int retval;
+
+       if (bus->bridge)
+               bus->dev.parent = bus->bridge;
+
+       retval = device_register(&bus->dev);
+       if (retval)
+               return retval;
+
+       bus->is_added = 1;
+
+       retval = device_create_file(&bus->dev, &dev_attr_cpuaffinity);
+       if (retval)
+               return retval;
+
+       retval = device_create_file(&bus->dev, &dev_attr_cpulistaffinity);
+
+       /* Create legacy_io and legacy_mem files for this bus */
+       pci_create_legacy_files(bus);
+
+       return retval;
+}
+
+/**
  * pci_bus_add_devices - insert newly discovered PCI devices
  * @bus: bus to check for new devices
  *
@@ -102,10 +138,10 @@ int pci_bus_add_device(struct pci_dev *dev)
  *
  * Call hotplug for each new devices.
  */
-void pci_bus_add_devices(struct pci_bus *bus)
+void pci_bus_add_devices(const struct pci_bus *bus)
 {
        struct pci_dev *dev;
-       struct pci_bus *child_bus;
+       struct pci_bus *child;
        int retval;
 
        list_for_each_entry(dev, &bus->devices, bus_list) {
@@ -120,38 +156,29 @@ void pci_bus_add_devices(struct pci_bus *bus)
        list_for_each_entry(dev, &bus->devices, bus_list) {
                BUG_ON(!dev->is_added);
 
+               child = dev->subordinate;
                /*
                 * If there is an unattached subordinate bus, attach
                 * it and then scan for unattached PCI devices.
                 */
-               if (dev->subordinate) {
-                      if (list_empty(&dev->subordinate->node)) {
-                              down_write(&pci_bus_sem);
-                              list_add_tail(&dev->subordinate->node,
-                                              &dev->bus->children);
-                              up_write(&pci_bus_sem);
-                       }
-                       pci_bus_add_devices(dev->subordinate);
-
-                       /* register the bus with sysfs as the parent is now
-                        * properly registered. */
-                       child_bus = dev->subordinate;
-                       if (child_bus->is_added)
-                               continue;
-                       child_bus->dev.parent = child_bus->bridge;
-                       retval = device_register(&child_bus->dev);
-                       if (retval)
-                               dev_err(&dev->dev, "Error registering pci_bus,"
-                                       " continuing...\n");
-                       else {
-                               child_bus->is_added = 1;
-                               retval = device_create_file(&child_bus->dev,
-                                                       &dev_attr_cpuaffinity);
-                       }
-                       if (retval)
-                               dev_err(&dev->dev, "Error creating cpuaffinity"
-                                       " file, continuing...\n");
+               if (!child)
+                       continue;
+               if (list_empty(&child->node)) {
+                       down_write(&pci_bus_sem);
+                       list_add_tail(&child->node, &dev->bus->children);
+                       up_write(&pci_bus_sem);
                }
+               pci_bus_add_devices(child);
+
+               /*
+                * register the bus with sysfs as the parent is now
+                * properly registered.
+                */
+               if (child->is_added)
+                       continue;
+               retval = pci_bus_add_child(child);
+               if (retval)
+                       dev_err(&dev->dev, "Error adding bus, continuing\n");
        }
 }
 
@@ -162,8 +189,10 @@ void pci_enable_bridges(struct pci_bus *bus)
 
        list_for_each_entry(dev, &bus->devices, bus_list) {
                if (dev->subordinate) {
-                       retval = pci_enable_device(dev);
-                       pci_set_master(dev);
+                       if (!pci_is_enabled(dev)) {
+                               retval = pci_enable_device(dev);
+                               pci_set_master(dev);
+                       }
                        pci_enable_bridges(dev->subordinate);
                }
        }
@@ -177,13 +206,18 @@ void pci_enable_bridges(struct pci_bus *bus)
  *  Walk the given bus, including any bridged devices
  *  on buses under this bus.  Call the provided callback
  *  on each device found.
+ *
+ *  We check the return of @cb each time. If it returns anything
+ *  other than 0, we break out.
+ *
  */
-void pci_walk_bus(struct pci_bus *top, void (*cb)(struct pci_dev *, void *),
+void pci_walk_bus(struct pci_bus *top, int (*cb)(struct pci_dev *, void *),
                  void *userdata)
 {
        struct pci_dev *dev;
        struct pci_bus *bus;
        struct list_head *next;
+       int retval;
 
        bus = top;
        down_read(&pci_bus_sem);
@@ -207,8 +241,10 @@ void pci_walk_bus(struct pci_bus *top, void (*cb)(struct pci_dev *, void *),
 
                /* Run device routines with the device locked */
                down(&dev->dev.sem);
-               cb(dev, userdata);
+               retval = cb(dev, userdata);
                up(&dev->dev.sem);
+               if (retval)
+                       break;
        }
        up_read(&pci_bus_sem);
 }