diff --git a/hw/openpic.c b/hw/openpic.c index 1e4b3c16ef..aa244ee65b 100644 --- a/hw/openpic.c +++ b/hw/openpic.c @@ -219,20 +219,20 @@ typedef struct openpic_t { int nb_cpus; /* Timer registers */ struct { - uint32_t ticc; /* Global timer current count register */ - uint32_t tibc; /* Global timer base count register */ + uint32_t ticc; /* Global timer current count register */ + uint32_t tibc; /* Global timer base count register */ } timers[MAX_TMR]; #if MAX_DBL > 0 /* Doorbell registers */ uint32_t dar; /* Doorbell activate register */ struct { - uint32_t dmr; /* Doorbell messaging register */ + uint32_t dmr; /* Doorbell messaging register */ } doorbells[MAX_DBL]; #endif #if MAX_MBX > 0 /* Mailbox registers */ struct { - uint32_t mbr; /* Mailbox register */ + uint32_t mbr; /* Mailbox register */ } mailboxes[MAX_MAILBOXES]; #endif /* IRQ out is used when in bypass mode (not implemented) */ @@ -276,14 +276,14 @@ static void IRQ_check (openpic_t *opp, IRQ_queue_t *q) next = -1; priority = -1; for (i = 0; i < opp->max_irq; i++) { - if (IRQ_testbit(q, i)) { + if (IRQ_testbit(q, i)) { DPRINTF("IRQ_check: irq %d set ipvp_pr=%d pr=%d\n", i, IPVP_PRIORITY(opp->src[i].ipvp), priority); - if (IPVP_PRIORITY(opp->src[i].ipvp) > priority) { - next = i; - priority = IPVP_PRIORITY(opp->src[i].ipvp); - } - } + if (IPVP_PRIORITY(opp->src[i].ipvp) > priority) { + next = i; + priority = IPVP_PRIORITY(opp->src[i].ipvp); + } + } } q->next = next; q->priority = priority; @@ -293,7 +293,7 @@ static int IRQ_get_next (openpic_t *opp, IRQ_queue_t *q) { if (q->next == -1) { /* XXX: optimize */ - IRQ_check(opp, q); + IRQ_check(opp, q); } return q->next; @@ -309,16 +309,16 @@ static void IRQ_local_pipe (openpic_t *opp, int n_CPU, int n_IRQ) src = &opp->src[n_IRQ]; priority = IPVP_PRIORITY(src->ipvp); if (priority <= dst->pctp) { - /* Too low priority */ + /* Too low priority */ DPRINTF("%s: IRQ %d has too low priority on CPU %d\n", __func__, n_IRQ, n_CPU); - return; + return; } if (IRQ_testbit(&dst->raised, n_IRQ)) { - /* Interrupt miss */ + /* Interrupt miss */ DPRINTF("%s: IRQ %d was missed on CPU %d\n", __func__, n_IRQ, n_CPU); - return; + return; } set_bit(&src->ipvp, IPVP_ACTIVITY); IRQ_setbit(&dst->raised, n_IRQ); @@ -354,14 +354,14 @@ static void openpic_update_irq(openpic_t *opp, int n_IRQ) return; } if (test_bit(&src->ipvp, IPVP_MASK)) { - /* Interrupt source is disabled */ + /* Interrupt source is disabled */ DPRINTF("%s: IRQ %d is disabled\n", __func__, n_IRQ); - return; + return; } if (IPVP_PRIORITY(src->ipvp) == 0) { - /* Priority set to zero */ + /* Priority set to zero */ DPRINTF("%s: IRQ %d has 0 priority\n", __func__, n_IRQ); - return; + return; } if (test_bit(&src->ipvp, IPVP_ACTIVITY)) { /* IRQ already active */ @@ -369,9 +369,9 @@ static void openpic_update_irq(openpic_t *opp, int n_IRQ) return; } if (src->ide == 0x00000000) { - /* No target */ + /* No target */ DPRINTF("%s: IRQ %d has no target\n", __func__, n_IRQ); - return; + return; } if (src->ide == (1 << src->last_cpu)) { @@ -434,34 +434,34 @@ static void openpic_reset (void *opaque) opp->micr = 0x00000000; /* Initialise IRQ sources */ for (i = 0; i < opp->max_irq; i++) { - opp->src[i].ipvp = 0xA0000000; - opp->src[i].ide = 0x00000000; + opp->src[i].ipvp = 0xA0000000; + opp->src[i].ide = 0x00000000; } /* Initialise IRQ destinations */ for (i = 0; i < MAX_CPU; i++) { - opp->dst[i].pctp = 0x0000000F; - opp->dst[i].pcsr = 0x00000000; - memset(&opp->dst[i].raised, 0, sizeof(IRQ_queue_t)); + opp->dst[i].pctp = 0x0000000F; + opp->dst[i].pcsr = 0x00000000; + memset(&opp->dst[i].raised, 0, sizeof(IRQ_queue_t)); opp->dst[i].raised.next = -1; - memset(&opp->dst[i].servicing, 0, sizeof(IRQ_queue_t)); + memset(&opp->dst[i].servicing, 0, sizeof(IRQ_queue_t)); opp->dst[i].servicing.next = -1; } /* Initialise timers */ for (i = 0; i < MAX_TMR; i++) { - opp->timers[i].ticc = 0x00000000; - opp->timers[i].tibc = 0x80000000; + opp->timers[i].ticc = 0x00000000; + opp->timers[i].tibc = 0x80000000; } /* Initialise doorbells */ #if MAX_DBL > 0 opp->dar = 0x00000000; for (i = 0; i < MAX_DBL; i++) { - opp->doorbells[i].dmr = 0x00000000; + opp->doorbells[i].dmr = 0x00000000; } #endif /* Initialise mailboxes */ #if MAX_MBX > 0 for (i = 0; i < MAX_MBX; i++) { /* ? */ - opp->mailboxes[i].mbr = 0x00000000; + opp->mailboxes[i].mbr = 0x00000000; } #endif /* Go out of RESET state */ @@ -474,11 +474,11 @@ static inline uint32_t read_IRQreg (openpic_t *opp, int n_IRQ, uint32_t reg) switch (reg) { case IRQ_IPVP: - retval = opp->src[n_IRQ].ipvp; - break; + retval = opp->src[n_IRQ].ipvp; + break; case IRQ_IDE: - retval = opp->src[n_IRQ].ide; - break; + retval = opp->src[n_IRQ].ide; + break; } return retval; @@ -494,95 +494,95 @@ static inline void write_IRQreg (openpic_t *opp, int n_IRQ, /* NOTE: not fully accurate for special IRQs, but simple and sufficient */ /* ACTIVITY bit is read-only */ - opp->src[n_IRQ].ipvp = + opp->src[n_IRQ].ipvp = (opp->src[n_IRQ].ipvp & 0x40000000) | (val & 0x800F00FF); openpic_update_irq(opp, n_IRQ); DPRINTF("Set IPVP %d to 0x%08x -> 0x%08x\n", n_IRQ, val, opp->src[n_IRQ].ipvp); - break; + break; case IRQ_IDE: - tmp = val & 0xC0000000; + tmp = val & 0xC0000000; tmp |= val & ((1 << MAX_CPU) - 1); - opp->src[n_IRQ].ide = tmp; + opp->src[n_IRQ].ide = tmp; DPRINTF("Set IDE %d to 0x%08x\n", n_IRQ, opp->src[n_IRQ].ide); - break; + break; } } #if 0 // Code provision for Intel model #if MAX_DBL > 0 static uint32_t read_doorbell_register (openpic_t *opp, - int n_dbl, uint32_t offset) + int n_dbl, uint32_t offset) { uint32_t retval; switch (offset) { case DBL_IPVP_OFFSET: - retval = read_IRQreg(opp, IRQ_DBL0 + n_dbl, IRQ_IPVP); - break; + retval = read_IRQreg(opp, IRQ_DBL0 + n_dbl, IRQ_IPVP); + break; case DBL_IDE_OFFSET: - retval = read_IRQreg(opp, IRQ_DBL0 + n_dbl, IRQ_IDE); - break; + retval = read_IRQreg(opp, IRQ_DBL0 + n_dbl, IRQ_IDE); + break; case DBL_DMR_OFFSET: - retval = opp->doorbells[n_dbl].dmr; - break; + retval = opp->doorbells[n_dbl].dmr; + break; } return retval; } static void write_doorbell_register (penpic_t *opp, int n_dbl, - uint32_t offset, uint32_t value) + uint32_t offset, uint32_t value) { switch (offset) { case DBL_IVPR_OFFSET: - write_IRQreg(opp, IRQ_DBL0 + n_dbl, IRQ_IPVP, value); - break; + write_IRQreg(opp, IRQ_DBL0 + n_dbl, IRQ_IPVP, value); + break; case DBL_IDE_OFFSET: - write_IRQreg(opp, IRQ_DBL0 + n_dbl, IRQ_IDE, value); - break; + write_IRQreg(opp, IRQ_DBL0 + n_dbl, IRQ_IDE, value); + break; case DBL_DMR_OFFSET: - opp->doorbells[n_dbl].dmr = value; - break; + opp->doorbells[n_dbl].dmr = value; + break; } } #endif #if MAX_MBX > 0 static uint32_t read_mailbox_register (openpic_t *opp, - int n_mbx, uint32_t offset) + int n_mbx, uint32_t offset) { uint32_t retval; switch (offset) { case MBX_MBR_OFFSET: - retval = opp->mailboxes[n_mbx].mbr; - break; + retval = opp->mailboxes[n_mbx].mbr; + break; case MBX_IVPR_OFFSET: - retval = read_IRQreg(opp, IRQ_MBX0 + n_mbx, IRQ_IPVP); - break; + retval = read_IRQreg(opp, IRQ_MBX0 + n_mbx, IRQ_IPVP); + break; case MBX_DMR_OFFSET: - retval = read_IRQreg(opp, IRQ_MBX0 + n_mbx, IRQ_IDE); - break; + retval = read_IRQreg(opp, IRQ_MBX0 + n_mbx, IRQ_IDE); + break; } return retval; } static void write_mailbox_register (openpic_t *opp, int n_mbx, - uint32_t address, uint32_t value) + uint32_t address, uint32_t value) { switch (offset) { case MBX_MBR_OFFSET: - opp->mailboxes[n_mbx].mbr = value; - break; + opp->mailboxes[n_mbx].mbr = value; + break; case MBX_IVPR_OFFSET: - write_IRQreg(opp, IRQ_MBX0 + n_mbx, IRQ_IPVP, value); - break; + write_IRQreg(opp, IRQ_MBX0 + n_mbx, IRQ_IPVP, value); + break; case MBX_DMR_OFFSET: - write_IRQreg(opp, IRQ_MBX0 + n_mbx, IRQ_IDE, value); - break; + write_IRQreg(opp, IRQ_MBX0 + n_mbx, IRQ_IDE, value); + break; } } #endif @@ -608,9 +608,9 @@ static void openpic_gbl_write (void *opaque, target_phys_addr_t addr, uint32_t v if (val & 0x80000000 && opp->reset) opp->reset(opp); opp->glbc = val & ~0x80000000; - break; + break; case 0x80: /* VENI */ - break; + break; case 0x90: /* PINT */ for (idx = 0; idx < opp->nb_cpus; idx++) { if ((val & (1 << idx)) && !(opp->pint & (1 << idx))) { @@ -624,7 +624,7 @@ static void openpic_gbl_write (void *opaque, target_phys_addr_t addr, uint32_t v } } opp->pint = val; - break; + break; #if MAX_IPI > 0 case 0xA0: /* IPI_IPVP */ case 0xB0: @@ -642,7 +642,7 @@ static void openpic_gbl_write (void *opaque, target_phys_addr_t addr, uint32_t v break; case 0xF0: /* TIFR */ opp->tifr = val; - break; + break; default: break; } @@ -664,13 +664,13 @@ static uint32_t openpic_gbl_read (void *opaque, target_phys_addr_t addr) break; case 0x20: /* GLBC */ retval = opp->glbc; - break; + break; case 0x80: /* VENI */ retval = opp->veni; - break; + break; case 0x90: /* PINT */ retval = 0x00000000; - break; + break; #if MAX_IPI > 0 case 0xA0: /* IPI_IPVP */ case 0xB0: @@ -681,14 +681,14 @@ static uint32_t openpic_gbl_read (void *opaque, target_phys_addr_t addr) idx = (addr - 0xA0) >> 4; retval = read_IRQreg(opp, opp->irq_ipi0 + idx, IRQ_IPVP); } - break; + break; #endif case 0xE0: /* SPVE */ retval = opp->spve; break; case 0xF0: /* TIFR */ retval = opp->tifr; - break; + break; default: break; } @@ -719,18 +719,18 @@ static void openpic_timer_write (void *opaque, uint32_t addr, uint32_t val) case 0x00: /* TICC */ break; case 0x10: /* TIBC */ - if ((opp->timers[idx].ticc & 0x80000000) != 0 && - (val & 0x80000000) == 0 && + if ((opp->timers[idx].ticc & 0x80000000) != 0 && + (val & 0x80000000) == 0 && (opp->timers[idx].tibc & 0x80000000) != 0) - opp->timers[idx].ticc &= ~0x80000000; - opp->timers[idx].tibc = val; - break; + opp->timers[idx].ticc &= ~0x80000000; + opp->timers[idx].tibc = val; + break; case 0x20: /* TIVP */ write_IRQreg(opp, opp->irq_tim0 + idx, IRQ_IPVP, val); - break; + break; case 0x30: /* TIDE */ write_IRQreg(opp, opp->irq_tim0 + idx, IRQ_IDE, val); - break; + break; } } @@ -750,17 +750,17 @@ static uint32_t openpic_timer_read (void *opaque, uint32_t addr) addr = addr & 0x30; switch (addr) { case 0x00: /* TICC */ - retval = opp->timers[idx].ticc; + retval = opp->timers[idx].ticc; break; case 0x10: /* TIBC */ - retval = opp->timers[idx].tibc; - break; + retval = opp->timers[idx].tibc; + break; case 0x20: /* TIPV */ retval = read_IRQreg(opp, opp->irq_tim0 + idx, IRQ_IPVP); - break; + break; case 0x30: /* TIDE */ retval = read_IRQreg(opp, opp->irq_tim0 + idx, IRQ_IDE); - break; + break; } DPRINTF("%s: => %08x\n", __func__, retval); #if defined TARGET_WORDS_BIGENDIAN @@ -849,21 +849,21 @@ static void openpic_cpu_write (void *opaque, target_phys_addr_t addr, uint32_t v break; #endif case 0x80: /* PCTP */ - dst->pctp = val & 0x0000000F; - break; + dst->pctp = val & 0x0000000F; + break; case 0x90: /* WHOAMI */ - /* Read-only register */ - break; + /* Read-only register */ + break; case 0xA0: /* PIAC */ - /* Read-only register */ - break; + /* Read-only register */ + break; case 0xB0: /* PEOI */ DPRINTF("PEOI\n"); - s_IRQ = IRQ_get_next(opp, &dst->servicing); - IRQ_resetbit(&dst->servicing, s_IRQ); - dst->servicing.next = -1; - /* Set up next servicing IRQ */ - s_IRQ = IRQ_get_next(opp, &dst->servicing); + s_IRQ = IRQ_get_next(opp, &dst->servicing); + IRQ_resetbit(&dst->servicing, s_IRQ); + dst->servicing.next = -1; + /* Set up next servicing IRQ */ + s_IRQ = IRQ_get_next(opp, &dst->servicing); /* Check queued interrupts. */ n_IRQ = IRQ_get_next(opp, &dst->raised); src = &opp->src[n_IRQ]; @@ -874,7 +874,7 @@ static void openpic_cpu_write (void *opaque, target_phys_addr_t addr, uint32_t v idx, n_IRQ); opp->irq_raise(opp, idx, src); } - break; + break; default: break; } @@ -898,46 +898,46 @@ static uint32_t openpic_cpu_read (void *opaque, target_phys_addr_t addr) addr &= 0xFF0; switch (addr) { case 0x80: /* PCTP */ - retval = dst->pctp; - break; + retval = dst->pctp; + break; case 0x90: /* WHOAMI */ - retval = idx; - break; + retval = idx; + break; case 0xA0: /* PIAC */ DPRINTF("Lower OpenPIC INT output\n"); qemu_irq_lower(dst->irqs[OPENPIC_OUTPUT_INT]); - n_IRQ = IRQ_get_next(opp, &dst->raised); + n_IRQ = IRQ_get_next(opp, &dst->raised); DPRINTF("PIAC: irq=%d\n", n_IRQ); - if (n_IRQ == -1) { - /* No more interrupt pending */ + if (n_IRQ == -1) { + /* No more interrupt pending */ retval = IPVP_VECTOR(opp->spve); - } else { - src = &opp->src[n_IRQ]; - if (!test_bit(&src->ipvp, IPVP_ACTIVITY) || - !(IPVP_PRIORITY(src->ipvp) > dst->pctp)) { - /* - Spurious level-sensitive IRQ - * - Priorities has been changed - * and the pending IRQ isn't allowed anymore - */ - reset_bit(&src->ipvp, IPVP_ACTIVITY); - retval = IPVP_VECTOR(opp->spve); - } else { - /* IRQ enter servicing state */ - IRQ_setbit(&dst->servicing, n_IRQ); - retval = IPVP_VECTOR(src->ipvp); - } - IRQ_resetbit(&dst->raised, n_IRQ); - dst->raised.next = -1; - if (!test_bit(&src->ipvp, IPVP_SENSE)) { + } else { + src = &opp->src[n_IRQ]; + if (!test_bit(&src->ipvp, IPVP_ACTIVITY) || + !(IPVP_PRIORITY(src->ipvp) > dst->pctp)) { + /* - Spurious level-sensitive IRQ + * - Priorities has been changed + * and the pending IRQ isn't allowed anymore + */ + reset_bit(&src->ipvp, IPVP_ACTIVITY); + retval = IPVP_VECTOR(opp->spve); + } else { + /* IRQ enter servicing state */ + IRQ_setbit(&dst->servicing, n_IRQ); + retval = IPVP_VECTOR(src->ipvp); + } + IRQ_resetbit(&dst->raised, n_IRQ); + dst->raised.next = -1; + if (!test_bit(&src->ipvp, IPVP_SENSE)) { /* edge-sensitive IRQ */ - reset_bit(&src->ipvp, IPVP_ACTIVITY); + reset_bit(&src->ipvp, IPVP_ACTIVITY); src->pending = 0; } - } - break; + } + break; case 0xB0: /* PEOI */ - retval = 0; - break; + retval = 0; + break; #if MAX_IPI > 0 case 0x40: /* IDE */ case 0x50: