Commit 03274d44 authored by Scott Wood's avatar Scott Wood Committed by Alexander Graf
Browse files

openpic: fix timer address decoding 



The timer memory range begins at 0x10f0, so that address 0x1120 shows
up as 0x30, 0x1130 shows up as 0x40, etc.  However, the address
decoding (other than TFRR) is not adjusted for this, causing the
wrong registers to be accessed.

Signed-off-by: default avatarScott Wood <scottwood@freescale.com>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent f40c360c

hw/openpic.c

+7 −3
Original line number Diff line number Diff line
@@ -792,19 +792,23 @@ static void openpic_tmr_write(void *opaque, hwaddr addr, uint64_t val, 
    OpenPICState *opp = opaque;

    int idx;



    addr += 0x10f0;



    DPRINTF("%s: addr %#" HWADDR_PRIx " <= %08" PRIx64 "\n",

            __func__, addr, val);

    if (addr & 0xF) {

        return;

    }

    idx = (addr >> 6) & 0x3;

    addr = addr & 0x30;



    if (addr == 0x0) {

    if (addr == 0x10f0) {

        /* TFRR */

        opp->tfrr = val;

        return;

    }



    idx = (addr >> 6) & 0x3;

    addr = addr & 0x30;



    switch (addr & 0x30) {

    case 0x00: /* TCCR */

        break;