add some pci patches

3 files changed, 113 insertions, 0 deletions

diff --git a/pci/pci-convert-megaraid-to-use-pci_driver-shutdown-method.patch b/pci/pci-convert-megaraid-to-use-pci_driver-shutdown-method.patch
new file mode 100644
index 0000000000000..f0b86f5c86597
--- /dev/null
+++ b/pci/pci-convert-megaraid-to-use-pci_driver-shutdown-method.patch
@@ -0,0 +1,52 @@
+From rmk+greg=kroah.com@arm.linux.org.uk Sun Oct 16 13:35:57 2005
+Date: Sun, 16 Oct 2005 21:32:46 +0100
+From: Russell King <rmk+lkml@arm.linux.org.uk>
+To: Andrew Morton <akpm@osdl.org>, Greg KH <greg@kroah.com>, <Neela.Kolli@engenio.com>
+Subject: PCI: Convert megaraid to use pci_driver shutdown method
+Message-ID: <20051016203246.GE14413@flint.arm.linux.org.uk>
+Content-Disposition: inline
+
+Convert megaraid to use pci_driver's shutdown method rather than
+the generic device_driver shutdown method.
+
+Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/scsi/megaraid/megaraid_mbox.c |   10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+--- gregkh-2.6.orig/drivers/scsi/megaraid/megaraid_mbox.c
++++ gregkh-2.6/drivers/scsi/megaraid/megaraid_mbox.c
+@@ -76,7 +76,7 @@ static void megaraid_exit(void);
+ 
+ static int megaraid_probe_one(struct pci_dev*, const struct pci_device_id *);
+ static void megaraid_detach_one(struct pci_dev *);
+-static void megaraid_mbox_shutdown(struct device *);
++static void megaraid_mbox_shutdown(struct pci_dev *);
+ 
+ static int megaraid_io_attach(adapter_t *);
+ static void megaraid_io_detach(adapter_t *);
+@@ -369,9 +369,7 @@ static struct pci_driver megaraid_pci_dr
+ 	.id_table	= pci_id_table_g,
+ 	.probe		= megaraid_probe_one,
+ 	.remove		= __devexit_p(megaraid_detach_one),
+-	.driver		= {
+-		.shutdown	= megaraid_mbox_shutdown,
+-	}
++	.shutdown	= megaraid_mbox_shutdown,
+ };
+ 
+ 
+@@ -673,9 +671,9 @@ megaraid_detach_one(struct pci_dev *pdev
+  * Shutdown notification, perform flush cache
+  */
+ static void
+-megaraid_mbox_shutdown(struct device *device)
++megaraid_mbox_shutdown(struct pci_dev *pdev)
+ {
+-	adapter_t		*adapter = pci_get_drvdata(to_pci_dev(device));
++	adapter_t		*adapter = pci_get_drvdata(pdev);
+ 	static int		counter;
+ 
+ 	if (!adapter) {
diff --git a/pci/pci-fix-edac-drivers-for-radisys-82600-borkage.patch b/pci/pci-fix-edac-drivers-for-radisys-82600-borkage.patch
new file mode 100644
index 0000000000000..a27c03150f957
--- /dev/null
+++ b/pci/pci-fix-edac-drivers-for-radisys-82600-borkage.patch
@@ -0,0 +1,29 @@
+From akpm@osdl.org Sat Oct 15 22:03:34 2005
+Message-Id: <200510160502.j9G52nX8003445@shell0.pdx.osdl.net>
+Subject: PCI: fix edac drivers for radisys 82600 borkage
+From: akpm@osdl.org
+Date: Sat, 15 Oct 2005 22:02:19 -0700
+
+
+From: Andrew Morton <akpm@osdl.org>
+
+I told you that the pci_ids.h cleanup was a bad idea ;)
+
+Cc: Alan Cox <alan@redhat.com>
+Signed-off-by: Andrew Morton <akpm@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ include/linux/pci_ids.h |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- gregkh-2.6.orig/include/linux/pci_ids.h
++++ gregkh-2.6/include/linux/pci_ids.h
+@@ -1609,6 +1609,7 @@
+ #define PCI_DEVICE_ID_SIIG_2S1P_20x_850	0x2062
+ #define PCI_SUBDEVICE_ID_SIIG_QUARTET_SERIAL	0x2050
+ 
++#define PCI_VENDOR_ID_RADISYS		0x1331
+ 
+ #define PCI_VENDOR_ID_DOMEX		0x134a
+ #define PCI_DEVICE_ID_DOMEX_DMX3191D	0x0001
diff --git a/pci/pci-fixup-pci-driver-shutdown.patch b/pci/pci-fixup-pci-driver-shutdown.patch
new file mode 100644
index 0000000000000..359fdda8dd0cc
--- /dev/null
+++ b/pci/pci-fixup-pci-driver-shutdown.patch
@@ -0,0 +1,32 @@
+From rmk+greg=kroah.com@arm.linux.org.uk Sun Oct 16 13:35:53 2005
+Date: Sun, 16 Oct 2005 21:31:36 +0100
+From: Russell King <rmk+lkml@arm.linux.org.uk>
+To: Andrew Morton <akpm@osdl.org>, Greg KH <greg@kroah.com>
+Subject: PCI: Fixup PCI driver shutdown
+Message-ID: <20051016203135.GD14413@flint.arm.linux.org.uk>
+Content-Disposition: inline
+
+Add a warning to pci driver registration code so that we know
+whether we have drivers using the obsolete driver shutdown
+method.
+
+Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/pci/pci-driver.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- gregkh-2.6.orig/drivers/pci/pci-driver.c
++++ gregkh-2.6/drivers/pci/pci-driver.c
+@@ -377,6 +377,10 @@ int pci_register_driver(struct pci_drive
+ 	 * the pci shutdown function, this test can go away. */
+ 	if (!drv->driver.shutdown)
+ 		drv->driver.shutdown = pci_device_shutdown;
++	else
++		printk(KERN_WARNING "Warning: PCI driver %s has a struct "
++			"device_driver shutdown method, please update!\n",
++			drv->name);
+ 	drv->driver.owner = drv->owner;
+ 	drv->driver.kobj.ktype = &pci_driver_kobj_type;
+