From: Paolo Bonzini Date: Thu, 16 Apr 2015 20:11:23 +0000 (+0100) Subject: mips: fix broken fulong2e machine X-Git-Tag: v2.3.0-rc4~3^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0ca4f94195cce77b624edc6d9abcf14a3bf01f06;p=thirdparty%2Fqemu.git mips: fix broken fulong2e machine 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 Signed-off-by: Leon Alrae --- diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index 8bdd56922a2..8134d0bcd07 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) {