From 341c6fdce80d80ffa7153bc1c59b754e463dfac4 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Thu, 4 Nov 2010 12:32:24 +0900
Subject: [PATCH] --- yaml --- r: 221667 b: refs/heads/master c:
 e2fcf74f3d3dabe8591732cd37869a0cc88ed7a5 h: refs/heads/master i:   221665:
 41a2b4e74aebf0ff049ec8df842e10b0995e15b8   221663:
 3294a30d64f871ad830b69b7ca6b6c2a33e347b3 v: v3

---
 [refs]                                |  2 +-
 trunk/arch/sh/Kconfig                 |  1 +
 trunk/arch/sh/include/asm/addrspace.h |  8 ++++----
 trunk/arch/sh/mm/Kconfig              |  2 +-
 trunk/arch/sh/mm/consistent.c         | 15 +++++++--------
 trunk/arch/sh/mm/uncached.c           |  2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index ed3cc7ee3951..297646808c23 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e96ce8ebfd7427c7ce335028f6619fb549f366b2
+refs/heads/master: e2fcf74f3d3dabe8591732cd37869a0cc88ed7a5
diff --git a/trunk/arch/sh/Kconfig b/trunk/arch/sh/Kconfig
index 5c075f562eba..7f217b3a50a8 100644
--- a/trunk/arch/sh/Kconfig
+++ b/trunk/arch/sh/Kconfig
@@ -193,6 +193,7 @@ config CPU_SH2
 config CPU_SH2A
 	bool
 	select CPU_SH2
+	select UNCACHED_MAPPING
 
 config CPU_SH3
 	bool
diff --git a/trunk/arch/sh/include/asm/addrspace.h b/trunk/arch/sh/include/asm/addrspace.h
index 446b3831c214..3d1ae2bfaa6f 100644
--- a/trunk/arch/sh/include/asm/addrspace.h
+++ b/trunk/arch/sh/include/asm/addrspace.h
@@ -44,10 +44,10 @@
 /*
  * These will never work in 32-bit, don't even bother.
  */
-#define P1SEGADDR(a)	__futile_remapping_attempt
-#define P2SEGADDR(a)	__futile_remapping_attempt
-#define P3SEGADDR(a)	__futile_remapping_attempt
-#define P4SEGADDR(a)	__futile_remapping_attempt
+#define P1SEGADDR(a)	({ (void)(a); BUG(); NULL; })
+#define P2SEGADDR(a)	({ (void)(a); BUG(); NULL; })
+#define P3SEGADDR(a)	({ (void)(a); BUG(); NULL; })
+#define P4SEGADDR(a)	({ (void)(a); BUG(); NULL; })
 #endif
 #endif /* P1SEG */
 
diff --git a/trunk/arch/sh/mm/Kconfig b/trunk/arch/sh/mm/Kconfig
index 09370392aff1..c3e61b366493 100644
--- a/trunk/arch/sh/mm/Kconfig
+++ b/trunk/arch/sh/mm/Kconfig
@@ -79,7 +79,7 @@ config 29BIT
 
 config 32BIT
 	bool
-	default y if CPU_SH5
+	default y if CPU_SH5 || !MMU
 
 config PMB
 	bool "Support 32-bit physical addressing through PMB"
diff --git a/trunk/arch/sh/mm/consistent.c b/trunk/arch/sh/mm/consistent.c
index 038793286990..40733a952402 100644
--- a/trunk/arch/sh/mm/consistent.c
+++ b/trunk/arch/sh/mm/consistent.c
@@ -79,21 +79,20 @@ void dma_generic_free_coherent(struct device *dev, size_t size,
 void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
 		    enum dma_data_direction direction)
 {
-#if defined(CONFIG_CPU_SH5) || defined(CONFIG_PMB)
-	void *p1addr = vaddr;
-#else
-	void *p1addr = (void*) P1SEGADDR((unsigned long)vaddr);
-#endif
+	void *addr;
+
+	addr = __in_29bit_mode() ?
+	       (void *)P1SEGADDR((unsigned long)vaddr) : vaddr;
 
 	switch (direction) {
 	case DMA_FROM_DEVICE:		/* invalidate only */
-		__flush_invalidate_region(p1addr, size);
+		__flush_invalidate_region(addr, size);
 		break;
 	case DMA_TO_DEVICE:		/* writeback only */
-		__flush_wback_region(p1addr, size);
+		__flush_wback_region(addr, size);
 		break;
 	case DMA_BIDIRECTIONAL:		/* writeback and invalidate */
-		__flush_purge_region(p1addr, size);
+		__flush_purge_region(addr, size);
 		break;
 	default:
 		BUG();
diff --git a/trunk/arch/sh/mm/uncached.c b/trunk/arch/sh/mm/uncached.c
index 8a4eca551fc0..a7767da815e9 100644
--- a/trunk/arch/sh/mm/uncached.c
+++ b/trunk/arch/sh/mm/uncached.c
@@ -28,7 +28,7 @@ EXPORT_SYMBOL(virt_addr_uncached);
 
 void __init uncached_init(void)
 {
-#ifdef CONFIG_29BIT
+#if defined(CONFIG_29BIT) || !defined(CONFIG_MMU)
 	uncached_start = P2SEG;
 #else
 	uncached_start = memory_end;