After commit 767adce2d, they are redundant.  This way we don't assign them
except when needed.  Once there, there were lots of cases where the ".fields"
indentation was wrong:
     .fields = (VMStateField []) {
and
     .fields =      (VMStateField []) {
Change all the combinations to:
     .fields = (VMStateField[]){
The biggest problem (apart from aesthetics) was that checkpatch complained
when we copy&pasted the code from one place to another.
Signed-off-by: Juan Quintela <quintela@redhat.com>
[PMM: fixed minor conflict, corrected commit message typos]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
		
	
			
		
			
				
	
	
		
			338 lines
		
	
	
		
			10 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			338 lines
		
	
	
		
			10 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * Intel XScale PXA Programmable Interrupt Controller.
 | 
						|
 *
 | 
						|
 * Copyright (c) 2006 Openedhand Ltd.
 | 
						|
 * Copyright (c) 2006 Thorsten Zitterell
 | 
						|
 * Written by Andrzej Zaborowski <balrog@zabor.org>
 | 
						|
 *
 | 
						|
 * This code is licensed under the GPL.
 | 
						|
 */
 | 
						|
 | 
						|
#include "hw/hw.h"
 | 
						|
#include "hw/arm/pxa.h"
 | 
						|
#include "hw/sysbus.h"
 | 
						|
 | 
						|
#define ICIP	0x00	/* Interrupt Controller IRQ Pending register */
 | 
						|
#define ICMR	0x04	/* Interrupt Controller Mask register */
 | 
						|
#define ICLR	0x08	/* Interrupt Controller Level register */
 | 
						|
#define ICFP	0x0c	/* Interrupt Controller FIQ Pending register */
 | 
						|
#define ICPR	0x10	/* Interrupt Controller Pending register */
 | 
						|
#define ICCR	0x14	/* Interrupt Controller Control register */
 | 
						|
#define ICHP	0x18	/* Interrupt Controller Highest Priority register */
 | 
						|
#define IPR0	0x1c	/* Interrupt Controller Priority register 0 */
 | 
						|
#define IPR31	0x98	/* Interrupt Controller Priority register 31 */
 | 
						|
#define ICIP2	0x9c	/* Interrupt Controller IRQ Pending register 2 */
 | 
						|
#define ICMR2	0xa0	/* Interrupt Controller Mask register 2 */
 | 
						|
#define ICLR2	0xa4	/* Interrupt Controller Level register 2 */
 | 
						|
#define ICFP2	0xa8	/* Interrupt Controller FIQ Pending register 2 */
 | 
						|
#define ICPR2	0xac	/* Interrupt Controller Pending register 2 */
 | 
						|
#define IPR32	0xb0	/* Interrupt Controller Priority register 32 */
 | 
						|
#define IPR39	0xcc	/* Interrupt Controller Priority register 39 */
 | 
						|
 | 
						|
#define PXA2XX_PIC_SRCS	40
 | 
						|
 | 
						|
#define TYPE_PXA2XX_PIC "pxa2xx_pic"
 | 
						|
#define PXA2XX_PIC(obj) \
 | 
						|
    OBJECT_CHECK(PXA2xxPICState, (obj), TYPE_PXA2XX_PIC)
 | 
						|
 | 
						|
typedef struct {
 | 
						|
    /*< private >*/
 | 
						|
    SysBusDevice parent_obj;
 | 
						|
    /*< public >*/
 | 
						|
 | 
						|
    MemoryRegion iomem;
 | 
						|
    ARMCPU *cpu;
 | 
						|
    uint32_t int_enabled[2];
 | 
						|
    uint32_t int_pending[2];
 | 
						|
    uint32_t is_fiq[2];
 | 
						|
    uint32_t int_idle;
 | 
						|
    uint32_t priority[PXA2XX_PIC_SRCS];
 | 
						|
} PXA2xxPICState;
 | 
						|
 | 
						|
static void pxa2xx_pic_update(void *opaque)
 | 
						|
{
 | 
						|
    uint32_t mask[2];
 | 
						|
    PXA2xxPICState *s = (PXA2xxPICState *) opaque;
 | 
						|
    CPUState *cpu = CPU(s->cpu);
 | 
						|
 | 
						|
    if (cpu->halted) {
 | 
						|
        mask[0] = s->int_pending[0] & (s->int_enabled[0] | s->int_idle);
 | 
						|
        mask[1] = s->int_pending[1] & (s->int_enabled[1] | s->int_idle);
 | 
						|
        if (mask[0] || mask[1]) {
 | 
						|
            cpu_interrupt(cpu, CPU_INTERRUPT_EXITTB);
 | 
						|
        }
 | 
						|
    }
 | 
						|
 | 
						|
    mask[0] = s->int_pending[0] & s->int_enabled[0];
 | 
						|
    mask[1] = s->int_pending[1] & s->int_enabled[1];
 | 
						|
 | 
						|
    if ((mask[0] & s->is_fiq[0]) || (mask[1] & s->is_fiq[1])) {
 | 
						|
        cpu_interrupt(cpu, CPU_INTERRUPT_FIQ);
 | 
						|
    } else {
 | 
						|
        cpu_reset_interrupt(cpu, CPU_INTERRUPT_FIQ);
 | 
						|
    }
 | 
						|
 | 
						|
    if ((mask[0] & ~s->is_fiq[0]) || (mask[1] & ~s->is_fiq[1])) {
 | 
						|
        cpu_interrupt(cpu, CPU_INTERRUPT_HARD);
 | 
						|
    } else {
 | 
						|
        cpu_reset_interrupt(cpu, CPU_INTERRUPT_HARD);
 | 
						|
    }
 | 
						|
}
 | 
						|
 | 
						|
/* Note: Here level means state of the signal on a pin, not
 | 
						|
 * IRQ/FIQ distinction as in PXA Developer Manual.  */
 | 
						|
static void pxa2xx_pic_set_irq(void *opaque, int irq, int level)
 | 
						|
{
 | 
						|
    PXA2xxPICState *s = (PXA2xxPICState *) opaque;
 | 
						|
    int int_set = (irq >= 32);
 | 
						|
    irq &= 31;
 | 
						|
 | 
						|
    if (level)
 | 
						|
        s->int_pending[int_set] |= 1 << irq;
 | 
						|
    else
 | 
						|
        s->int_pending[int_set] &= ~(1 << irq);
 | 
						|
 | 
						|
    pxa2xx_pic_update(opaque);
 | 
						|
}
 | 
						|
 | 
						|
static inline uint32_t pxa2xx_pic_highest(PXA2xxPICState *s) {
 | 
						|
    int i, int_set, irq;
 | 
						|
    uint32_t bit, mask[2];
 | 
						|
    uint32_t ichp = 0x003f003f;	/* Both IDs invalid */
 | 
						|
 | 
						|
    mask[0] = s->int_pending[0] & s->int_enabled[0];
 | 
						|
    mask[1] = s->int_pending[1] & s->int_enabled[1];
 | 
						|
 | 
						|
    for (i = PXA2XX_PIC_SRCS - 1; i >= 0; i --) {
 | 
						|
        irq = s->priority[i] & 0x3f;
 | 
						|
        if ((s->priority[i] & (1U << 31)) && irq < PXA2XX_PIC_SRCS) {
 | 
						|
            /* Source peripheral ID is valid.  */
 | 
						|
            bit = 1 << (irq & 31);
 | 
						|
            int_set = (irq >= 32);
 | 
						|
 | 
						|
            if (mask[int_set] & bit & s->is_fiq[int_set]) {
 | 
						|
                /* FIQ asserted */
 | 
						|
                ichp &= 0xffff0000;
 | 
						|
                ichp |= (1 << 15) | irq;
 | 
						|
            }
 | 
						|
 | 
						|
            if (mask[int_set] & bit & ~s->is_fiq[int_set]) {
 | 
						|
                /* IRQ asserted */
 | 
						|
                ichp &= 0x0000ffff;
 | 
						|
                ichp |= (1U << 31) | (irq << 16);
 | 
						|
            }
 | 
						|
        }
 | 
						|
    }
 | 
						|
 | 
						|
    return ichp;
 | 
						|
}
 | 
						|
 | 
						|
static uint64_t pxa2xx_pic_mem_read(void *opaque, hwaddr offset,
 | 
						|
                                    unsigned size)
 | 
						|
{
 | 
						|
    PXA2xxPICState *s = (PXA2xxPICState *) opaque;
 | 
						|
 | 
						|
    switch (offset) {
 | 
						|
    case ICIP:	/* IRQ Pending register */
 | 
						|
        return s->int_pending[0] & ~s->is_fiq[0] & s->int_enabled[0];
 | 
						|
    case ICIP2:	/* IRQ Pending register 2 */
 | 
						|
        return s->int_pending[1] & ~s->is_fiq[1] & s->int_enabled[1];
 | 
						|
    case ICMR:	/* Mask register */
 | 
						|
        return s->int_enabled[0];
 | 
						|
    case ICMR2:	/* Mask register 2 */
 | 
						|
        return s->int_enabled[1];
 | 
						|
    case ICLR:	/* Level register */
 | 
						|
        return s->is_fiq[0];
 | 
						|
    case ICLR2:	/* Level register 2 */
 | 
						|
        return s->is_fiq[1];
 | 
						|
    case ICCR:	/* Idle mask */
 | 
						|
        return (s->int_idle == 0);
 | 
						|
    case ICFP:	/* FIQ Pending register */
 | 
						|
        return s->int_pending[0] & s->is_fiq[0] & s->int_enabled[0];
 | 
						|
    case ICFP2:	/* FIQ Pending register 2 */
 | 
						|
        return s->int_pending[1] & s->is_fiq[1] & s->int_enabled[1];
 | 
						|
    case ICPR:	/* Pending register */
 | 
						|
        return s->int_pending[0];
 | 
						|
    case ICPR2:	/* Pending register 2 */
 | 
						|
        return s->int_pending[1];
 | 
						|
    case IPR0  ... IPR31:
 | 
						|
        return s->priority[0  + ((offset - IPR0 ) >> 2)];
 | 
						|
    case IPR32 ... IPR39:
 | 
						|
        return s->priority[32 + ((offset - IPR32) >> 2)];
 | 
						|
    case ICHP:	/* Highest Priority register */
 | 
						|
        return pxa2xx_pic_highest(s);
 | 
						|
    default:
 | 
						|
        printf("%s: Bad register offset " REG_FMT "\n", __FUNCTION__, offset);
 | 
						|
        return 0;
 | 
						|
    }
 | 
						|
}
 | 
						|
 | 
						|
static void pxa2xx_pic_mem_write(void *opaque, hwaddr offset,
 | 
						|
                                 uint64_t value, unsigned size)
 | 
						|
{
 | 
						|
    PXA2xxPICState *s = (PXA2xxPICState *) opaque;
 | 
						|
 | 
						|
    switch (offset) {
 | 
						|
    case ICMR:	/* Mask register */
 | 
						|
        s->int_enabled[0] = value;
 | 
						|
        break;
 | 
						|
    case ICMR2:	/* Mask register 2 */
 | 
						|
        s->int_enabled[1] = value;
 | 
						|
        break;
 | 
						|
    case ICLR:	/* Level register */
 | 
						|
        s->is_fiq[0] = value;
 | 
						|
        break;
 | 
						|
    case ICLR2:	/* Level register 2 */
 | 
						|
        s->is_fiq[1] = value;
 | 
						|
        break;
 | 
						|
    case ICCR:	/* Idle mask */
 | 
						|
        s->int_idle = (value & 1) ? 0 : ~0;
 | 
						|
        break;
 | 
						|
    case IPR0  ... IPR31:
 | 
						|
        s->priority[0  + ((offset - IPR0 ) >> 2)] = value & 0x8000003f;
 | 
						|
        break;
 | 
						|
    case IPR32 ... IPR39:
 | 
						|
        s->priority[32 + ((offset - IPR32) >> 2)] = value & 0x8000003f;
 | 
						|
        break;
 | 
						|
    default:
 | 
						|
        printf("%s: Bad register offset " REG_FMT "\n", __FUNCTION__, offset);
 | 
						|
        return;
 | 
						|
    }
 | 
						|
    pxa2xx_pic_update(opaque);
 | 
						|
}
 | 
						|
 | 
						|
/* Interrupt Controller Coprocessor Space Register Mapping */
 | 
						|
static const int pxa2xx_cp_reg_map[0x10] = {
 | 
						|
    [0x0 ... 0xf] = -1,
 | 
						|
    [0x0] = ICIP,
 | 
						|
    [0x1] = ICMR,
 | 
						|
    [0x2] = ICLR,
 | 
						|
    [0x3] = ICFP,
 | 
						|
    [0x4] = ICPR,
 | 
						|
    [0x5] = ICHP,
 | 
						|
    [0x6] = ICIP2,
 | 
						|
    [0x7] = ICMR2,
 | 
						|
    [0x8] = ICLR2,
 | 
						|
    [0x9] = ICFP2,
 | 
						|
    [0xa] = ICPR2,
 | 
						|
};
 | 
						|
 | 
						|
static uint64_t pxa2xx_pic_cp_read(CPUARMState *env, const ARMCPRegInfo *ri)
 | 
						|
{
 | 
						|
    int offset = pxa2xx_cp_reg_map[ri->crn];
 | 
						|
    return pxa2xx_pic_mem_read(ri->opaque, offset, 4);
 | 
						|
}
 | 
						|
 | 
						|
static void pxa2xx_pic_cp_write(CPUARMState *env, const ARMCPRegInfo *ri,
 | 
						|
                                uint64_t value)
 | 
						|
{
 | 
						|
    int offset = pxa2xx_cp_reg_map[ri->crn];
 | 
						|
    pxa2xx_pic_mem_write(ri->opaque, offset, value, 4);
 | 
						|
}
 | 
						|
 | 
						|
#define REGINFO_FOR_PIC_CP(NAME, CRN) \
 | 
						|
    { .name = NAME, .cp = 6, .crn = CRN, .crm = 0, .opc1 = 0, .opc2 = 0, \
 | 
						|
      .access = PL1_RW, \
 | 
						|
      .readfn = pxa2xx_pic_cp_read, .writefn = pxa2xx_pic_cp_write }
 | 
						|
 | 
						|
static const ARMCPRegInfo pxa_pic_cp_reginfo[] = {
 | 
						|
    REGINFO_FOR_PIC_CP("ICIP", 0),
 | 
						|
    REGINFO_FOR_PIC_CP("ICMR", 1),
 | 
						|
    REGINFO_FOR_PIC_CP("ICLR", 2),
 | 
						|
    REGINFO_FOR_PIC_CP("ICFP", 3),
 | 
						|
    REGINFO_FOR_PIC_CP("ICPR", 4),
 | 
						|
    REGINFO_FOR_PIC_CP("ICHP", 5),
 | 
						|
    REGINFO_FOR_PIC_CP("ICIP2", 6),
 | 
						|
    REGINFO_FOR_PIC_CP("ICMR2", 7),
 | 
						|
    REGINFO_FOR_PIC_CP("ICLR2", 8),
 | 
						|
    REGINFO_FOR_PIC_CP("ICFP2", 9),
 | 
						|
    REGINFO_FOR_PIC_CP("ICPR2", 0xa),
 | 
						|
    REGINFO_SENTINEL
 | 
						|
};
 | 
						|
 | 
						|
static const MemoryRegionOps pxa2xx_pic_ops = {
 | 
						|
    .read = pxa2xx_pic_mem_read,
 | 
						|
    .write = pxa2xx_pic_mem_write,
 | 
						|
    .endianness = DEVICE_NATIVE_ENDIAN,
 | 
						|
};
 | 
						|
 | 
						|
static int pxa2xx_pic_post_load(void *opaque, int version_id)
 | 
						|
{
 | 
						|
    pxa2xx_pic_update(opaque);
 | 
						|
    return 0;
 | 
						|
}
 | 
						|
 | 
						|
DeviceState *pxa2xx_pic_init(hwaddr base, ARMCPU *cpu)
 | 
						|
{
 | 
						|
    DeviceState *dev = qdev_create(NULL, TYPE_PXA2XX_PIC);
 | 
						|
    PXA2xxPICState *s = PXA2XX_PIC(dev);
 | 
						|
 | 
						|
    s->cpu = cpu;
 | 
						|
 | 
						|
    s->int_pending[0] = 0;
 | 
						|
    s->int_pending[1] = 0;
 | 
						|
    s->int_enabled[0] = 0;
 | 
						|
    s->int_enabled[1] = 0;
 | 
						|
    s->is_fiq[0] = 0;
 | 
						|
    s->is_fiq[1] = 0;
 | 
						|
 | 
						|
    qdev_init_nofail(dev);
 | 
						|
 | 
						|
    qdev_init_gpio_in(dev, pxa2xx_pic_set_irq, PXA2XX_PIC_SRCS);
 | 
						|
 | 
						|
    /* Enable IC memory-mapped registers access.  */
 | 
						|
    memory_region_init_io(&s->iomem, OBJECT(s), &pxa2xx_pic_ops, s,
 | 
						|
                          "pxa2xx-pic", 0x00100000);
 | 
						|
    sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->iomem);
 | 
						|
    sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base);
 | 
						|
 | 
						|
    /* Enable IC coprocessor access.  */
 | 
						|
    define_arm_cp_regs_with_opaque(cpu, pxa_pic_cp_reginfo, s);
 | 
						|
 | 
						|
    return dev;
 | 
						|
}
 | 
						|
 | 
						|
static VMStateDescription vmstate_pxa2xx_pic_regs = {
 | 
						|
    .name = "pxa2xx_pic",
 | 
						|
    .version_id = 0,
 | 
						|
    .minimum_version_id = 0,
 | 
						|
    .post_load = pxa2xx_pic_post_load,
 | 
						|
    .fields = (VMStateField[]) {
 | 
						|
        VMSTATE_UINT32_ARRAY(int_enabled, PXA2xxPICState, 2),
 | 
						|
        VMSTATE_UINT32_ARRAY(int_pending, PXA2xxPICState, 2),
 | 
						|
        VMSTATE_UINT32_ARRAY(is_fiq, PXA2xxPICState, 2),
 | 
						|
        VMSTATE_UINT32(int_idle, PXA2xxPICState),
 | 
						|
        VMSTATE_UINT32_ARRAY(priority, PXA2xxPICState, PXA2XX_PIC_SRCS),
 | 
						|
        VMSTATE_END_OF_LIST(),
 | 
						|
    },
 | 
						|
};
 | 
						|
 | 
						|
static int pxa2xx_pic_initfn(SysBusDevice *dev)
 | 
						|
{
 | 
						|
    return 0;
 | 
						|
}
 | 
						|
 | 
						|
static void pxa2xx_pic_class_init(ObjectClass *klass, void *data)
 | 
						|
{
 | 
						|
    DeviceClass *dc = DEVICE_CLASS(klass);
 | 
						|
    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
 | 
						|
 | 
						|
    k->init = pxa2xx_pic_initfn;
 | 
						|
    dc->desc = "PXA2xx PIC";
 | 
						|
    dc->vmsd = &vmstate_pxa2xx_pic_regs;
 | 
						|
}
 | 
						|
 | 
						|
static const TypeInfo pxa2xx_pic_info = {
 | 
						|
    .name          = TYPE_PXA2XX_PIC,
 | 
						|
    .parent        = TYPE_SYS_BUS_DEVICE,
 | 
						|
    .instance_size = sizeof(PXA2xxPICState),
 | 
						|
    .class_init    = pxa2xx_pic_class_init,
 | 
						|
};
 | 
						|
 | 
						|
static void pxa2xx_pic_register_types(void)
 | 
						|
{
 | 
						|
    type_register_static(&pxa2xx_pic_info);
 | 
						|
}
 | 
						|
 | 
						|
type_init(pxa2xx_pic_register_types)
 |