diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2007-07-10 12:32:56 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2007-07-10 12:32:56 -0400 |
commit | 8bb809df6919f927bcb910bbc852d5724eaa1eb9 (patch) | |
tree | 5861d9b96d7b036a0b9cfe3445deaabd15dad3a2 | |
parent | b3f6df9f21c6efc4641613188204aa0742bc9e22 (diff) |
[MIPS] Cleanup TO_PHYS_MASK definition
No point in adding yet another #ifdef for Loongson since all this mask is
being used for is converting an XKPHYS address into a physical address
anyway. So replace all definitions by one with the highest architectural
possible value.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r-- | include/asm-mips/addrspace.h | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/include/asm-mips/addrspace.h b/include/asm-mips/addrspace.h index 964c5eddc21b..0b3ff9c48409 100644 --- a/include/asm-mips/addrspace.h +++ b/include/asm-mips/addrspace.h | |||
@@ -129,29 +129,12 @@ | |||
129 | #define PHYS_TO_XKPHYS(cm,a) (_CONST64_(0x8000000000000000) | \ | 129 | #define PHYS_TO_XKPHYS(cm,a) (_CONST64_(0x8000000000000000) | \ |
130 | ((cm)<<59) | (a)) | 130 | ((cm)<<59) | (a)) |
131 | 131 | ||
132 | #if defined (CONFIG_CPU_R4300) \ | 132 | /* |
133 | || defined (CONFIG_CPU_R4X00) \ | 133 | * The ultimate limited of the 64-bit MIPS architecture: 2 bits for selecting |
134 | || defined (CONFIG_CPU_R5000) \ | 134 | * the region, 3 bits for the CCA mode. This leaves 59 bits of which the |
135 | || defined (CONFIG_CPU_RM7000) \ | 135 | * R8000 implements most with its 48-bit physical address space. |
136 | || defined (CONFIG_CPU_RM9000) \ | 136 | */ |
137 | || defined (CONFIG_CPU_NEVADA) \ | 137 | #define TO_PHYS_MASK _CONST64_(0x07ffffffffffffff) /* 2^^59 - 1 */ |
138 | || defined (CONFIG_CPU_TX49XX) \ | ||
139 | || defined (CONFIG_CPU_MIPS64) | ||
140 | #define TO_PHYS_MASK _CONST64_(0x0000000fffffffff) /* 2^^36 - 1 */ | ||
141 | #endif | ||
142 | |||
143 | #if defined (CONFIG_CPU_R8000) | ||
144 | /* We keep KUSIZE consistent with R4000 for now (2^^40) instead of (2^^48) */ | ||
145 | #define TO_PHYS_MASK _CONST64_(0x000000ffffffffff) /* 2^^40 - 1 */ | ||
146 | #endif | ||
147 | |||
148 | #if defined (CONFIG_CPU_R10000) | ||
149 | #define TO_PHYS_MASK _CONST64_(0x000000ffffffffff) /* 2^^40 - 1 */ | ||
150 | #endif | ||
151 | |||
152 | #if defined(CONFIG_CPU_SB1) || defined(CONFIG_CPU_SB1A) | ||
153 | #define TO_PHYS_MASK _CONST64_(0x00000fffffffffff) /* 2^^44 - 1 */ | ||
154 | #endif | ||
155 | 138 | ||
156 | #ifndef CONFIG_CPU_R8000 | 139 | #ifndef CONFIG_CPU_R8000 |
157 | 140 | ||