4 files changed, 31 insertions, 5 deletions

diff --git a/arch/ppc/platforms/4xx/ebony.c b/arch/ppc/platforms/4xx/ebony.c
index cd11734ef7c5..509e69a095f0 100644
--- a/arch/ppc/platforms/4xx/ebony.c
+++ b/arch/ppc/platforms/4xx/ebony.c
@@ -7,7 +7,7 @@
  * Copyright 2002-2005 MontaVista Software Inc.
  *
  * Eugene Surovegin <eugene.surovegin@zultys.com> or <ebs@ebshome.net>
- * Copyright (c) 2003, 2004 Zultys Technologies
+ * Copyright (c) 2003-2005 Zultys Technologies
  *
  * This program is free software; you can redistribute  it and/or modify it
  * under  the terms of  the GNU General  Public License as published by the
@@ -50,6 +50,7 @@
 #include <asm/bootinfo.h>
 #include <asm/ppc4xx_pic.h>
 #include <asm/ppcboot.h>
+#include <asm/tlbflush.h>
 
 #include <syslib/gen550.h>
 #include <syslib/ibm440gp_common.h>
@@ -248,6 +249,9 @@ ebony_early_serial_map(void)
 #if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB)
         /* Configure debug serial access */
         gen550_init(0, &port);
+
+        /* Purge TLB entry added in head_44x.S for early serial access */
+        _tlbie(UART0_IO_BASE);
 #endif
 
         port.membase = ioremap64(PPC440GP_UART1_ADDR, 8);
diff --git a/arch/ppc/platforms/4xx/ebony.h b/arch/ppc/platforms/4xx/ebony.h
index 47c391c9174d..d08faa46a0ae 100644
--- a/arch/ppc/platforms/4xx/ebony.h
+++ b/arch/ppc/platforms/4xx/ebony.h
@@ -56,9 +56,18 @@
  * Serial port defines
  */
 
-/* OpenBIOS defined UART mappings, used before early_serial_setup */
+#if defined(__BOOTER__)
+/* OpenBIOS defined UART mappings, used by bootloader shim */
 #define UART0_IO_BASE   0xE0000200
 #define UART1_IO_BASE   0xE0000300
+#else
+/* head_44x.S created UART mapping, used before early_serial_setup.
+ * We cannot use default OpenBIOS UART mappings because they
+ * don't work for configurations with more than 512M RAM.    --ebs
+ */
+#define UART0_IO_BASE   0xF0000200
+#define UART1_IO_BASE   0xF0000300
+#endif
 
 /* external Epson SG-615P */
 #define BASE_BAUD       691200
@@ -66,7 +75,7 @@
 #define STD_UART_OP(num)                                        \
         { 0, BASE_BAUD, 0, UART##num##_INT,                     \
                 (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST),        \
-                iomem_base: UART##num##_IO_BASE,                \
+                iomem_base: (void*)UART##num##_IO_BASE,         \
                 io_type: SERIAL_IO_MEM},
 
 #define SERIAL_PORT_DFNS        \
diff --git a/arch/ppc/platforms/4xx/ocotea.c b/arch/ppc/platforms/4xx/ocotea.c
index 5f82a6bc7046..8fc34a344769 100644
--- a/arch/ppc/platforms/4xx/ocotea.c
+++ b/arch/ppc/platforms/4xx/ocotea.c
@@ -48,6 +48,7 @@
 #include <asm/bootinfo.h>
 #include <asm/ppc4xx_pic.h>
 #include <asm/ppcboot.h>
+#include <asm/tlbflush.h>
 
 #include <syslib/gen550.h>
 #include <syslib/ibm440gx_common.h>
@@ -266,6 +267,9 @@ ocotea_early_serial_map(void)
 #if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB)
         /* Configure debug serial access */
         gen550_init(0, &port);
+
+        /* Purge TLB entry added in head_44x.S for early serial access */
+        _tlbie(UART0_IO_BASE);
 #endif
 
         port.membase = ioremap64(PPC440GX_UART1_ADDR, 8);
diff --git a/arch/ppc/platforms/4xx/ocotea.h b/arch/ppc/platforms/4xx/ocotea.h
index 202dc8251190..33251153ac5f 100644
--- a/arch/ppc/platforms/4xx/ocotea.h
+++ b/arch/ppc/platforms/4xx/ocotea.h
@@ -55,15 +55,24 @@
  */
 #define RS_TABLE_SIZE   2
 
-/* OpenBIOS defined UART mappings, used before early_serial_setup */
+#if defined(__BOOTER__)
+/* OpenBIOS defined UART mappings, used by bootloader shim */
 #define UART0_IO_BASE   0xE0000200
 #define UART1_IO_BASE   0xE0000300
+#else
+/* head_44x.S created UART mapping, used before early_serial_setup.
+ * We cannot use default OpenBIOS UART mappings because they
+ * don't work for configurations with more than 512M RAM.    --ebs
+ */
+#define UART0_IO_BASE   0xF0000200
+#define UART1_IO_BASE   0xF0000300
+#endif
 
 #define BASE_BAUD       11059200/16
 #define STD_UART_OP(num)                                        \
         { 0, BASE_BAUD, 0, UART##num##_INT,                     \
                 (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST),        \
-                iomem_base: UART##num##_IO_BASE,                \
+                iomem_base: (void*)UART##num##_IO_BASE,         \
                 io_type: SERIAL_IO_MEM},
 
 #define SERIAL_PORT_DFNS        \