diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2005-11-28 10:10:41 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-11-28 10:10:41 -0800 |
commit | ed087c4bc638c8606bc06a35154016e3fa07752f (patch) | |
tree | fdcb135f9694620b980f8035f28d549dc76b5928 /pci | |
parent | d97856649e5cfcbb402b85bc09b39f3972236407 (diff) | |
download | patches-ed087c4bc638c8606bc06a35154016e3fa07752f.tar.gz |
removed patches added to 2.6.15-rc2-git4
Diffstat (limited to 'pci')
-rw-r--r-- | pci/pci-direct.c-dbg.patch | 28 | ||||
-rw-r--r-- | pci/pci-express-hotplug-clear-sticky-power-fault-bit.patch | 116 | ||||
-rw-r--r-- | pci/pci-kernel-doc-fix-for-pci-acpi.c.patch | 27 | ||||
-rw-r--r-- | pci/pci-remove-bogus-resource-collision-error.patch | 49 | ||||
-rw-r--r-- | pci/pci-trivial-printk-updates-in-common.c.patch | 39 |
5 files changed, 0 insertions, 259 deletions
diff --git a/pci/pci-direct.c-dbg.patch b/pci/pci-direct.c-dbg.patch deleted file mode 100644 index 80184ea532e44..0000000000000 --- a/pci/pci-direct.c-dbg.patch +++ /dev/null @@ -1,28 +0,0 @@ -From daniel.marjamaki@comhem.se Mon Nov 21 13:02:10 2005 -Message-ID: <437CD62E.1000006@comhem.se> -Date: Thu, 17 Nov 2005 20:12:46 +0100 -From: Daniel Marjamäki <daniel.marjamaki@comhem.se> -To: Greg KH <gregkh@suse.de> -Subject: PCI: direct.c: DBG - - -The DBG() call where updated with the appropriate KERN_* symbol. - -Signed-off-by: Daniel Marjamäki <daniel.marjamaki@comhem.se> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - arch/i386/pci/direct.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- gregkh-2.6.orig/arch/i386/pci/direct.c -+++ gregkh-2.6/arch/i386/pci/direct.c -@@ -201,7 +201,7 @@ static int __init pci_sanity_check(struc - return 1; - } - -- DBG("PCI: Sanity check failed\n"); -+ DBG(KERN_WARNING "PCI: Sanity check failed\n"); - return 0; - } - diff --git a/pci/pci-express-hotplug-clear-sticky-power-fault-bit.patch b/pci/pci-express-hotplug-clear-sticky-power-fault-bit.patch deleted file mode 100644 index ceff599099fa7..0000000000000 --- a/pci/pci-express-hotplug-clear-sticky-power-fault-bit.patch +++ /dev/null @@ -1,116 +0,0 @@ -From pcihpd-discuss-admin@lists.sourceforge.net Thu Nov 10 11:49:16 2005 -From: Rajesh Shah <rajesh.shah@intel.com> -To: <kristen.c.accardi@intel.com>, <gregkh@suse.de> -Cc: <thomas.schaefer@kontron.com> -Message-ID: <20051110114536.B18893@unix-os.sc.intel.com> -Content-Disposition: inline -Subject: PCI Express Hotplug: clear sticky power-fault bit -Date: Thu, 10 Nov 2005 11:45:36 -0800 - - -Per the PCI Express spec, the power-fault-detected bit in the -slot status register can be set anytime hardware detects a power -fault, regardless of whether the slot has a device populated in -it or not. This bit is sticky and must be explicitly cleared. -This patch is needed to allow hot-add after such a power fault -has been detected. - -Signed-off-by: Rajesh Shah <rajesh.shah@intel.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/pci/hotplug/pciehp.h | 1 - - drivers/pci/hotplug/pciehp_ctrl.c | 15 ++------------- - drivers/pci/hotplug/pciehp_hpc.c | 10 +++++++++- - 3 files changed, 11 insertions(+), 15 deletions(-) - ---- gregkh-2.6.orig/drivers/pci/hotplug/pciehp.h -+++ gregkh-2.6/drivers/pci/hotplug/pciehp.h -@@ -59,7 +59,6 @@ struct slot { - struct slot *next; - u8 bus; - u8 device; -- u16 status; - u32 number; - u8 state; - struct timer_list task_event; ---- gregkh-2.6.orig/drivers/pci/hotplug/pciehp_ctrl.c -+++ gregkh-2.6/drivers/pci/hotplug/pciehp_ctrl.c -@@ -207,7 +207,6 @@ u8 pciehp_handle_power_fault(u8 hp_slot, - * power fault Cleared - */ - info("Power fault cleared on Slot(%d)\n", ctrl->first_slot + hp_slot); -- p_slot->status = 0x00; - taskInfo->event_type = INT_POWER_FAULT_CLEAR; - } else { - /* -@@ -215,8 +214,6 @@ u8 pciehp_handle_power_fault(u8 hp_slot, - */ - info("Power fault on Slot(%d)\n", ctrl->first_slot + hp_slot); - taskInfo->event_type = INT_POWER_FAULT; -- /* set power fault status for this board */ -- p_slot->status = 0xFF; - info("power fault bit %x set\n", hp_slot); - } - if (rc) -@@ -317,13 +314,10 @@ static int board_added(struct slot *p_sl - return rc; - } - -- dbg("%s: slot status = %x\n", __FUNCTION__, p_slot->status); -- - /* Check for a power fault */ -- if (p_slot->status == 0xFF) { -- /* power fault occurred, but it was benign */ -+ if (p_slot->hpc_ops->query_power_fault(p_slot)) { -+ dbg("%s: power fault detected\n", __FUNCTION__); - rc = POWER_FAILURE; -- p_slot->status = 0; - goto err_exit; - } - -@@ -334,8 +328,6 @@ static int board_added(struct slot *p_sl - goto err_exit; - } - -- p_slot->status = 0; -- - /* - * Some PCI Express root ports require fixup after hot-plug operation. - */ -@@ -382,9 +374,6 @@ static int remove_board(struct slot *p_s - - dbg("In %s, hp_slot = %d\n", __FUNCTION__, hp_slot); - -- /* Change status to shutdown */ -- p_slot->status = 0x01; -- - /* Wait for exclusive access to hardware */ - down(&ctrl->crit_sect); - ---- gregkh-2.6.orig/drivers/pci/hotplug/pciehp_hpc.c -+++ gregkh-2.6/drivers/pci/hotplug/pciehp_hpc.c -@@ -750,7 +750,7 @@ static int hpc_power_on_slot(struct slot - { - struct php_ctlr_state_s *php_ctlr = slot->ctrl->hpc_ctlr_handle; - u16 slot_cmd; -- u16 slot_ctrl; -+ u16 slot_ctrl, slot_status; - - int retval = 0; - -@@ -767,6 +767,14 @@ static int hpc_power_on_slot(struct slot - return -1; - } - -+ /* Clear sticky power-fault bit from previous power failures */ -+ hp_register_read_word(php_ctlr->pci_dev, -+ SLOT_STATUS(slot->ctrl->cap_base), slot_status); -+ slot_status &= PWR_FAULT_DETECTED; -+ if (slot_status) -+ hp_register_write_word(php_ctlr->pci_dev, -+ SLOT_STATUS(slot->ctrl->cap_base), slot_status); -+ - retval = hp_register_read_word(php_ctlr->pci_dev, SLOT_CTRL(slot->ctrl->cap_base), slot_ctrl); - - if (retval) { diff --git a/pci/pci-kernel-doc-fix-for-pci-acpi.c.patch b/pci/pci-kernel-doc-fix-for-pci-acpi.c.patch deleted file mode 100644 index 5f4c6b8bd75a7..0000000000000 --- a/pci/pci-kernel-doc-fix-for-pci-acpi.c.patch +++ /dev/null @@ -1,27 +0,0 @@ -From rdunlap@xenotime.net Fri Nov 18 22:58:01 2005 -Date: Fri, 18 Nov 2005 23:08:47 -0800 -From: "Randy.Dunlap" <rdunlap@xenotime.net> -Cc: gregkh <greg@kroah.com> -Subject: PCI: kernel-doc fix for pci-acpi.c -Message-Id: <20051118230847.643a2562.rdunlap@xenotime.net> - -From: Randy Dunlap <rdunlap@xenotime.net> - -Fix kernel-doc warning in pci/pci-acpi.c. - -Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> ---- - drivers/pci/pci-acpi.c | 1 + - 1 file changed, 1 insertion(+) - ---- gregkh-2.6.orig/drivers/pci/pci-acpi.c -+++ gregkh-2.6/drivers/pci/pci-acpi.c -@@ -178,6 +178,7 @@ EXPORT_SYMBOL_GPL(pci_osc_support_set); - - /** - * pci_osc_control_set - commit requested control to Firmware -+ * @handle: acpi_handle for the target ACPI object - * @flags: driver's requested control bits - * - * Attempt to take control from Firmware on requested control bits. diff --git a/pci/pci-remove-bogus-resource-collision-error.patch b/pci/pci-remove-bogus-resource-collision-error.patch deleted file mode 100644 index 64c33faf10b28..0000000000000 --- a/pci/pci-remove-bogus-resource-collision-error.patch +++ /dev/null @@ -1,49 +0,0 @@ -From rshah1@unix-os.sc.intel.com Thu Nov 17 09:49:25 2005 -Date: Thu, 17 Nov 2005 09:51:28 -0800 -From: Rajesh Shah <rajesh.shah@intel.com> -To: Greg KH <gregkh@suse.de> -Cc: Rajesh Shah <rajesh.shah@intel.com>, akpm@osdl.org -Subject: PCI: remove bogus resource collision error -Message-ID: <20051117095128.A21488@unix-os.sc.intel.com> -Content-Disposition: inline - -When attempting to hotadd a PCI card with a bridge on it, I saw -the kernel reporting resource collision errors even when there were -really no collisions. The problem is that the code doesn't skip -over "invalid" resources with their resource type flag not set. -Others have reported similar problems at boot time and for -non-bridge PCI card hotplug too, where the code flags a -resource collision for disabled ROMs. This patch fixes both -problems. - -Signed-off-by: Rajesh Shah <rajesh.shah@intel.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - - ---- - arch/i386/pci/i386.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - ---- gregkh-2.6.orig/arch/i386/pci/i386.c -+++ gregkh-2.6/arch/i386/pci/i386.c -@@ -221,6 +221,11 @@ int pcibios_enable_resources(struct pci_ - continue; - - r = &dev->resource[idx]; -+ if (!(r->flags & (IORESOURCE_IO | IORESOURCE_MEM))) -+ continue; -+ if ((idx == PCI_ROM_RESOURCE) && -+ (!(r->flags & IORESOURCE_ROM_ENABLE))) -+ continue; - if (!r->start && r->end) { - printk(KERN_ERR "PCI: Device %s not available because of resource collisions\n", pci_name(dev)); - return -EINVAL; -@@ -230,8 +235,6 @@ int pcibios_enable_resources(struct pci_ - if (r->flags & IORESOURCE_MEM) - cmd |= PCI_COMMAND_MEMORY; - } -- if (dev->resource[PCI_ROM_RESOURCE].start) -- cmd |= PCI_COMMAND_MEMORY; - if (cmd != old_cmd) { - printk("PCI: Enabling device %s (%04x -> %04x)\n", pci_name(dev), old_cmd, cmd); - pci_write_config_word(dev, PCI_COMMAND, cmd); diff --git a/pci/pci-trivial-printk-updates-in-common.c.patch b/pci/pci-trivial-printk-updates-in-common.c.patch deleted file mode 100644 index a78abd1633efa..0000000000000 --- a/pci/pci-trivial-printk-updates-in-common.c.patch +++ /dev/null @@ -1,39 +0,0 @@ -From daniel.marjamaki@comhem.se Thu Nov 10 22:23:01 2005 -From: Daniel <daniel.marjamaki@comhem.se> -To: Greg KH <gregkh@suse.de> -Subject: PCI: trivial printk updates in common.c -Date: Fri, 11 Nov 2005 07:16:47 +0100 -Cc: danielm77@spray.se -Content-Disposition: inline -Message-Id: <200511110716.47388.daniel.marjamaki@comhem.se> - - -Modified common.c so it's using the appropriate KERN_* in printk() calls. - -Signed-off-by: Daniel Marjamäkia <daniel.marjamaki@comhem.se> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - arch/i386/pci/common.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- gregkh-2.6.orig/arch/i386/pci/common.c -+++ gregkh-2.6/arch/i386/pci/common.c -@@ -132,7 +132,7 @@ struct pci_bus * __devinit pcibios_scan_ - } - } - -- printk("PCI: Probing PCI hardware (bus %02x)\n", busnum); -+ printk(KERN_DEBUG "PCI: Probing PCI hardware (bus %02x)\n", busnum); - - return pci_scan_bus_parented(NULL, busnum, &pci_root_ops, NULL); - } -@@ -144,7 +144,7 @@ static int __init pcibios_init(void) - struct cpuinfo_x86 *c = &boot_cpu_data; - - if (!raw_pci_ops) { -- printk("PCI: System does not support PCI\n"); -+ printk(KERN_WARNING "PCI: System does not support PCI\n"); - return 0; - } - |