Re: [Qemu-devel] [PATCH] hw/mips: align initrd to 64KB to avoid kernel error

[Leon Alrae <leon.alrae@imgtec.com>]

ping

http://patchwork.ozlabs.org/patch/255005/

On 27/06/13 08:35, Leon Alrae wrote:
> From: James Hogan <james.hogan@imgtec.com>
> 
> 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 <james.hogan@imgtec.com>
> Signed-off-by: Leon Alrae <leon.alrae@imgtec.com>
> ---
>  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 */