xtensa: avoid duplicate of IO range definitions

Define IO addresses in a single place, to make it easier to change for
non-standard memory maps.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>

diff --git a/arch/xtensa/include/asm/initialize_mmu.h b/arch/xtensa/include/asm/initialize_mmu.h
index 722553f..a2078a2 100644 (file)
--- a/arch/xtensa/include/asm/initialize_mmu.h
+++ b/arch/xtensa/include/asm/initialize_mmu.h
@@ -123,13 +123,13 @@
        wdtlb   a4, a5
        witlb   a4, a5
 
-       movi    a5, 0xe0000006
-       movi    a4, 0xf0000000 + CA_WRITEBACK
+       movi    a5, XCHAL_KIO_CACHED_VADDR + 6
+       movi    a4, XCHAL_KIO_PADDR + CA_WRITEBACK
        wdtlb   a4, a5
        witlb   a4, a5
 
-       movi    a5, 0xf0000006
-       movi    a4, 0xf0000000 + CA_BYPASS
+       movi    a5, XCHAL_KIO_BYPASS_VADDR + 6
+       movi    a4, XCHAL_KIO_PADDR + CA_BYPASS
        wdtlb   a4, a5
        witlb   a4, a5
 

diff --git a/arch/xtensa/include/asm/io.h b/arch/xtensa/include/asm/io.h
index 700c2e6..1482a36 100644 (file)
--- a/arch/xtensa/include/asm/io.h
+++ b/arch/xtensa/include/asm/io.h
@@ -14,16 +14,12 @@
 #ifdef __KERNEL__
 #include <asm/byteorder.h>
 #include <asm/page.h>
+#include <asm/vectors.h>
 #include <linux/bug.h>
 #include <linux/kernel.h>
 
 #include <linux/types.h>
 
-#define XCHAL_KIO_CACHED_VADDR 0xe0000000
-#define XCHAL_KIO_BYPASS_VADDR 0xf0000000
-#define XCHAL_KIO_PADDR                0xf0000000
-#define XCHAL_KIO_SIZE         0x10000000
-
 #define IOADDR(x)              (XCHAL_KIO_BYPASS_VADDR + (x))
 #define IO_SPACE_LIMIT ~0
 

diff --git a/arch/xtensa/include/asm/vectors.h b/arch/xtensa/include/asm/vectors.h
index 37e073b..221a60d 100644 (file)
--- a/arch/xtensa/include/asm/vectors.h
+++ b/arch/xtensa/include/asm/vectors.h
@@ -20,6 +20,11 @@
 
 #include <variant/core.h>
 
+#define XCHAL_KIO_CACHED_VADDR         0xe0000000
+#define XCHAL_KIO_BYPASS_VADDR         0xf0000000
+#define XCHAL_KIO_PADDR                        0xf0000000
+#define XCHAL_KIO_SIZE                 0x10000000
+
 #if defined(CONFIG_MMU)
 
 /* Will Become VECBASE */