PCI Hotplug changes for 2.4.20-pre1

Hi,

This includes an ACPI PCI Hotplug driver update, and a IBM PCI Hotplug driver update, both of which have been in the -ac kernel for a while.

	Pull from:  bk://linuxusb.bkbits.net/pci_hp-2.4

Patches will follow (warning, the ACPI one is big, so I will not send that to the mailing lists, it can be found at:
http://www.kernel.org/pub/linux/kernel/people/gregkh/hotplug/2.4/pci_hp-acpiphp-2.4.20-pre1.patch
)

thanks,

greg k-h

 drivers/hotplug/pcihp_acpi.c      |  397 ---------
 drivers/hotplug/pcihp_acpi.h      |  231 -----
 drivers/hotplug/pcihp_acpi_ctrl.c |  642 ----------------
 drivers/hotplug/pcihp_acpi_glue.c |  757 -------------------
 drivers/hotplug/Makefile          |   14 
 drivers/hotplug/acpiphp.h         |  322 ++++++++
 drivers/hotplug/acpiphp_core.c    |  470 +++++++++++
 drivers/hotplug/acpiphp_glue.c    | 1514 ++++++++++++++++++++++++++++++++++++++
 drivers/hotplug/acpiphp_pci.c     |  763 +++++++++++++++++++
 drivers/hotplug/acpiphp_res.c     |  708 +++++++++++++++++
 drivers/hotplug/ibmphp.h          |   18 
 drivers/hotplug/ibmphp_core.c     |  208 +++--
 drivers/hotplug/ibmphp_ebda.c     |   65 +
 drivers/hotplug/ibmphp_hpc.c      |  141 +--
 14 files changed, 4064 insertions(+), 2186 deletions(-)

------

[email protected], 2002-08-06 12:04:18-07:00, [email protected]
IBM PCI Hotplug driver update

This brings the driver up to the latest version, and includes the following fixes:
- timeout bug fixed (now large number of slots do not cause problems.)
- more different types of hardware supported.
- more slot information is now tracked.

 drivers/hotplug/ibmphp.h      |   18 ++-
 drivers/hotplug/ibmphp_core.c |  208 ++++++++++++++++++++++++++++++++----------
 drivers/hotplug/ibmphp_ebda.c |   65 ++++++++-----
 drivers/hotplug/ibmphp_hpc.c  |  141 ++++++++++++----------------
 4 files changed, 279 insertions(+), 153 deletions(-)

------

[email protected], 2002-08-06 12:00:20-07:00, [email protected]
ACPI PCI Hotplug driver update

This is from Takayoshi KOCHI <[email protected]>

 drivers/hotplug/pcihp_acpi.c      |  397 ---------
 drivers/hotplug/pcihp_acpi.h      |  231 -----
 drivers/hotplug/pcihp_acpi_ctrl.c |  642 ----------------
 drivers/hotplug/pcihp_acpi_glue.c |  757 -------------------
 drivers/hotplug/Makefile          |   14 
 drivers/hotplug/acpiphp.h         |  322 ++++++++
 drivers/hotplug/acpiphp_core.c    |  470 +++++++++++
 drivers/hotplug/acpiphp_glue.c    | 1514 ++++++++++++++++++++++++++++++++++++++
 drivers/hotplug/acpiphp_pci.c     |  763 +++++++++++++++++++
 drivers/hotplug/acpiphp_res.c     |  708 +++++++++++++++++
 10 files changed, 3785 insertions(+), 2033 deletions(-)

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas:
# ChangeSet 1.685 -> 1.686
# drivers/hotplug/ibmphp_hpc.c 1.1 -> 1.2
# drivers/hotplug/ibmphp_ebda.c 1.1 -> 1.2
# drivers/hotplug/ibmphp.h 1.1 -> 1.2
# drivers/hotplug/ibmphp_core.c 1.2 -> 1.3
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/08/06 [email protected] 1.686
# IBM PCI Hotplug driver update
#
# This brings the driver up to the latest version, and includes the following fixes:
# - timeout bug fixed (now large number of slots do not cause problems.)
# - more different types of hardware supported.
# - more slot information is now tracked.
# --------------------------------------------
#

diff -Nru a/drivers/hotplug/ibmphp.h b/drivers/hotplug/ibmphp.h
@@ -168,13 +168,11 @@
 
 struct ebda_hpc_bus {
 	u32 bus_num;
-/*
 	u8 slots_at_33_conv;
 	u8 slots_at_66_conv;
 	u8 slots_at_66_pcix;
 	u8 slots_at_100_pcix;
 	u8 slots_at_133_pcix;
-*/
 };
 
 

@@ -232,12 +230,15 @@
 	u8 slot_max;
 	u8 slot_count;
 	u8 busno;
-	u8 current_speed;
-	u8 supported_speed;
 	u8 controller_id;
-	u8 supported_bus_mode;
+	u8 current_speed;
 	u8 current_bus_mode;
 	u8 index;
+	u8 slots_at_33_conv;
+	u8 slots_at_66_conv;
+	u8 slots_at_66_pcix;
+	u8 slots_at_100_pcix;
+	u8 slots_at_133_pcix;
 	struct list_head bus_info_list;
 };
 

@@ -690,8 +691,11 @@
 	u8 bus;
 	u8 device;
 	u8 number;
+	u8 real_physical_slot_num;
 	char name[100];
 	u32 capabilities;
+	u8 supported_speed;
+	u8 supported_bus_mode;
 	struct hotplug_slot *hotplug_slot;
 	struct controller *ctrl;
 	struct pci_func *func;

@@ -709,10 +713,12 @@
 struct controller {
 	struct ebda_hpc_slot *slots;
 	struct ebda_hpc_bus *buses;
+	u8 starting_slot_num;	/* starting and ending slot #'s this ctrl controls*/
+	u8 ending_slot_num;
 	u8 revision;
 	u8 options;		/* which options HPC supports */
 	u8 status;
-	u8 ctlr_id;		/* TONI */
+	u8 ctlr_id;
 	u8 slot_count;
 	u8 bus_count;
 	u8 ctlr_relative_id;