Changeset 45d6add in mainline

Timestamp:

2006-03-13T19:58:52Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

25d7709

Parents:

6d9c49a

Message:

run ppc32 kernel above 2 GB

Location:

arch

Files:

• ia32/include/mm/page.h (modified) (1 diff)
• ppc32/_link.ld.in (modified) (2 diffs)
• ppc32/include/boot/boot.h (added)
• ppc32/include/mm/as.h (modified) (1 diff)
• ppc32/include/mm/page.h (modified) (2 diffs)

arch/ia32/include/mm/page.h

@@ -34 +34 @@
 
 #ifndef __ASM__
-# define KA2PA(x)       (((__address) (x)) - 0x80000000)
-# define PA2KA(x)       (((__address) (x)) + 0x80000000)
+#       define KA2PA(x) (((__address) (x)) - 0x80000000)
+#       define PA2KA(x) (((__address) (x)) + 0x80000000)
 #else
-# define KA2PA(x)       ((x) - 0x80000000)
-# define PA2KA(x)       ((x) + 0x80000000)
+#       define KA2PA(x) ((x) - 0x80000000)
+#       define PA2KA(x) ((x) + 0x80000000)
 #endif
 

arch/ppc32/_link.ld.in

@@ -8 +8 @@
 
 #define __ASM__
+#include <arch/boot/boot.h>
+#include <arch/mm/page.h>
 
 ENTRY(kernel_image_start)
 
 SECTIONS {
-        .image 0x400000: AT (0x400000) { 
+        .image PA2KA(BOOT_OFFSET): AT (0) { 
                 ktext_start = .;
                 *(K_TEXT_START)
@@ -31 +33 @@
                 LONG(kdata_end - kdata_start);
                 hardcoded_load_address = .;
-                LONG(0x400000);
+                LONG(PA2KA(BOOT_OFFSET));
                 *(.bss);                /* uninitialized static variables */    
                 *(COMMON);              /* global variables */

arch/ppc32/include/mm/as.h

@@ -32 +32 @@
 #include <arch/types.h>
 
-#define KERNEL_ADDRESS_SPACE_START_ARCH         (__address) 0x00000000
-#define KERNEL_ADDRESS_SPACE_END_ARCH           (__address) 0xffffffff  
-#define USER_ADDRESS_SPACE_START_ARCH           (__address) 0x00000000
-#define USER_ADDRESS_SPACE_END_ARCH             (__address) 0x7fffffff
+#define KERNEL_ADDRESS_SPACE_START_ARCH         ((__address) 0x80000000)
+#define KERNEL_ADDRESS_SPACE_END_ARCH           ((__address) 0xffffffff)
+#define USER_ADDRESS_SPACE_START_ARCH           ((__address) 0x00000000)
+#define USER_ADDRESS_SPACE_END_ARCH             ((__address) 0x7fffffff)
 
 #define USTACK_ADDRESS_ARCH     (0x7fffffff-(PAGE_SIZE-1))

arch/ppc32/include/mm/page.h

@@ -30 +30 @@
 #define __ppc32_PAGE_H__
 
-#include <mm/page.h>
-#include <arch/mm/frame.h>
-#include <arch/types.h>
-
 #define PAGE_WIDTH      FRAME_WIDTH
 #define PAGE_SIZE       FRAME_SIZE
 
-#define KA2PA(x)        ((__address)(x))
-#define PA2KA(x)        ((__address)(x))
+#ifndef __ASM__
+#       define KA2PA(x) (((__address) (x)) - 0x80000000)
+#       define PA2KA(x) (((__address) (x)) + 0x80000000)
+#else
+#       define KA2PA(x) ((x) - 0x80000000)
+#       define PA2KA(x) ((x) + 0x80000000)
+#endif
 
 #define PTL0_ENTRIES_ARCH               0
@@ -74 +75 @@
 #define PTE_VALID_ARCH(p)               1
 
+#ifndef __ASM__
+
+#include <mm/page.h>
+#include <arch/mm/frame.h>
+#include <arch/types.h>
+
 extern void page_arch_init(void);
 
+#endif /* __ASM__ */
+
 #endif