From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47098) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V21s0-0006ML-0U for qemu-devel@nongnu.org; Wed, 24 Jul 2013 12:25:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V21ru-0002cR-HE for qemu-devel@nongnu.org; Wed, 24 Jul 2013 12:24:55 -0400 Received: from multi.imgtec.com ([194.200.65.239]:19188) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V21ru-0002aM-60 for qemu-devel@nongnu.org; Wed, 24 Jul 2013 12:24:50 -0400 Message-ID: <51EFFFC4.2040405@imgtec.com> Date: Wed, 24 Jul 2013 17:24:36 +0100 From: Leon Alrae MIME-Version: 1.0 References: <1372318527-8202-1-git-send-email-leon.alrae@imgtec.com> <51DD7760.3050707@imgtec.com> In-Reply-To: <51DD7760.3050707@imgtec.com> Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] hw/mips: align initrd to 64KB to avoid kernel error List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: yongbok.kim@imgtec.com, cristian.cuna@imgtec.com, james.hogan@imgtec.com, Leon Alrae , aurelien@aurel32.net ping On 10/07/13 16:01, Leon Alrae wrote: > ping > > http://patchwork.ozlabs.org/patch/255005/ > > On 27/06/13 08:35, Leon Alrae wrote: >> From: James Hogan >> >> The Linux kernel can be configured to use 64KB pages, but it also >> requires initrd to be page aligned. Therefore, to be safe, align the >> initrd to 64KB using a new INITRD_PAGE_MASK rather than >> TARGET_PAGE_MASK. >> >> Signed-off-by: James Hogan >> Signed-off-by: Leon Alrae >> --- >> hw/mips/mips_fulong2e.c | 2 +- >> hw/mips/mips_malta.c | 2 +- >> hw/mips/mips_mipssim.c | 2 +- >> hw/mips/mips_r4k.c | 2 +- >> include/hw/mips/mips.h | 3 +++ >> 5 files changed, 7 insertions(+), 4 deletions(-) >> >> diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c >> index 1aac93a..c03a4f2 100644 >> --- a/hw/mips/mips_fulong2e.c >> +++ b/hw/mips/mips_fulong2e.c >> @@ -126,7 +126,7 @@ static int64_t load_kernel (CPUMIPSState *env) >> if (loaderparams.initrd_filename) { >> initrd_size = get_image_size (loaderparams.initrd_filename); >> if (initrd_size > 0) { >> - initrd_offset = (kernel_high + ~TARGET_PAGE_MASK) & TARGET_PAGE_MASK; >> + initrd_offset = (kernel_high + ~INITRD_PAGE_MASK) & INITRD_PAGE_MASK; >> if (initrd_offset + initrd_size > ram_size) { >> fprintf(stderr, >> "qemu: memory too small for initial ram disk '%s'\n", >> diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c >> index 5033d51..526a122 100644 >> --- a/hw/mips/mips_malta.c >> +++ b/hw/mips/mips_malta.c >> @@ -699,7 +699,7 @@ static int64_t load_kernel (void) >> if (loaderparams.initrd_filename) { >> initrd_size = get_image_size (loaderparams.initrd_filename); >> if (initrd_size > 0) { >> - initrd_offset = (kernel_high + ~TARGET_PAGE_MASK) & TARGET_PAGE_MASK; >> + initrd_offset = (kernel_high + ~INITRD_PAGE_MASK) & INITRD_PAGE_MASK; >> if (initrd_offset + initrd_size > ram_size) { >> fprintf(stderr, >> "qemu: memory too small for initial ram disk '%s'\n", >> diff --git a/hw/mips/mips_mipssim.c b/hw/mips/mips_mipssim.c >> index d1681ec..3f54e64 100644 >> --- a/hw/mips/mips_mipssim.c >> +++ b/hw/mips/mips_mipssim.c >> @@ -83,7 +83,7 @@ static int64_t load_kernel(void) >> if (loaderparams.initrd_filename) { >> initrd_size = get_image_size (loaderparams.initrd_filename); >> if (initrd_size > 0) { >> - initrd_offset = (kernel_high + ~TARGET_PAGE_MASK) & TARGET_PAGE_MASK; >> + initrd_offset = (kernel_high + ~INITRD_PAGE_MASK) & INITRD_PAGE_MASK; >> if (initrd_offset + initrd_size > loaderparams.ram_size) { >> fprintf(stderr, >> "qemu: memory too small for initial ram disk '%s'\n", >> diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c >> index 4646ab6..fb7eb14 100644 >> --- a/hw/mips/mips_r4k.c >> +++ b/hw/mips/mips_r4k.c >> @@ -102,7 +102,7 @@ static int64_t load_kernel(void) >> if (loaderparams.initrd_filename) { >> initrd_size = get_image_size (loaderparams.initrd_filename); >> if (initrd_size > 0) { >> - initrd_offset = (kernel_high + ~TARGET_PAGE_MASK) & TARGET_PAGE_MASK; >> + initrd_offset = (kernel_high + ~INITRD_PAGE_MASK) & INITRD_PAGE_MASK; >> if (initrd_offset + initrd_size > ram_size) { >> fprintf(stderr, >> "qemu: memory too small for initial ram disk '%s'\n", >> diff --git a/include/hw/mips/mips.h b/include/hw/mips/mips.h >> index 291e85f..2a7a9c9 100644 >> --- a/include/hw/mips/mips.h >> +++ b/include/hw/mips/mips.h >> @@ -2,6 +2,9 @@ >> #define HW_MIPS_H >> /* Definitions for mips board emulation. */ >> >> +/* Kernels can be configured with 64KB pages */ >> +#define INITRD_PAGE_MASK (~((1 << 16) - 1)) >> + >> #include "exec/memory.h" >> >> /* gt64xxx.c */ >