rpms/kernel/F-11 linux-2.6-ppc64-vs-broadcom.patch,1.1.2.2,1.1.2.3

[David Woodhouse]

Author: dwmw2

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30651

Modified Files:
      Tag: private-fedora-11-2_6_29_6
	linux-2.6-ppc64-vs-broadcom.patch 
Log Message:
oops, revert changes to original patch file. I copied what we had in other branches and put the fixes in separate files

linux-2.6-ppc64-vs-broadcom.patch:
 dma.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

Index: linux-2.6-ppc64-vs-broadcom.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/linux-2.6-ppc64-vs-broadcom.patch,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -p -r1.1.2.2 -r1.1.2.3
--- linux-2.6-ppc64-vs-broadcom.patch	8 Sep 2009 08:11:59 -0000	1.1.2.2
+++ linux-2.6-ppc64-vs-broadcom.patch	8 Sep 2009 08:21:26 -0000	1.1.2.3
@@ -1,49 +1,21 @@
-commit b2f2e8fee3d62f621e795f25b2fc0f51bbdb4af9
-Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
-Date:   Mon Aug 10 16:36:38 2009 +1000
-
-    powerpc/dma: pci_set_dma_mask() shouldn't fail if mask fits in RAM
-    
-    On an iMac G5, the b43 driver is failing to initialise because trying to
-    set the dma mask to 30-bit fails. Even though there's only 512MiB of RAM
-    in the machine anyway:
-        https://bugzilla.redhat.com/show_bug.cgi?id=514787
-    
-    We should probably let it succeed if the available RAM in the system
-    doesn't exceed the requested limit.
-    
-    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
-    Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
-
-commit 4f8ee2c9cc0e885d2bb50ef26db66150ab25213e
-Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
-Date:   Thu Aug 27 17:20:30 2009 +1000
-
-    lmb: Remove __init from lmb_end_of_DRAM()
-    
-    We call lmb_end_of_DRAM() to test whether a DMA mask is ok on a machine
-    without IOMMU, but this function is marked as __init.
-    
-    I don't think there's a clean way to get the top of RAM max_pfn doesn't
-    appear to include highmem or I missed (or we have a bug :-) so for now,
-    let's just avoid having a broken 2.6.31 by making this function
-    non-__init and we can revisit later.
-    
-    Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
-    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
-
-commit 1a37f184fa7824982a5f434c06981ec46a66cef7
-Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
-Date:   Mon Aug 31 13:48:16 2009 +1000
-
-    lmb: Also remove __init from lmb_end_of_RAM() declaration in lmb.h
-    
-    My previous patch (commit 4f8ee2c9cc: "lmb: Remove __init from
-    lmb_end_of_DRAM()") removed __init in lmb.c but missed the fact that it
-    was also marked as such in the .h
-    
-    Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
-    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+From b2f2e8fee3d62f621e795f25b2fc0f51bbdb4af9 Mon Sep 17 00:00:00 2001
+From: Benjamin Herrenschmidt <benh at kernel.crashing.org>
+Date: Mon, 10 Aug 2009 16:36:38 +1000
+Subject: [PATCH] powerpc/dma: pci_set_dma_mask() shouldn't fail if mask fits in RAM
+
+On an iMac G5, the b43 driver is failing to initialise because trying to
+set the dma mask to 30-bit fails. Even though there's only 512MiB of RAM
+in the machine anyway:
+	https://bugzilla.redhat.com/show_bug.cgi?id=514787
+
+We should probably let it succeed if the available RAM in the system
+doesn't exceed the requested limit.
+
+Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
+Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
+---
+ arch/powerpc/kernel/dma.c |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c
 index 20a60d6..ccf129d 100644
@@ -66,34 +38,11 @@ index 20a60d6..ccf129d 100644
 +	/* Could be improved so platforms can set the limit in case
  	 * they have limited DMA windows
  	 */
--	return mask >= DMA_32BIT_MASK;
+-	return mask >= DMA_BIT_MASK(32);
 +	return mask >= (lmb_end_of_DRAM() - 1);
  #else
  	return 1;
  #endif
-diff --git a/include/linux/lmb.h b/include/linux/lmb.h
-index c46c895..2442e3f 100644
---- a/include/linux/lmb.h
-+++ b/include/linux/lmb.h
-@@ -51,7 +51,7 @@ extern u64 __init lmb_alloc_base(u64 size,
- extern u64 __init __lmb_alloc_base(u64 size,
- 		u64 align, u64 max_addr);
- extern u64 __init lmb_phys_mem_size(void);
--extern u64 __init lmb_end_of_DRAM(void);
-+extern u64 lmb_end_of_DRAM(void);
- extern void __init lmb_enforce_memory_limit(u64 memory_limit);
- extern int __init lmb_is_reserved(u64 addr);
- extern int lmb_find(struct lmb_property *res);
-diff --git a/lib/lmb.c b/lib/lmb.c
-index e4a6482..0343c05 100644
---- a/lib/lmb.c
-+++ b/lib/lmb.c
-@@ -429,7 +429,7 @@ u64 __init lmb_phys_mem_size(void)
- 	return lmb.memory.size;
- }
- 
--u64 __init lmb_end_of_DRAM(void)
-+u64 lmb_end_of_DRAM(void)
- {
- 	int idx = lmb.memory.cnt - 1;
- 
+-- 
+1.6.2.5
+