[Qemu-devel] [PULL v2 0/1 for-2.3] fulong2e bugfix

[Qemu-devel] [PULL v2 0/1 for-2.3] fulong2e bugfix

[Leon Alrae]

Hi,

The machine was broken for a long time (since v1.1), it would be great
to have it working again in v2.3.

v2: modified "From:" to indicate the actual author of the change

Thanks,
Leon

Cc: Peter Maydell <peter.maydell@linaro.org>

The following changes since commit b8df9208f357d2b36e1b19634aea973618dc7ba8:

  Update version for v2.3.0-rc3 release (2015-04-13 17:35:44 +0100)

are available in the git repository at:

  git://github.com/lalrae/qemu.git tags/mips-20150417-2

for you to fetch changes up to 0ca4f94195cce77b624edc6d9abcf14a3bf01f06:

  mips: fix broken fulong2e machine (2015-04-17 12:11:48 +0100)

----------------------------------------------------------------
MIPS patches 2015-04-17

Changes:
* fix broken fulong2e

----------------------------------------------------------------
Paolo Bonzini (1):
      mips: fix broken fulong2e machine

 hw/pci-host/bonito.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

[Qemu-devel] [PULL v2 1/1] mips: fix broken fulong2e machine

[Leon Alrae]

From: Paolo Bonzini <pbonzini@redhat.com>

After commit 5312bd8 the bonito_readl() and bonito_writel() have been
accessing incorrect addresses. Consequently QEMU is crashing when trying
to boot Linux kernel on fulong2e machine.

Cc: qemu-stable@nongnu.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Leon Alrae <leon.alrae@imgtec.com>
---
 hw/pci-host/bonito.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c
index 8bdd569..8134d0b 100644
--- a/hw/pci-host/bonito.c
+++ b/hw/pci-host/bonito.c
@@ -233,7 +233,7 @@ static void bonito_writel(void *opaque, hwaddr addr,
     uint32_t saddr;
     int reset = 0;
 
-    saddr = (addr - BONITO_REGBASE) >> 2;
+    saddr = addr >> 2;
 
     DPRINTF("bonito_writel "TARGET_FMT_plx" val %x saddr %x\n", addr, val, saddr);
     switch (saddr) {
@@ -295,7 +295,7 @@ static uint64_t bonito_readl(void *opaque, hwaddr addr,
     PCIBonitoState *s = opaque;
     uint32_t saddr;
 
-    saddr = (addr - BONITO_REGBASE) >> 2;
+    saddr = addr >> 2;
 
     DPRINTF("bonito_readl "TARGET_FMT_plx"\n", addr);
     switch (saddr) {

Re: [Qemu-devel] [PULL v2 0/1 for-2.3] fulong2e bugfix

[Peter Maydell]

On 17 April 2015 at 12:34, Leon Alrae <leon.alrae@imgtec.com> wrote:
> Hi,
>
> The machine was broken for a long time (since v1.1), it would be great
> to have it working again in v2.3.
>
> v2: modified "From:" to indicate the actual author of the change
>
> Thanks,
> Leon
>
> Cc: Peter Maydell <peter.maydell@linaro.org>
>
> The following changes since commit b8df9208f357d2b36e1b19634aea973618dc7ba8:
>
>   Update version for v2.3.0-rc3 release (2015-04-13 17:35:44 +0100)
>
> are available in the git repository at:
>
>   git://github.com/lalrae/qemu.git tags/mips-20150417-2
>
> for you to fetch changes up to 0ca4f94195cce77b624edc6d9abcf14a3bf01f06:
>
>   mips: fix broken fulong2e machine (2015-04-17 12:11:48 +0100)
>
> ----------------------------------------------------------------
> MIPS patches 2015-04-17
>
> Changes:
> * fix broken fulong2e

Applied, thanks.

-- PMM