# 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.627 -> 1.628
# drivers/hotplug/ibmphp_ebda.c 1.4 -> 1.5
# drivers/hotplug/ibmphp_hpc.c 1.6 -> 1.7
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/09/09 zubarev@us.ibm.com 1.628
# [PATCH] IBM PCI Hotplug driver update for ISA based controllers
#
# --------------------------------------------
#
diff -Nru a/drivers/hotplug/ibmphp_ebda.c b/drivers/hotplug/ibmphp_ebda.c
--- a/drivers/hotplug/ibmphp_ebda.c Mon Sep 9 15:09:43 2002
+++ b/drivers/hotplug/ibmphp_ebda.c Mon Sep 9 15:09:43 2002
@@ -815,6 +815,7 @@
struct ebda_hpc_slot *slot_ptr;
struct bus_info *bus_info_ptr1, *bus_info_ptr2;
int rc;
+ int retval;
struct slot *slot_cur;
struct list_head *list;
@@ -933,6 +934,10 @@
case 0:
hpc_ptr->u.isa_ctlr.io_start = readw (io_mem + addr);
hpc_ptr->u.isa_ctlr.io_end = readw (io_mem + addr + 2);
+ retval = check_region (hpc_ptr->u.isa_ctlr.io_start, (hpc_ptr->u.isa_ctlr.io_end - hpc_ptr->u.isa_ctlr.io_start + 1));
+ if (retval)
+ return -ENODEV;
+ request_region (hpc_ptr->u.isa_ctlr.io_start, (hpc_ptr->u.isa_ctlr.io_end - hpc_ptr->u.isa_ctlr.io_start + 1), "ibmphp");
hpc_ptr->irq = readb (io_mem + addr + 4);
addr += 5;
break;
@@ -949,9 +954,9 @@
return -ENODEV;
}
- /* following 3 line: Now our driver only supports I2c ctlrType */
- if ((hpc_ptr->ctlr_type != 2) && (hpc_ptr->ctlr_type != 4)) {
- err ("Please run this driver on ibm xseries440\n ");
+ /* following 3 line: Now our driver only supports I2c/ISA ctlrType */
+ if ((hpc_ptr->ctlr_type != 2) && (hpc_ptr->ctlr_type != 4) && (hpc_ptr->ctlr_type != 0)) {
+ err ("Please run this driver on IBM xSeries440 or xSeries 235\n ");
return -ENODEV;
}
@@ -1211,6 +1216,8 @@
list_for_each_safe (list, next, &ebda_hpc_head) {
controller = list_entry (list, struct controller, ebda_hpc_list);
+ if (controller->ctlr_type == 0)
+ release_region (controller->u.isa_ctlr.io_start, (controller->u.isa_ctlr.io_end - controller->u.isa_ctlr.io_start + 1));
free_ebda_hpc (controller);
}
}
diff -Nru a/drivers/hotplug/ibmphp_hpc.c b/drivers/hotplug/ibmphp_hpc.c
--- a/drivers/hotplug/ibmphp_hpc.c Mon Sep 9 15:09:43 2002
+++ b/drivers/hotplug/ibmphp_hpc.c Mon Sep 9 15:09:43 2002
@@ -351,10 +351,41 @@
return (rc);
}
+//------------------------------------------------------------
+// Read from ISA type HPC
+//------------------------------------------------------------
+static u8 isa_ctrl_read (struct controller *ctlr_ptr, u8 offset)
+{
+ u16 start_address;
+ u16 end_address;
+ u8 data;
+
+ start_address = ctlr_ptr->u.isa_ctlr.io_start;
+ end_address = ctlr_ptr->u.isa_ctlr.io_end;
+ data = inb (start_address + offset);
+ return data;
+}
+
+//--------------------------------------------------------------
+// Write to ISA type HPC
+//--------------------------------------------------------------
+static void isa_ctrl_write (struct controller *ctlr_ptr, u8 offset, u8 data)
+{
+ u16 start_address;
+ u16 port_address;
+
+ start_address = ctlr_ptr->u.isa_ctlr.io_start;
+ port_address = start_address + (u16) offset;
+ outb (data, port_address);
+}
+
static u8 ctrl_read (struct controller *ctlr, void *base, u8 offset)
{
u8 rc;
switch (ctlr->ctlr_type) {
+ case 0:
+ rc = isa_ctrl_read (ctlr, offset);
+ break;
case 2:
case 4:
rc = i2c_ctrl_read (ctlr, base, offset);
@@ -369,6 +400,9 @@
{
u8 rc = 0;
switch (ctlr->ctlr_type) {
+ case 0:
+ isa_ctrl_write(ctlr, offset, data);
+ break;
case 2:
case 4:
rc = i2c_ctrl_write(ctlr, base, offset, data);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Sun Sep 15 2002 - 22:00:19 EST