qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Leon Alrae <leon.alrae@imgtec.com>
To: qemu-devel@nongnu.org
Cc: James Hogan <james.hogan@imgtec.com>,
	Aurelien Jarno <aurelien@aurel32.net>,
	Paul Burton <paul.burton@imgtec.com>
Subject: [Qemu-devel] [PULL 5/9] hw/mips_malta: Fix KVM PC initialisation
Date: Fri, 30 Oct 2015 15:00:48 +0000	[thread overview]
Message-ID: <1446217252-3637-6-git-send-email-leon.alrae@imgtec.com> (raw)
In-Reply-To: <1446217252-3637-1-git-send-email-leon.alrae@imgtec.com>

From: James Hogan <james.hogan@imgtec.com>

Commit 71c199c81d29 ("mips_malta: provide ememsize env variable to
kernels") changed the meaning of loaderparams.ram_size to be the whole
of RAM rather than just the low part below where the boot code is placed
for KVM, but it didn't update the PC initialisation for KVM to use
ram_low_size. Fix that now.

Fixes: 71c199c81d29 ("mips_malta: provide ememsize env variable to kernels")
Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: Paul Burton <paul.burton@imgtec.com>
Cc: Leon Alrae <leon.alrae@imgtec.com>
Cc: Aurelien Jarno <aurelien@aurel32.net>
Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
Reviewed-by: Leon Alrae <leon.alrae@imgtec.com>
Signed-off-by: Leon Alrae <leon.alrae@imgtec.com>
---
 hw/mips/mips_malta.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
index c1f570a..91c36ba 100644
--- a/hw/mips/mips_malta.c
+++ b/hw/mips/mips_malta.c
@@ -901,7 +901,7 @@ static void main_cpu_reset(void *opaque)
 
     if (kvm_enabled()) {
         /* Start running from the bootloader we wrote to end of RAM */
-        env->active_tc.PC = 0x40000000 + loaderparams.ram_size;
+        env->active_tc.PC = 0x40000000 + loaderparams.ram_low_size;
     }
 }
 
-- 
2.1.0

  parent reply	other threads:[~2015-10-30 15:01 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-30 15:00 [Qemu-devel] [PULL 0/9] target-mips queue Leon Alrae
2015-10-30 15:00 ` [Qemu-devel] [PULL 1/9] target-mips: move the test for enabled interrupts to a separate function Leon Alrae
2015-10-30 15:00 ` [Qemu-devel] [PULL 2/9] target-mips: implement the CPU wake-up on non-enabled interrupts in R6 Leon Alrae
2015-10-30 15:00 ` [Qemu-devel] [PULL 3/9] target-mips: update writing to CP0.Status.KX/SX/UX in MIPS Release R6 Leon Alrae
2015-10-30 15:00 ` [Qemu-devel] [PULL 4/9] target-mips: Add enum for BREAK32 Leon Alrae
2015-10-30 15:00 ` Leon Alrae [this message]
2015-10-30 15:00 ` [Qemu-devel] [PULL 6/9] target-mips: add PC, XNP reg numbers to RDHWR Leon Alrae
2015-10-30 15:00 ` [Qemu-devel] [PULL 7/9] target-mips: Set Config5.XNP for R6 cores Leon Alrae
2015-10-30 15:00 ` [Qemu-devel] [PULL 8/9] target-mips: add SIGRIE instruction Leon Alrae
2015-10-30 15:00 ` [Qemu-devel] [PULL 9/9] target-mips: fix updating XContext on mmu exception Leon Alrae
2015-10-30 17:36 ` [Qemu-devel] [PULL 0/9] target-mips queue Peter Maydell

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=1446217252-3637-6-git-send-email-leon.alrae@imgtec.com \
    --to=leon.alrae@imgtec.com \
    --cc=aurelien@aurel32.net \
    --cc=james.hogan@imgtec.com \
    --cc=paul.burton@imgtec.com \
    --cc=qemu-devel@nongnu.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;
as well as URLs for NNTP newsgroup(s).