diff options
| author | Cédric Le Goater <clg@kaod.org> | 2016-11-14 10:12:56 +0100 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2016-11-15 10:08:43 +1100 |
| commit | f81e551229070f01bf747eda3f05960182db9d2a (patch) | |
| tree | 7e441fd9e1bd9533d7f96611a97c4f85776fb570 /hw/ppc/pnv_xscom.c | |
| parent | ad521238b458a6d54ab672ed3f94d5edaa786d5c (diff) | |
| download | qemu-f81e551229070f01bf747eda3f05960182db9d2a.zip qemu-f81e551229070f01bf747eda3f05960182db9d2a.tar.gz qemu-f81e551229070f01bf747eda3f05960182db9d2a.tar.bz2 | |
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 <clg@kaod.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'hw/ppc/pnv_xscom.c')
| -rw-r--r-- | hw/ppc/pnv_xscom.c | 8 |
1 files changed, 4 insertions, 4 deletions
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", |