Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
[ARM] Clean up KERNEL_RAM_ADDR
Clean up the KERNEL_RAM_ADDR stuff in arch/arm/kernel/head.S to
make it clearer what's referring to what. In doing so, remove
the usage of __virt_to_phys(), which is not guaranteed to be
something that the assembler can parse.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
authored by Russell King and committed by Russell King f06b97ff bca0b8e7
+10
-9
arch/arm/kernel/head.S
+10
-9
arch/arm/kernel/head.S
···
22
22
#include <asm/thread_info.h>
23
23
#include <asm/system.h>
24
24
25
-
#define KERNEL_RAM_ADDR (PAGE_OFFSET + TEXT_OFFSET)
25
+
#define KERNEL_RAM_VADDR (PAGE_OFFSET + TEXT_OFFSET)
26
+
#define KERNEL_RAM_PADDR (PHYS_OFFSET + TEXT_OFFSET)
26
27
27
28
/*
28
29
* swapper_pg_dir is the virtual address of the initial page table.
29
-
* We place the page tables 16K below KERNEL_RAM_ADDR. Therefore, we must
30
-
* make sure that KERNEL_RAM_ADDR is correctly set. Currently, we expect
30
+
* We place the page tables 16K below KERNEL_RAM_VADDR. Therefore, we must
31
+
* make sure that KERNEL_RAM_VADDR is correctly set. Currently, we expect
31
32
* the least significant 16 bits to be 0x8000, but we could probably
32
-
* relax this restriction to KERNEL_RAM_ADDR >= PAGE_OFFSET + 0x4000.
33
+
* relax this restriction to KERNEL_RAM_VADDR >= PAGE_OFFSET + 0x4000.
33
34
*/
34
-
#if (KERNEL_RAM_ADDR & 0xffff) != 0x8000
35
-
#error KERNEL_RAM_ADDR must start at 0xXXXX8000
35
+
#if (KERNEL_RAM_VADDR & 0xffff) != 0x8000
36
+
#error KERNEL_RAM_VADDR must start at 0xXXXX8000
36
37
#endif
37
38
38
39
.globl swapper_pg_dir
39
-
.equ swapper_pg_dir, KERNEL_RAM_ADDR - 0x4000
40
+
.equ swapper_pg_dir, KERNEL_RAM_VADDR - 0x4000
40
41
41
42
.macro pgtbl, rd
42
-
ldr \rd, =(__virt_to_phys(KERNEL_RAM_ADDR - 0x4000))
43
+
ldr \rd, =(KERNEL_RAM_PADDR - 0x4000)
43
44
.endm
44
45
45
46
#ifdef CONFIG_XIP_KERNEL
46
47
#define TEXTADDR XIP_VIRT_ADDR(CONFIG_XIP_PHYS_ADDR)
47
48
#else
48
-
#define TEXTADDR KERNEL_RAM_ADDR
49
+
#define TEXTADDR KERNEL_RAM_VADDR
49
50
#endif
50
51
51
52
/*