Skip to contentSkip to conversation

IBM PCI Hotplug changes for 2.4.19-rc1-ac6

PATCH New Greg KH 1 participant 1 message Jul 16, 2002

lore
Share & tools
lore

Greg KH

author
#0 lore raw

PATCH 1/1 IBM PCI Hotplug changes for 2.4.19-rc1-ac6

Hi,

Here's a patch against 2.4.19-rc1-ac6 that updates the IBM PCI Hotplug driver to the latest version. It fixes a number of bugs that have been found on the current hardware, and removes some stupid locking problems that essentially prevented the driver from working on machines with a large number of pci slots.

thanks,

greg k-h

drivers/hotplug/ibmphp.h +12 -6
diff -Naur -X /home/greg/linux/dontdiff linux-2.4.19-rc1-ac6/drivers/hotplug/ibmphp.h linux-2.4.19-rc1-ac6-greg/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;
drivers/hotplug/ibmphp_core.c +159 -49

355 lines not on this page · raw message

drivers/hotplug/ibmphp_ebda.c +44 -21

114 lines not on this page · raw message

drivers/hotplug/ibmphp_hpc.c +64 -77

300 lines not on this page · raw message