# 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.741 -> 1.742
# drivers/hotplug/cpqphp_core.c 1.10 -> 1.11
# drivers/hotplug/cpqphp_pci.c 1.8 -> 1.9
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/10/09 Dan.Zink@hp.com 1.742
# [PATCH] Compaq PCI Hotplug bug fix
#
# Found the bug. The following patch fixes the hot plug
# driver so that it has a fallback when there are no unused
# IRQs on a system. At some point intialization got re-
# ordered and this was broken.
#
# I found another bug that was preventing the existing scheme from
# working. It looks like the function "pcibios_set_irq_routing" is
# returning 1 for success, but the hot plug driver was interpreting it as
# failure.
# --------------------------------------------
#
diff -Nru a/drivers/hotplug/cpqphp_core.c b/drivers/hotplug/cpqphp_core.c
--- a/drivers/hotplug/cpqphp_core.c Wed Oct 9 15:37:40 2002
+++ b/drivers/hotplug/cpqphp_core.c Wed Oct 9 15:37:40 2002
@@ -1110,6 +1110,9 @@
/*
* Get IO, memory, and IRQ resources for new devices
*/
+ // The next line is required for cpqhp_find_available_resources
+ ctrl->interrupt = pdev->irq;
+
rc = cpqhp_find_available_resources(ctrl, cpqhp_rom_start);
ctrl->add_support = !rc;
if (rc) {
@@ -1138,7 +1141,6 @@
writel(0xFFFFFFFFL, ctrl->hpc_reg + INT_MASK);
/* set up the interrupt */
- ctrl->interrupt = pdev->irq;
dbg("HPC interrupt = %d \n", ctrl->interrupt);
if (request_irq(ctrl->interrupt,
(void (*)(int, void *, struct pt_regs *)) &cpqhp_ctrl_intr,
diff -Nru a/drivers/hotplug/cpqphp_pci.c b/drivers/hotplug/cpqphp_pci.c
--- a/drivers/hotplug/cpqphp_pci.c Wed Oct 9 15:37:40 2002
+++ b/drivers/hotplug/cpqphp_pci.c Wed Oct 9 15:37:40 2002
@@ -360,8 +360,8 @@
__FUNCTION__, dev_num, bus_num, int_pin, irq_num);
rc = pcibios_set_irq_routing(&fakedev, int_pin - 0x0a, irq_num);
dbg("%s: rc %d\n", __FUNCTION__, rc);
- if (rc)
- return rc;
+ if (!rc)
+ return !rc;
// set the Edge Level Control Register (ELCR)
temp_word = inb(0x4d0);
-
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 : Tue Oct 15 2002 - 22:00:34 EST