From 35c97a0f45c4567631a1805a62dab8ffd961e848 Mon Sep 17 00:00:00 2001
From: skrll <skrll@NetBSD.org>
Date: Wed, 1 Mar 2017 16:44:54 +0000
Subject: [PATCH] Set xscale_cache_clean_addr appropriately and re-arrange
 default KVA layout to allow direct map for all boards.

OVERO/DUOVERO/PEPPER aren't tested.

PR/52010: Regression: Gumstix Verdex is hanging in enabling cache + KASSERT ram_size
---
 sys/arch/evbarm/gumstix/gumstix_machdep.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/sys/arch/evbarm/gumstix/gumstix_machdep.c b/sys/arch/evbarm/gumstix/gumstix_machdep.c
index cd0c0da26c10..402d2db40aeb 100644
--- a/sys/arch/evbarm/gumstix/gumstix_machdep.c
+++ b/sys/arch/evbarm/gumstix/gumstix_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: gumstix_machdep.c,v 1.57 2016/10/20 09:53:08 skrll Exp $ */
+/*	$NetBSD: gumstix_machdep.c,v 1.58 2017/03/01 16:44:54 skrll Exp $ */
 /*
  * Copyright (C) 2005, 2006, 2007  WIDE Project and SOUM Corporation.
  * All rights reserved.
@@ -206,13 +206,16 @@
 #endif
 
 /*
- * The range 0xc1000000 - 0xcfffffff is available for kernel VM space
- * Core-logic registers and I/O mappings occupy 0xfd000000 - 0xffffffff
+ * The range 0xc1000000 - 0xfd000000 is available for kernel VM space
+ * Core-logic registers and I/O mappings occupy
+ *
+ *    0xfd000000 - 0xfd800000	on gumstix
+ *    0xc0000000 - 0xc0400000	on overo, duovero and pepper
  */
 #ifndef KERNEL_VM_BASE
-#define	KERNEL_VM_BASE		0xc1000000
+#define	KERNEL_VM_BASE		0xc8000000
 #endif
-#define KERNEL_VM_SIZE		0x0f000000
+#define KERNEL_VM_SIZE		0x35000000
 
 BootConfig bootconfig;		/* Boot config storage */
 static char bootargs[MAX_BOOT_STRING];
@@ -487,6 +490,9 @@ initarm(void *arg)
 	 */
 
 #if defined(CPU_XSCALE)
+	extern vaddr_t xscale_cache_clean_addr;
+	xscale_cache_clean_addr = 0xff000000U;
+
 	cpu_reset_address = NULL;
 #elif defined(OMAP2)
 	cpu_reset_address = omap_reset;