more patches

3 files changed, 122 insertions, 0 deletions

diff --git a/pci/pci-fix-sparse-warning-about-pci_bus_flags.patch b/pci/pci-fix-sparse-warning-about-pci_bus_flags.patch
new file mode 100644
index 0000000000000..2ac90d6b16b6f
--- /dev/null
+++ b/pci/pci-fix-sparse-warning-about-pci_bus_flags.patch
@@ -0,0 +1,34 @@
+From rdreier@cisco.com Thu Mar 30 12:55:17 2006
+To: greg@kroah.com
+Cc: <mst@mellanox.co.il>
+Subject: PCI: fix sparse warning about pci_bus_flags
+From: Roland Dreier <rdreier@cisco.com>
+Date: Thu, 30 Mar 2006 12:55:10 -0800
+Message-ID: <adamzf71wlt.fsf@cisco.com>
+
+Sparse warns about casting to a __bitwise type.  However, it's correct
+to do when defining the enum for pci_bus_flags_t, so add a __force to
+quiet the warnings.  This will fix getting
+
+    include/linux/pci.h:100:26: warning: cast to restricted type
+
+from sparse all over the build.
+
+Signed-off-by: Roland Dreier <rolandd@cisco.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ include/linux/pci.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- gregkh-2.6.orig/include/linux/pci.h
++++ gregkh-2.6/include/linux/pci.h
+@@ -97,7 +97,7 @@ enum pci_channel_state {
+ 
+ typedef unsigned short __bitwise pci_bus_flags_t;
+ enum pci_bus_flags {
+-	PCI_BUS_FLAGS_NO_MSI = (pci_bus_flags_t) 1,
++	PCI_BUS_FLAGS_NO_MSI = (__force pci_bus_flags_t) 1,
+ };
+ 
+ struct pci_cap_saved_state {
diff --git a/pci/pci-rpaphp-remove-init-error-condition.patch b/pci/pci-rpaphp-remove-init-error-condition.patch
new file mode 100644
index 0000000000000..2e3098259dbc5
--- /dev/null
+++ b/pci/pci-rpaphp-remove-init-error-condition.patch
@@ -0,0 +1,36 @@
+From johnrose@austin.ibm.com Thu Mar 23 12:20:48 2006
+Subject: PCI: rpaphp: remove init error condition
+From: John Rose <johnrose@austin.ibm.com>
+To: Greg KH <greg@kroah.com>
+Message-Id: <1143145274.2567.2.camel@sinatra.austin.ibm.com>
+Date: Thu, 23 Mar 2006 14:21:14 -0600
+
+The init function for the RPA PCI Hotplug driver returns -ENODEV in the
+case that no hotplug-capable slots are detected in the system.  This is
+bad, since hot-capable slots can be added after boot to a purely virtual
+POWER partition.  This is also bad because DLPAR I/O operations depend
+on the rpaphp module.
+
+Change the rpaphp init module to return success for the case of
+partitions that own no hotplug-capable slots at boot.  Such slots can be
+dynamically added after boot.
+
+Signed-off-by: John Rose <johnrose@austin.ibm.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/pci/hotplug/rpaphp_core.c |    3 ---
+ 1 file changed, 3 deletions(-)
+
+--- gregkh-2.6.orig/drivers/pci/hotplug/rpaphp_core.c
++++ gregkh-2.6/drivers/pci/hotplug/rpaphp_core.c
+@@ -360,9 +360,6 @@ static int __init rpaphp_init(void)
+ 	while ((dn = of_find_node_by_type(dn, "pci")))
+ 		rpaphp_add_slot(dn);
+ 
+-	if (!num_slots)
+-		return -ENODEV;
+-
+ 	return 0;
+ }
+ 
diff --git a/pci/pci_ids.h-correct-naming-of-1022-7450.patch b/pci/pci_ids.h-correct-naming-of-1022-7450.patch
new file mode 100644
index 0000000000000..05bb661939b1a
--- /dev/null
+++ b/pci/pci_ids.h-correct-naming-of-1022-7450.patch
@@ -0,0 +1,52 @@
+From linville@tuxdriver.com Mon Mar 20 11:34:09 2006
+Date: Mon, 20 Mar 2006 14:33:56 -0500
+From: "John W. Linville" <linville@tuxdriver.com>
+To: linux-kernel@vger.kernel.org
+Cc: gregkh@suse.de
+Subject: pci_ids.h: correct naming of 1022:7450 (AMD 8131 Bridge)
+Message-ID: <20060320193351.GC15746@tuxdriver.com>
+Content-Disposition: inline
+
+The naming of the constant defined for PCI ID 1022:7450 does not seem
+to match the information at http://pciids.sourceforge.net/:
+
+	http://pci-ids.ucw.cz/iii/?i=1022
+
+There 1022:7450 is listed as "AMD-8131 PCI-X Bridge" while 1022:7451
+is listed as "AMD-8131 PCI-X IOAPIC".  Yet, the current definition for
+0x7450 is PCI_DEVICE_ID_AMD_8131_APIC.	It seems to me like that name
+should map to 0x7451, while a name like PCI_DEVICE_ID_AMD_8131_BRIDGE
+should map to 0x7450.
+
+Signed-off-by: John W. Linville <linville@tuxdriver.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+---
+
+---
+ drivers/pci/quirks.c    |    2 +-
+ include/linux/pci_ids.h |    3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+--- gregkh-2.6.orig/drivers/pci/quirks.c
++++ gregkh-2.6/drivers/pci/quirks.c
+@@ -592,7 +592,7 @@ static void __init quirk_amd_8131_ioapic
+                 pci_write_config_byte( dev, AMD8131_MISC, tmp);
+         }
+ } 
+-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_APIC,         quirk_amd_8131_ioapic ); 
++DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_BRIDGE, quirk_amd_8131_ioapic);
+ 
+ static void __init quirk_svw_msi(struct pci_dev *dev)
+ {
+--- gregkh-2.6.orig/include/linux/pci_ids.h
++++ gregkh-2.6/include/linux/pci_ids.h
+@@ -497,7 +497,8 @@
+ #define PCI_DEVICE_ID_AMD_8111_SMBUS	0x746b
+ #define PCI_DEVICE_ID_AMD_8111_AUDIO	0x746d
+ #define PCI_DEVICE_ID_AMD_8151_0	0x7454
+-#define PCI_DEVICE_ID_AMD_8131_APIC     0x7450
++#define PCI_DEVICE_ID_AMD_8131_BRIDGE	0x7450
++#define PCI_DEVICE_ID_AMD_8131_APIC	0x7451
+ #define PCI_DEVICE_ID_AMD_CS5536_ISA    0x2090
+ #define PCI_DEVICE_ID_AMD_CS5536_FLASH  0x2091
+ #define PCI_DEVICE_ID_AMD_CS5536_AUDIO  0x2093