From: Jayachandran C <jchandra@broadcom.com>
To: <linux-mips@linux-mips.org>, <ralf@linux-mips.org>
Cc: Jayachandran C <jchandra@broadcom.com>
Subject: [PATCH 4/5] MIPS: Compress MAPPED kernels
Date: Fri, 16 Jan 2015 18:08:07 +0530 [thread overview]
Message-ID: <1421411888-3367-5-git-send-email-jchandra@broadcom.com> (raw)
In-Reply-To: <1421411888-3367-1-git-send-email-jchandra@broadcom.com>
Add code to build the wrapper in KSEG0, which in turn loads the
mapped kernel.
Signed-off-by: Jayachandran C <jchandra@broadcom.com>
---
arch/mips/boot/compressed/calc_vmlinuz_load_addr.c | 9 +++++++++
arch/mips/boot/compressed/decompress.c | 6 +++++-
arch/mips/boot/compressed/head.S | 5 +++++
3 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/arch/mips/boot/compressed/calc_vmlinuz_load_addr.c b/arch/mips/boot/compressed/calc_vmlinuz_load_addr.c
index 37fe58c..9791e39 100644
--- a/arch/mips/boot/compressed/calc_vmlinuz_load_addr.c
+++ b/arch/mips/boot/compressed/calc_vmlinuz_load_addr.c
@@ -51,6 +51,15 @@ int main(int argc, char *argv[])
vmlinuz_load_addr += (16 - vmlinux_size % 16);
+ /* handle 32/64 bit mapped addresses */
+ if (vmlinuz_load_addr >= 0xffffffffc0000000ULL)
+ vmlinuz_load_addr = 0xffffffff80000000ull |
+ (vmlinuz_load_addr & 0x1fffffff);
+ if (vmlinuz_load_addr >= 0xc0000000ULL &&
+ vmlinuz_load_addr < 0xffffffffULL)
+ vmlinuz_load_addr = 0x80000000ull |
+ (vmlinuz_load_addr & 0x1fffffff);
+
printf("0x%llx\n", vmlinuz_load_addr);
return EXIT_SUCCESS;
diff --git a/arch/mips/boot/compressed/decompress.c b/arch/mips/boot/compressed/decompress.c
index 31903cf..f9a2ab9 100644
--- a/arch/mips/boot/compressed/decompress.c
+++ b/arch/mips/boot/compressed/decompress.c
@@ -83,6 +83,7 @@ void __stack_chk_fail(void)
void decompress_kernel(unsigned long boot_heap_start)
{
unsigned long zimage_start, zimage_size;
+ unsigned long long loadaddr = VMLINUX_LOAD_ADDRESS_ULL;
__stack_chk_guard_setup();
@@ -105,9 +106,12 @@ void decompress_kernel(unsigned long boot_heap_start)
puthex(VMLINUX_LOAD_ADDRESS_ULL);
puts("\n");
+#ifdef CONFIG_MAPPED_KERNEL
+ loadaddr = CKSEG0ADDR(loadaddr);
+#endif
/* Decompress the kernel with according algorithm */
decompress((char *)zimage_start, zimage_size, 0, 0,
- (void *)VMLINUX_LOAD_ADDRESS_ULL, 0, error);
+ (void *)(unsigned long)loadaddr, 0, error);
/* FIXME: should we flush cache here? */
puts("Now, booting the kernel...\n");
diff --git a/arch/mips/boot/compressed/head.S b/arch/mips/boot/compressed/head.S
index 409cb48..47ab26f 100644
--- a/arch/mips/boot/compressed/head.S
+++ b/arch/mips/boot/compressed/head.S
@@ -14,6 +14,7 @@
#include <asm/asm.h>
#include <asm/regdef.h>
+#include <asm/addrspace.h>
.set noreorder
.cprestore
@@ -44,7 +45,11 @@ start:
move a1, s1
move a2, s2
move a3, s3
+#ifdef CONFIG_MAPPED_KERNEL
+ PTR_LI k0, CKSEG0ADDR(KERNEL_ENTRY)
+#else
PTR_LI k0, KERNEL_ENTRY
+#endif
jr k0
nop
3:
--
1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: Jayachandran C <jchandra@broadcom.com>
To: linux-mips@linux-mips.org, ralf@linux-mips.org
Cc: Jayachandran C <jchandra@broadcom.com>
Subject: [PATCH 4/5] MIPS: Compress MAPPED kernels
Date: Fri, 16 Jan 2015 18:08:07 +0530 [thread overview]
Message-ID: <1421411888-3367-5-git-send-email-jchandra@broadcom.com> (raw)
Message-ID: <20150116123807.vVertuQuW2IsEeoKGtjcrR2fyfSpiv5s-XbRnz7sVak@z> (raw)
In-Reply-To: <1421411888-3367-1-git-send-email-jchandra@broadcom.com>
Add code to build the wrapper in KSEG0, which in turn loads the
mapped kernel.
Signed-off-by: Jayachandran C <jchandra@broadcom.com>
---
arch/mips/boot/compressed/calc_vmlinuz_load_addr.c | 9 +++++++++
arch/mips/boot/compressed/decompress.c | 6 +++++-
arch/mips/boot/compressed/head.S | 5 +++++
3 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/arch/mips/boot/compressed/calc_vmlinuz_load_addr.c b/arch/mips/boot/compressed/calc_vmlinuz_load_addr.c
index 37fe58c..9791e39 100644
--- a/arch/mips/boot/compressed/calc_vmlinuz_load_addr.c
+++ b/arch/mips/boot/compressed/calc_vmlinuz_load_addr.c
@@ -51,6 +51,15 @@ int main(int argc, char *argv[])
vmlinuz_load_addr += (16 - vmlinux_size % 16);
+ /* handle 32/64 bit mapped addresses */
+ if (vmlinuz_load_addr >= 0xffffffffc0000000ULL)
+ vmlinuz_load_addr = 0xffffffff80000000ull |
+ (vmlinuz_load_addr & 0x1fffffff);
+ if (vmlinuz_load_addr >= 0xc0000000ULL &&
+ vmlinuz_load_addr < 0xffffffffULL)
+ vmlinuz_load_addr = 0x80000000ull |
+ (vmlinuz_load_addr & 0x1fffffff);
+
printf("0x%llx\n", vmlinuz_load_addr);
return EXIT_SUCCESS;
diff --git a/arch/mips/boot/compressed/decompress.c b/arch/mips/boot/compressed/decompress.c
index 31903cf..f9a2ab9 100644
--- a/arch/mips/boot/compressed/decompress.c
+++ b/arch/mips/boot/compressed/decompress.c
@@ -83,6 +83,7 @@ void __stack_chk_fail(void)
void decompress_kernel(unsigned long boot_heap_start)
{
unsigned long zimage_start, zimage_size;
+ unsigned long long loadaddr = VMLINUX_LOAD_ADDRESS_ULL;
__stack_chk_guard_setup();
@@ -105,9 +106,12 @@ void decompress_kernel(unsigned long boot_heap_start)
puthex(VMLINUX_LOAD_ADDRESS_ULL);
puts("\n");
+#ifdef CONFIG_MAPPED_KERNEL
+ loadaddr = CKSEG0ADDR(loadaddr);
+#endif
/* Decompress the kernel with according algorithm */
decompress((char *)zimage_start, zimage_size, 0, 0,
- (void *)VMLINUX_LOAD_ADDRESS_ULL, 0, error);
+ (void *)(unsigned long)loadaddr, 0, error);
/* FIXME: should we flush cache here? */
puts("Now, booting the kernel...\n");
diff --git a/arch/mips/boot/compressed/head.S b/arch/mips/boot/compressed/head.S
index 409cb48..47ab26f 100644
--- a/arch/mips/boot/compressed/head.S
+++ b/arch/mips/boot/compressed/head.S
@@ -14,6 +14,7 @@
#include <asm/asm.h>
#include <asm/regdef.h>
+#include <asm/addrspace.h>
.set noreorder
.cprestore
@@ -44,7 +45,11 @@ start:
move a1, s1
move a2, s2
move a3, s3
+#ifdef CONFIG_MAPPED_KERNEL
+ PTR_LI k0, CKSEG0ADDR(KERNEL_ENTRY)
+#else
PTR_LI k0, KERNEL_ENTRY
+#endif
jr k0
nop
3:
--
1.9.1
next prev parent reply other threads:[~2015-01-16 12:38 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-16 12:38 [PATCH 0/5] Mapped kernel support for Broadcom XLP/XLPII Jayachandran C
2015-01-16 12:38 ` Jayachandran C
2015-01-16 12:38 ` [PATCH 1/5] MIPS: Make MAPPED_KERNEL config option common Jayachandran C
2015-01-16 12:38 ` Jayachandran C
2015-01-16 12:38 ` [PATCH 2/5] MIPS: Add platform function to fixup memory Jayachandran C
2015-01-16 12:38 ` Jayachandran C
2015-01-16 12:38 ` [PATCH 3/5] MIPS: Netlogic: Mapped kernel support Jayachandran C
2015-01-16 12:38 ` Jayachandran C
2015-01-16 12:38 ` Jayachandran C [this message]
2015-01-16 12:38 ` [PATCH 4/5] MIPS: Compress MAPPED kernels Jayachandran C
2015-01-16 12:38 ` [PATCH 5/5] MIPS: Netlogic: Map kernel with 1G/4G pages on XLPII Jayachandran C
2015-01-16 12:38 ` Jayachandran C
-- strict thread matches above, loose matches on Subject: below --
2014-05-09 15:28 [PATCH RFC 0/5] Mapped kernel support for Broadcom XLP Jayachandran C
2014-05-09 16:09 ` [PATCH 1/5] MIPS: Make MAPPED_KERNEL config option common Jayachandran C
2014-05-09 16:09 ` [PATCH 4/5] MIPS: Compress MAPPED kernels Jayachandran C
2014-05-09 16:09 ` Jayachandran C
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1421411888-3367-5-git-send-email-jchandra@broadcom.com \
--to=jchandra@broadcom.com \
--cc=linux-mips@linux-mips.org \
--cc=ralf@linux-mips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox