From: Cédric Le Goater Date: Mon, 14 Nov 2016 09:12:56 +0000 (+0100) Subject: ppc/pnv: fix xscom address translation for POWER9 X-Git-Tag: TizenStudio_2.0_p2.3.2~9^2~14^2~5^2~55^2~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f81e551229070f01bf747eda3f05960182db9d2a;p=sdk%2Femulator%2Fqemu.git ppc/pnv: fix xscom address translation for POWER9 High addresses can overflow the uint32_t pcba variable after the 8byte shift. Signed-off-by: Cédric Le Goater Signed-off-by: David Gibson --- diff --git a/hw/ppc/pnv_xscom.c b/hw/ppc/pnv_xscom.c index f466461..8da2718 100644 --- a/hw/ppc/pnv_xscom.c +++ b/hw/ppc/pnv_xscom.c @@ -124,8 +124,8 @@ static uint64_t xscom_read(void *opaque, hwaddr addr, unsigned width) goto complete; } - val = address_space_ldq(&chip->xscom_as, pcba << 3, MEMTXATTRS_UNSPECIFIED, - &result); + val = address_space_ldq(&chip->xscom_as, (uint64_t) pcba << 3, + MEMTXATTRS_UNSPECIFIED, &result); if (result != MEMTX_OK) { qemu_log_mask(LOG_GUEST_ERROR, "XSCOM read failed at @0x%" HWADDR_PRIx " pcba=0x%08x\n", addr, pcba); @@ -150,8 +150,8 @@ static void xscom_write(void *opaque, hwaddr addr, uint64_t val, goto complete; } - address_space_stq(&chip->xscom_as, pcba << 3, val, MEMTXATTRS_UNSPECIFIED, - &result); + address_space_stq(&chip->xscom_as, (uint64_t) pcba << 3, val, + MEMTXATTRS_UNSPECIFIED, &result); if (result != MEMTX_OK) { qemu_log_mask(LOG_GUEST_ERROR, "XSCOM write failed at @0x%" HWADDR_PRIx " pcba=0x%08x data=0x%" PRIx64 "\n",