Merge git://git.infradead.org/~dedekind/ubi-2.6

[linux-2.6-omap-h63xx.git] / drivers / pci / hotplug / shpchp_pci.c

diff --git a/drivers/pci/hotplug/shpchp_pci.c b/drivers/pci/hotplug/shpchp_pci.c
index 38009bc0fd5de7e21668763a958e7554347ac1f8..0a6b25ef194c2991e36d3be4e2bb605b61a4bed4 100644 (file)
--- a/drivers/pci/hotplug/shpchp_pci.c
+++ b/drivers/pci/hotplug/shpchp_pci.c
@@ -38,7 +38,7 @@ static void program_fw_provided_values(struct pci_dev *dev)
 {
        u16 pci_cmd, pci_bctl;
        struct pci_dev *cdev;
-       struct hotplug_params hpp = {0x8, 0x40, 0, 0}; /* defaults */
+       struct hotplug_params hpp;
 
        /* Program hpp values for this device */
        if (!(dev->hdr_type == PCI_HEADER_TYPE_NORMAL ||
@@ -46,16 +46,29 @@ static void program_fw_provided_values(struct pci_dev *dev)
                        (dev->class >> 8) == PCI_CLASS_BRIDGE_PCI)))
                return;
 
-       get_hp_params_from_firmware(dev, &hpp);
+       /* use default values if we can't get them from firmware */
+       if (get_hp_params_from_firmware(dev, &hpp) ||
+           !hpp.t0 || (hpp.t0->revision > 1)) {
+               printk(KERN_WARNING
+                      "%s: Could not get hotplug parameters. Use defaults\n",
+                      __FUNCTION__);
+               hpp.t0 = &hpp.type0_data;
+               hpp.t0->revision = 0;
+               hpp.t0->cache_line_size = 8;
+               hpp.t0->latency_timer = 0x40;
+               hpp.t0->enable_serr = 0;
+               hpp.t0->enable_perr = 0;
+       }
 
-       pci_write_config_byte(dev, PCI_CACHE_LINE_SIZE, hpp.cache_line_size);
-       pci_write_config_byte(dev, PCI_LATENCY_TIMER, hpp.latency_timer);
+       pci_write_config_byte(dev,
+                             PCI_CACHE_LINE_SIZE, hpp.t0->cache_line_size);
+       pci_write_config_byte(dev, PCI_LATENCY_TIMER, hpp.t0->latency_timer);
        pci_read_config_word(dev, PCI_COMMAND, &pci_cmd);
-       if (hpp.enable_serr)
+       if (hpp.t0->enable_serr)
                pci_cmd |= PCI_COMMAND_SERR;
        else
                pci_cmd &= ~PCI_COMMAND_SERR;
-       if (hpp.enable_perr)
+       if (hpp.t0->enable_perr)
                pci_cmd |= PCI_COMMAND_PARITY;
        else
                pci_cmd &= ~PCI_COMMAND_PARITY;
@@ -64,13 +77,13 @@ static void program_fw_provided_values(struct pci_dev *dev)
        /* Program bridge control value and child devices */
        if ((dev->class >> 8) == PCI_CLASS_BRIDGE_PCI) {
                pci_write_config_byte(dev, PCI_SEC_LATENCY_TIMER,
-                               hpp.latency_timer);
+                               hpp.t0->latency_timer);
                pci_read_config_word(dev, PCI_BRIDGE_CONTROL, &pci_bctl);
-               if (hpp.enable_serr)
+               if (hpp.t0->enable_serr)
                        pci_bctl |= PCI_BRIDGE_CTL_SERR;
                else
                        pci_bctl &= ~PCI_BRIDGE_CTL_SERR;
-               if (hpp.enable_perr)
+               if (hpp.t0->enable_perr)
                        pci_bctl |= PCI_BRIDGE_CTL_PARITY;
                else
                        pci_bctl &= ~PCI_BRIDGE_CTL_PARITY;
@@ -89,10 +102,11 @@ int shpchp_configure_device(struct slot *p_slot)
        struct pci_bus *parent = p_slot->ctrl->pci_dev->subordinate;
        int num, fn;
 
-       dev = pci_find_slot(p_slot->bus, PCI_DEVFN(p_slot->device, 0));
+       dev = pci_get_slot(parent, PCI_DEVFN(p_slot->device, 0));
        if (dev) {
                err("Device %s already exists at %x:%x, cannot hot-add\n",
                                pci_name(dev), p_slot->bus, p_slot->device);
+               pci_dev_put(dev);
                return -EINVAL;
        }
 
@@ -103,12 +117,13 @@ int shpchp_configure_device(struct slot *p_slot)
        }
 
        for (fn = 0; fn < 8; fn++) {
-               if (!(dev = pci_find_slot(p_slot->bus,
-                                       PCI_DEVFN(p_slot->device, fn))))
+               dev = pci_get_slot(parent, PCI_DEVFN(p_slot->device, fn));
+               if (!dev)
                        continue;
                if ((dev->class >> 16) == PCI_BASE_CLASS_DISPLAY) {
                        err("Cannot hot-add display device %s\n",
                                        pci_name(dev));
+                       pci_dev_put(dev);
                        continue;
                }
                if ((dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) ||
@@ -124,18 +139,21 @@ int shpchp_configure_device(struct slot *p_slot)
                        }
                        if (busnr >= end) {
                                err("No free bus for hot-added bridge\n");
+                               pci_dev_put(dev);
                                continue;
                        }
                        child = pci_add_new_bus(parent, dev, busnr);
                        if (!child) {
                                err("Cannot add new bus for %s\n",
                                                pci_name(dev));
+                               pci_dev_put(dev);
                                continue;
                        }
                        child->subordinate = pci_do_scan_bus(child);
                        pci_bus_size_bridges(child);
                }
                program_fw_provided_values(dev);
+               pci_dev_put(dev);
        }
 
        pci_bus_assign_resources(parent);
@@ -149,17 +167,19 @@ int shpchp_unconfigure_device(struct slot *p_slot)
        int rc = 0;
        int j;
        u8 bctl = 0;
-       
+       struct pci_bus *parent = p_slot->ctrl->pci_dev->subordinate;
+
        dbg("%s: bus/dev = %x/%x\n", __FUNCTION__, p_slot->bus, p_slot->device);
 
        for (j=0; j<8 ; j++) {
-               struct pci_dev* temp = pci_find_slot(p_slot->bus,
+               struct pci_dev* temp = pci_get_slot(parent,
                                (p_slot->device << 3) | j);
                if (!temp)
                        continue;
                if ((temp->class >> 16) == PCI_BASE_CLASS_DISPLAY) {
                        err("Cannot remove display device %s\n",
                                        pci_name(temp));
+                       pci_dev_put(temp);
                        continue;
                }
                if (temp->hdr_type == PCI_HEADER_TYPE_BRIDGE) {
@@ -167,10 +187,12 @@ int shpchp_unconfigure_device(struct slot *p_slot)
                        if (bctl & PCI_BRIDGE_CTL_VGA) {
                                err("Cannot remove display device %s\n",
                                                pci_name(temp));
+                               pci_dev_put(temp);
                                continue;
                        }
                }
                pci_remove_bus_device(temp);
+               pci_dev_put(temp);
        }
        return rc;
 }