diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-12 09:14:26 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-12 09:14:26 -0700 |
commit | 7abbce6847b730d28e1b3071267a6ba9f56b11d8 (patch) | |
tree | 4b5c63cc34aea1cd7432d2d9e26b7b98d469a740 /pci | |
parent | 041ae629d17ff8f633ec47d0518f01fe60b21235 (diff) | |
download | patches-7abbce6847b730d28e1b3071267a6ba9f56b11d8.tar.gz |
2.6.17-rc6-git3 refresh
Diffstat (limited to 'pci')
7 files changed, 12 insertions, 198 deletions
diff --git a/pci/pci-64-bit-resources-drivers-pci-changes.patch b/pci/pci-64-bit-resources-drivers-pci-changes.patch index cfbaf8968822f..c0222db05be82 100644 --- a/pci/pci-64-bit-resources-drivers-pci-changes.patch +++ b/pci/pci-64-bit-resources-drivers-pci-changes.patch @@ -157,7 +157,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> out += sprintf(out, "Free resources: bus numbers\n"); --- gregkh-2.6.orig/drivers/pci/pci.c +++ gregkh-2.6/drivers/pci/pci.c -@@ -679,10 +679,12 @@ int pci_request_region(struct pci_dev *p +@@ -693,10 +693,12 @@ int pci_request_region(struct pci_dev *p return 0; err_out: diff --git a/pci/pci-error-handling-on-pci-device-resume.patch b/pci/pci-error-handling-on-pci-device-resume.patch deleted file mode 100644 index ca798111255ab..0000000000000 --- a/pci/pci-error-handling-on-pci-device-resume.patch +++ /dev/null @@ -1,63 +0,0 @@ -From owner-linux-pci@atrey.karlin.mff.cuni.cz Tue Apr 18 05:50:02 2006 -Date: Tue, 18 Apr 2006 14:49:56 +0200 -From: Jean Delvare <khali@linux-fr.org> -To: Greg KH <gregkh@suse.de> -Subject: PCI: Error handling on PCI device resume -Message-Id: <20060418144956.7643e844.khali@linux-fr.org> - -We currently don't handle errors properly when resuming a PCI device: -* In pci_default_resume() we capture the error code returned by - pci_enable_device() but don't pass it up to the caller. - Introduced by commit 95a629657dbe28e44a312c47815b3dc3f1ce0970 -* In pci_resume_device(), the errors possibly returned by the driver's - .resume method or by the generic pci_default_resume() function are - ignored. - -This patch fixes both issues. - -Signed-off-by: Jean Delvare <khali@linux-fr.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/pci/pci-driver.c | 13 ++++++++----- - 1 file changed, 8 insertions(+), 5 deletions(-) - ---- gregkh-2.6.orig/drivers/pci/pci-driver.c -+++ gregkh-2.6/drivers/pci/pci-driver.c -@@ -285,9 +285,9 @@ static int pci_device_suspend(struct dev - * Default resume method for devices that have no driver provided resume, - * or not even a driver at all. - */ --static void pci_default_resume(struct pci_dev *pci_dev) -+static int pci_default_resume(struct pci_dev *pci_dev) - { -- int retval; -+ int retval = 0; - - /* restore the PCI config space */ - pci_restore_state(pci_dev); -@@ -298,18 +298,21 @@ static void pci_default_resume(struct pc - /* if the device was busmaster before the suspend, make it busmaster again */ - if (pci_dev->is_busmaster) - pci_set_master(pci_dev); -+ -+ return retval; - } - - static int pci_device_resume(struct device * dev) - { -+ int error; - struct pci_dev * pci_dev = to_pci_dev(dev); - struct pci_driver * drv = pci_dev->driver; - - if (drv && drv->resume) -- drv->resume(pci_dev); -+ error = drv->resume(pci_dev); - else -- pci_default_resume(pci_dev); -- return 0; -+ error = pci_default_resume(pci_dev); -+ return error; - } - - static void pci_device_shutdown(struct device *dev) diff --git a/pci/pci-fix-pciehp-compile-issue-when-config_acpi-is-not-enabled.patch b/pci/pci-fix-pciehp-compile-issue-when-config_acpi-is-not-enabled.patch deleted file mode 100644 index 3e7e2636357df..0000000000000 --- a/pci/pci-fix-pciehp-compile-issue-when-config_acpi-is-not-enabled.patch +++ /dev/null @@ -1,29 +0,0 @@ -From akpm@osdl.org Sat May 13 08:33:56 2006 -Message-Id: <200605131533.k4DFXpMY016119@shell0.pdx.osdl.net> -From: Kristen Accardi <kristen.c.accardi@intel.com> -Subject: PCI: fix pciehp compile issue when CONFIG_ACPI is not enabled -To: kristen.c.accardi@intel.com, greg@kroah.com, mm-commits@vger.kernel.org -From: akpm@osdl.org -Date: Sat, 13 May 2006 08:30:52 -0700 - -Fix build error when CONFIG_ACPI not defined - -Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com> -Signed-off-by: Andrew Morton <akpm@osdl.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - include/linux/pci-acpi.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- gregkh-2.6.orig/include/linux/pci-acpi.h -+++ gregkh-2.6/include/linux/pci-acpi.h -@@ -50,7 +50,7 @@ - extern acpi_status pci_osc_control_set(acpi_handle handle, u32 flags); - extern acpi_status pci_osc_support_set(u32 flags); - #else --#if !defined(acpi_status) -+#if !defined(AE_ERROR) - typedef u32 acpi_status; - #define AE_ERROR (acpi_status) (0x0001) - #endif diff --git a/pci/pci-improve-pci-config-space-writeback.patch b/pci/pci-improve-pci-config-space-writeback.patch deleted file mode 100644 index 14389d648326c..0000000000000 --- a/pci/pci-improve-pci-config-space-writeback.patch +++ /dev/null @@ -1,47 +0,0 @@ -From akpm@osdl.org Tue Apr 18 21:07:42 2006 -Message-Id: <200604190407.k3J47WQt008150@shell0.pdx.osdl.net> -Subject: PCI: Improve PCI config space writeback -To: greg@kroah.com -Cc: akpm@osdl.org, davej@redhat.com -From: akpm@osdl.org -Date: Tue, 18 Apr 2006 21:06:51 -0700 - - -From: Dave Jones <davej@redhat.com> - -At least one laptop blew up on resume from suspend with a black screen due -to a lack of this patch. By only writing back config space that is -different, we minimise the possibility of accidents like this. - -Signed-off-by: Dave Jones <davej@redhat.com> -Signed-off-by: Andrew Morton <akpm@osdl.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/pci/pci.c | 14 ++++++++++++-- - 1 file changed, 12 insertions(+), 2 deletions(-) - ---- gregkh-2.6.orig/drivers/pci/pci.c -+++ gregkh-2.6/drivers/pci/pci.c -@@ -461,9 +461,19 @@ int - pci_restore_state(struct pci_dev *dev) - { - int i; -+ int val; - -- for (i = 0; i < 16; i++) -- pci_write_config_dword(dev,i * 4, dev->saved_config_space[i]); -+ for (i = 0; i < 16; i++) { -+ pci_read_config_dword(dev, i * 4, &val); -+ if (val != dev->saved_config_space[i]) { -+ printk(KERN_DEBUG "PM: Writing back config space on " -+ "device %s at offset %x (was %x, writing %x)\n", -+ pci_name(dev), i, -+ val, (int)dev->saved_config_space[i]); -+ pci_write_config_dword(dev,i * 4, -+ dev->saved_config_space[i]); -+ } -+ } - pci_restore_msi_state(dev); - pci_restore_msix_state(dev); - return 0; diff --git a/pci/pci-legacy-i-o-port-free-driver-changes-to-generic-pci-code.patch b/pci/pci-legacy-i-o-port-free-driver-changes-to-generic-pci-code.patch index 4e3bf2da4acee..77f237e23e5f6 100644 --- a/pci/pci-legacy-i-o-port-free-driver-changes-to-generic-pci-code.patch +++ b/pci/pci-legacy-i-o-port-free-driver-changes-to-generic-pci-code.patch @@ -40,7 +40,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/pci/pci-driver.c +++ gregkh-2.6/drivers/pci/pci-driver.c -@@ -293,7 +293,8 @@ static void pci_default_resume(struct pc +@@ -293,7 +293,8 @@ static int pci_default_resume(struct pci pci_restore_state(pci_dev); /* if the device was enabled before suspend, reenable */ if (pci_dev->is_enabled) @@ -52,7 +52,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> pci_set_master(pci_dev); --- gregkh-2.6.orig/drivers/pci/pci.c +++ gregkh-2.6/drivers/pci/pci.c -@@ -490,6 +490,9 @@ pci_enable_device_bars(struct pci_dev *d +@@ -504,6 +504,9 @@ pci_enable_device_bars(struct pci_dev *d err = pcibios_enable_device(dev, bars); if (err < 0) return err; @@ -62,7 +62,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return 0; } -@@ -507,8 +510,6 @@ pci_enable_device(struct pci_dev *dev) +@@ -521,8 +524,6 @@ pci_enable_device(struct pci_dev *dev) int err = pci_enable_device_bars(dev, (1 << PCI_NUM_RESOURCES) - 1); if (err) return err; @@ -71,7 +71,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return 0; } -@@ -543,6 +544,7 @@ pci_disable_device(struct pci_dev *dev) +@@ -557,6 +558,7 @@ pci_disable_device(struct pci_dev *dev) pcibios_disable_device(dev); dev->is_enabled = 0; @@ -79,7 +79,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } /** -@@ -625,6 +627,12 @@ void pci_release_region(struct pci_dev * +@@ -639,6 +641,12 @@ void pci_release_region(struct pci_dev * { if (pci_resource_len(pdev, bar) == 0) return; @@ -92,7 +92,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (pci_resource_flags(pdev, bar) & IORESOURCE_IO) release_region(pci_resource_start(pdev, bar), pci_resource_len(pdev, bar)); -@@ -651,7 +659,12 @@ int pci_request_region(struct pci_dev *p +@@ -665,7 +673,12 @@ int pci_request_region(struct pci_dev *p { if (pci_resource_len(pdev, bar) == 0) return 0; @@ -106,7 +106,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (pci_resource_flags(pdev, bar) & IORESOURCE_IO) { if (!request_region(pci_resource_start(pdev, bar), pci_resource_len(pdev, bar), res_name)) -@@ -689,7 +702,8 @@ void pci_release_regions(struct pci_dev +@@ -703,7 +716,8 @@ void pci_release_regions(struct pci_dev int i; for (i = 0; i < 6; i++) @@ -116,7 +116,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } /** -@@ -710,13 +724,15 @@ int pci_request_regions(struct pci_dev * +@@ -724,13 +738,15 @@ int pci_request_regions(struct pci_dev * int i; for (i = 0; i < 6; i++) @@ -135,7 +135,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return -EBUSY; } -@@ -891,6 +907,22 @@ pci_set_consistent_dma_mask(struct pci_d +@@ -905,6 +921,22 @@ pci_set_consistent_dma_mask(struct pci_d } #endif @@ -158,7 +158,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static int __devinit pci_init(void) { struct pci_dev *dev = NULL; -@@ -948,6 +980,7 @@ EXPORT_SYMBOL(pci_set_dma_mask); +@@ -962,6 +994,7 @@ EXPORT_SYMBOL(pci_set_dma_mask); EXPORT_SYMBOL(pci_set_consistent_dma_mask); EXPORT_SYMBOL(pci_assign_resource); EXPORT_SYMBOL(pci_find_parent_resource); diff --git a/pci/pci-legacy-i-o-port-free-driver-make-intel-e1000-driver-legacy-i-o-port-free.patch b/pci/pci-legacy-i-o-port-free-driver-make-intel-e1000-driver-legacy-i-o-port-free.patch index 31df65f649b2d..66e3255cfb8cc 100644 --- a/pci/pci-legacy-i-o-port-free-driver-make-intel-e1000-driver-legacy-i-o-port-free.patch +++ b/pci/pci-legacy-i-o-port-free-driver-make-intel-e1000-driver-legacy-i-o-port-free.patch @@ -189,7 +189,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } } -@@ -4577,7 +4588,7 @@ e1000_resume(struct pci_dev *pdev) +@@ -4573,7 +4584,7 @@ e1000_resume(struct pci_dev *pdev) if (retval) DPRINTK(PROBE, ERR, "Error in setting power state\n"); e1000_pci_restore_state(adapter); diff --git a/pci/pci-reverse-pci-config-space-restore-order.patch b/pci/pci-reverse-pci-config-space-restore-order.patch deleted file mode 100644 index b7772c3b04b1e..0000000000000 --- a/pci/pci-reverse-pci-config-space-restore-order.patch +++ /dev/null @@ -1,47 +0,0 @@ -From akpm@osdl.org Tue Apr 25 14:58:32 2006 -Message-Id: <200604250701.k3P71orx015389@shell0.pdx.osdl.net> -Subject: PCI: reverse pci config space restore order -To: luming.yu@intel.com, greg@kroah.com, mm-commits@vger.kernel.org -From: akpm@osdl.org -Date: Tue, 25 Apr 2006 00:00:34 -0700 - -From: "Yu, Luming" <luming.yu@intel.com> - -According to Intel ICH spec, there are several rules that Base Address -should be programmed before IOSE (PCICMD register ) enabled. - -For example ICH7: - -12.1.3 SATA : the base address register for the bus master register - should be programmed before this bit is set. - -11.1.3: PCICMD (USB): The base address register for USB should be - programmed before this bit is set. -.... - -To make sure kernel code follow this rule , and prevent unnecessary -confusion. I proposal this patch. - -Signed-off-by: Luming Yu <luming.yu@intel.com> -Signed-off-by: Andrew Morton <akpm@osdl.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/pci/pci.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - ---- gregkh-2.6.orig/drivers/pci/pci.c -+++ gregkh-2.6/drivers/pci/pci.c -@@ -463,7 +463,11 @@ pci_restore_state(struct pci_dev *dev) - int i; - int val; - -- for (i = 0; i < 16; i++) { -+ /* -+ * The Base Address register should be programmed before the command -+ * register(s) -+ */ -+ for (i = 15; i >= 0; i--) { - pci_read_config_dword(dev, i * 4, &val); - if (val != dev->saved_config_space[i]) { - printk(KERN_DEBUG "PM: Writing back config space on " |