Commit a09f7443 authored by Aaron Larson's avatar Aaron Larson Committed by David Gibson
Browse files

target-ppc: Fix openpic timer read register offset 



openpic_tmr_read() is incorrectly computing register offset of the
TCCR, TBCR, TVPR, and TDR registers when accessing the open pic timer
registers.  Specifically the offset of timer registers for
openpic_tmr_read() is not accounting for the timer frequency reporting
register (TFFR) which is the first register in the "tmr" memory
region.

openpic_tmr_write() *is* correctly computing the offset by adding
0x10f0 to the address prior to computing the register index.  This
patch instead subtracts 0x10 in both the read and write routines and
eliminates some other gratuitous differences between the functions.

Signed-off-by: default avatarAaron Larson <alarson@ddci.com>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 0b55aa91

hw/intc/openpic.c

+10 −12
Original line number Diff line number Diff line
@@ -801,22 +801,19 @@ 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);

            __func__, (addr + 0x10f0), val);

    if (addr & 0xF) {

        return;

    }



    if (addr == 0x10f0) {

    if (addr == 0) {

        /* TFRR */

        opp->tfrr = val;

        return;

    }



    addr -= 0x10;  /* correct for TFRR */

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

    addr = addr & 0x30;



    switch (addr & 0x30) {

    case 0x00: /* TCCR */
@@ -844,16 +841,17 @@ static uint64_t openpic_tmr_read(void *opaque, hwaddr addr, unsigned len) 
    uint32_t retval = -1;

    int idx;



    DPRINTF("%s: addr %#" HWADDR_PRIx "\n", __func__, addr);

    DPRINTF("%s: addr %#" HWADDR_PRIx "\n", __func__, addr + 0x10f0);

    if (addr & 0xF) {

        goto out;

    }

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

    if (addr == 0x0) {

    if (addr == 0) {

        /* TFRR */

        retval = opp->tfrr;

        goto out;

    }

    addr -= 0x10;  /* correct for TFRR */

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

    switch (addr & 0x30) {

    case 0x00: /* TCCR */

        retval = opp->timers[idx].tccr;
@@ -861,10 +859,10 @@ static uint64_t openpic_tmr_read(void *opaque, hwaddr addr, unsigned len) 
    case 0x10: /* TBCR */

        retval = opp->timers[idx].tbcr;

        break;

    case 0x20: /* TIPV */

    case 0x20: /* TVPR */

        retval = read_IRQreg_ivpr(opp, opp->irq_tim0 + idx);

        break;

    case 0x30: /* TIDE (TIDR) */

    case 0x30: /* TDR */

        retval = read_IRQreg_idr(opp, opp->irq_tim0 + idx);

        break;

    }