[Top] [All Lists]

[PATCH 4/4] Fix PHYS_OFFSET for 64-bits kernels with 32-bits symbols

Subject: [PATCH 4/4] Fix PHYS_OFFSET for 64-bits kernels with 32-bits symbols
From: Franck Bui-Huu <>
Date: Tue, 27 Mar 2007 11:19:40 +0200
Dkim-signature: a=rsa-sha1; c=relaxed/relaxed;; s=beta; h=domainkey-signature:received:received:received:to:cc:subject:date:message-id:x-mailer:in-reply-to:references:from; b=aI8Y5XZdot2kFk6MqMcS2JWjg+QXLpUYp/C3wWtRlpwXvZ2lJHUB+vWthxfhu8MU0twI1hXHssp1ykq2+WaGigeVMsdofHl2G1bFV1FAp7CQb/JnySjEYHJo5G1LXsTsAuuZPXhAC/Y/i8Hh7cZKloB39XZMW0ZghNIzOsSFOjw=
Domainkey-signature: a=rsa-sha1; c=nofws;; s=beta; h=received:to:cc:subject:date:message-id:x-mailer:in-reply-to:references:from; b=Pmqq0ieJkTHoaT3fOvqcVCqj0gwtoggbcJgR/i7sGGUjA/yZMHoth4OtIg6Tg5C176bHoSn73faSSaf5j9+JkLxQ7SA4OzJC3IkjxHvGBdESYVtcKjpHPECwSr4JQeBeou7dZAkBJlXx4PqdsSUKmAA+hwvra0TdB94+r5T6m98=
In-reply-to: <>
Original-recipient: rfc822;
References: <>
From: Franck Bui-Huu <>

The current implementation of __pa() for 64-bits kernels with 32-bits
symbols is broken. In this configuration, we need 2 values for
PAGE_OFFSET, one in XKPHYS and the other in CKSEG0 space.

When the value in CKSEG0 space is used, it doesn't take into account
of PHYS_OFFSET. Even worse we can't redefine this value.

The patch restores CPHYSADDR() but in __pa()'s implementation because
it removes the need of 2 PAGE_OFFSET.

OTOH, CPHYSADDR() is quite bad when dealing with mapped kernels. So
this patch assumes there's no need to deal with such kernel in 64-bits

Signed-off-by: Franck Bui-Huu <>
 include/asm-mips/page.h |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/include/asm-mips/page.h b/include/asm-mips/page.h
index cc28a4f..62ee3d5 100644
--- a/include/asm-mips/page.h
+++ b/include/asm-mips/page.h
@@ -143,11 +143,15 @@ typedef struct { unsigned long pgprot; } pgprot_t;
  * __pa()/__va() should be used only during mem init.
 #if defined(CONFIG_64BIT) && !defined(CONFIG_BUILD_ELF64)
-#define __pa_page_offset(x)    ((unsigned long)(x) < CKSEG0 ? PAGE_OFFSET : 
+#define __pa(x)                                                                
+({                                                                     \
+    unsigned long __x = (unsigned long)(x);                            \
+    __x < CKSEG0 ? XPHYSADDR(__x) : CPHYSADDR(__x);                    \
-#define __pa_page_offset(x)    PAGE_OFFSET
+#define __pa(x)                                                                
+    ((unsigned long)(x) - PAGE_OFFSET + PHYS_OFFSET)
-#define __pa(x)                ((unsigned long)(x) - __pa_page_offset(x) + 
 #define __va(x)                ((void *)((unsigned long)(x) + PAGE_OFFSET - 
 #define __pa_symbol(x) __pa(RELOC_HIDE((unsigned long)(x),0))

<Prev in Thread] Current Thread [Next in Thread>