diff options
author | Lennert Buytenhek <buytenh@org.rmk.(none)> | 2006-09-29 16:14:05 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-09-30 06:30:44 -0400 |
commit | 2552fc27ff79b10b9678d92bcaef21df38bb7bb6 (patch) | |
tree | c69faf46c3df7f9260f33ea7e562bebee6854766 /arch/arm/kernel/head.S | |
parent | 6ae5a6ef0340908fb7065a75231ae9980a910fbe (diff) |
[ARM] 3809/3: get rid of 4 megabyte kernel image size limit
We currently have a hardcoded 4 megabyte uncompressed kernel image
size limit, which is easily exceeded by, for example, enabling some of
the various kernel debugging options.
When setting up the initial page tables (which is where this 4M limit
is hardcoded), it's actually relatively easy to find out the true size
of the uncompressed kernel image and create enough page table entries
for things to fit, so this patch makes it so.
In the decompressor, we also need to know the size of the uncompressed
kernel image, to figure out whether there is any chance that uncompressing
the kernel might overwrite the compressed kernel image stored elsewhere
in memory. We don't have that info at this boot stage, though, so we
approximate the size of the uncompressed kernel by taking the compressed
kernel image size and allowing for a maximum 4x expansion.
Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/head.S')
-rw-r--r-- | arch/arm/kernel/head.S | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S index 5365d4e5949..ebc3e74a794 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S | |||
@@ -234,18 +234,18 @@ __create_page_tables: | |||
234 | 234 | ||
235 | /* | 235 | /* |
236 | * Now setup the pagetables for our kernel direct | 236 | * Now setup the pagetables for our kernel direct |
237 | * mapped region. We round TEXTADDR down to the | 237 | * mapped region. |
238 | * nearest megabyte boundary. It is assumed that | ||
239 | * the kernel fits within 4 contigous 1MB sections. | ||
240 | */ | 238 | */ |
241 | add r0, r4, #(TEXTADDR & 0xff000000) >> 18 @ start of kernel | 239 | add r0, r4, #(TEXTADDR & 0xff000000) >> 18 @ start of kernel |
242 | str r3, [r0, #(TEXTADDR & 0x00f00000) >> 18]! | 240 | str r3, [r0, #(TEXTADDR & 0x00f00000) >> 18]! |
243 | add r3, r3, #1 << 20 | 241 | |
244 | str r3, [r0, #4]! @ KERNEL + 1MB | 242 | ldr r6, =(_end - PAGE_OFFSET - 1) @ r6 = number of sections |
245 | add r3, r3, #1 << 20 | 243 | mov r6, r6, lsr #20 @ needed for kernel minus 1 |
246 | str r3, [r0, #4]! @ KERNEL + 2MB | 244 | |
247 | add r3, r3, #1 << 20 | 245 | 1: add r3, r3, #1 << 20 |
248 | str r3, [r0, #4] @ KERNEL + 3MB | 246 | str r3, [r0, #4]! |
247 | subs r6, r6, #1 | ||
248 | bgt 1b | ||
249 | 249 | ||
250 | /* | 250 | /* |
251 | * Then map first 1MB of ram in case it contains our boot params. | 251 | * Then map first 1MB of ram in case it contains our boot params. |