Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI: remove unused resource assignment in pci_read_bridge_bases()
  PCI hotplug: shpchp: message refinement
  PCI hotplug: shpchp: replace printk with dev_printk
  PCI: add routines for debugging and handling lost interrupts
  PCI hotplug: pciehp: message refinement
  PCI: fix ARI code to be compatible with mixed ARI/non-ARI systems
  PCI hotplug: cpqphp: fix kernel NULL pointer dereference

16 files changed, 376 insertions, 263 deletions

diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile
index 4b47f4ece5b7..af3bfe22847b 100644
--- a/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@@ -3,7 +3,8 @@
 #
 
 obj-y           += access.o bus.o probe.o remove.o pci.o quirks.o slot.o \
-                        pci-driver.o search.o pci-sysfs.o rom.o setup-res.o
+                        pci-driver.o search.o pci-sysfs.o rom.o setup-res.o \
+                        irq.o
 obj-$(CONFIG_PROC_FS) += proc.o
 
 # Build PCI Express stuff if needed
diff --git a/drivers/pci/hotplug/cpqphp_core.c b/drivers/pci/hotplug/cpqphp_core.c
index 724d42c4adbc..8514c3a1746a 100644
--- a/drivers/pci/hotplug/cpqphp_core.c
+++ b/drivers/pci/hotplug/cpqphp_core.c
@@ -433,7 +433,7 @@ static int ctrl_slot_setup(struct controller *ctrl,
                                 slot->number, ctrl->slot_device_offset,
                                 slot_number);
                 result = pci_hp_register(hotplug_slot,
-                                         ctrl->pci_dev->subordinate,
+                                         ctrl->pci_dev->bus,
                                          slot->device,
                                          name);
                 if (result) {
diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
index a4817a841fae..b2801a7ee37f 100644
--- a/drivers/pci/hotplug/pciehp.h
+++ b/drivers/pci/hotplug/pciehp.h
@@ -188,7 +188,7 @@ static inline struct slot *pciehp_find_slot(struct controller *ctrl, u8 device)
                         return slot;
         }
 
-        ctrl_err(ctrl, "%s: slot (device=0x%x) not found\n", __func__, device);
+        ctrl_err(ctrl, "Slot (device=0x%02x) not found\n", device);
         return NULL;
 }
 
diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
index 62be1b59c74b..4b23bc39b11e 100644
--- a/drivers/pci/hotplug/pciehp_core.c
+++ b/drivers/pci/hotplug/pciehp_core.c
@@ -184,7 +184,7 @@ static void release_slot(struct hotplug_slot *hotplug_slot)
 {
         struct slot *slot = hotplug_slot->private;
 
-        ctrl_dbg(slot->ctrl, "%s - physical_slot = %s\n",
+        ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
                  __func__, hotplug_slot_name(hotplug_slot));
 
         kfree(hotplug_slot->info);
@@ -216,9 +216,11 @@ static int init_slots(struct controller *ctrl)
                 slot->hotplug_slot = hotplug_slot;
                 snprintf(name, SLOT_NAME_SIZE, "%u", slot->number);
 
-                ctrl_dbg(ctrl, "Registering bus=%x dev=%x hp_slot=%x sun=%x "
-                         "slot_device_offset=%x\n", slot->bus, slot->device,
-                         slot->hp_slot, slot->number, ctrl->slot_device_offset);
+                ctrl_dbg(ctrl, "Registering domain:bus:dev=%04x:%02x:%02x "
+                         "hp_slot=%x sun=%x slot_device_offset=%x\n",
+                         pci_domain_nr(ctrl->pci_dev->subordinate),
+                         slot->bus, slot->device, slot->hp_slot, slot->number,
+                         ctrl->slot_device_offset);
                 retval = pci_hp_register(hotplug_slot,
                                          ctrl->pci_dev->subordinate,
                                          slot->device,
@@ -238,7 +240,7 @@ static int init_slots(struct controller *ctrl)
                                 &hotplug_slot_attr_lock.attr);
                         if (retval) {
                                 pci_hp_deregister(hotplug_slot);
-                                ctrl_err(ctrl, "cannot create additional sysfs "
+                                ctrl_err(ctrl, "Cannot create additional sysfs "
                                          "entries\n");
                                 goto error_info;
                         }
@@ -273,7 +275,7 @@ static int set_attention_status(struct hotplug_slot *hotplug_slot, u8 status)
 {
         struct slot *slot = hotplug_slot->private;
 
-        ctrl_dbg(slot->ctrl, "%s - physical_slot = %s\n",
+        ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
                   __func__, slot_name(slot));
 
         hotplug_slot->info->attention_status = status;
@@ -289,7 +291,7 @@ static int enable_slot(struct hotplug_slot *hotplug_slot)
 {
         struct slot *slot = hotplug_slot->private;
 
-        ctrl_dbg(slot->ctrl, "%s - physical_slot = %s\n",
+        ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
                  __func__, slot_name(slot));
 
         return pciehp_sysfs_enable_slot(slot);
@@ -300,7 +302,7 @@ static int disable_slot(struct hotplug_slot *hotplug_slot)
 {
         struct slot *slot = hotplug_slot->private;
 
-        ctrl_dbg(slot->ctrl, "%s - physical_slot = %s\n",
+        ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
                   __func__, slot_name(slot));
 
         return pciehp_sysfs_disable_slot(slot);
@@ -311,7 +313,7 @@ static int get_power_status(struct hotplug_slot *hotplug_slot, u8 *value)
         struct slot *slot = hotplug_slot->private;
         int retval;
 
-        ctrl_dbg(slot->ctrl, "%s - physical_slot = %s\n",
+        ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
                   __func__, slot_name(slot));
 
         retval = slot->hpc_ops->get_power_status(slot, value);
@@ -326,7 +328,7 @@ static int get_attention_status(struct hotplug_slot *hotplug_slot, u8 *value)
         struct slot *slot = hotplug_slot->private;
         int retval;
 
-        ctrl_dbg(slot->ctrl, "%s - physical_slot = %s\n",
+        ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
                   __func__, slot_name(slot));
 
         retval = slot->hpc_ops->get_attention_status(slot, value);
@@ -341,7 +343,7 @@ static int get_latch_status(struct hotplug_slot *hotplug_slot, u8 *value)
         struct slot *slot = hotplug_slot->private;
         int retval;
 
-        ctrl_dbg(slot->ctrl, "%s - physical_slot = %s\n",
+        ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
                  __func__, slot_name(slot));
 
         retval = slot->hpc_ops->get_latch_status(slot, value);
@@ -356,7 +358,7 @@ static int get_adapter_status(struct hotplug_slot *hotplug_slot, u8 *value)
         struct slot *slot = hotplug_slot->private;
         int retval;
 
-        ctrl_dbg(slot->ctrl, "%s - physical_slot = %s\n",
+        ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
                  __func__, slot_name(slot));