xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2024-11-24 20:19:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

arm_gic: Support setting/getting binary point reg

Browse Source 
Add a binary_point field to the gic emulation structure and support
setting/getting this register now when we have it.  We don't actually
support interrupt grouping yet, oh well.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Christoffer Dall 2013-09-12 22:18:20 -07:00 committed by Peter Maydell
parent 40d225009e
commit aa7d461ae9
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/intc/arm_gic.c
View File

@ -669,14 +669,15 @@ static uint32_t gic_cpu_read(GICState *s, int cpu, int offset)
case 0x04: /* Priority mask */ case 0x04: /* Priority mask */
return s->priority_mask[cpu]; return s->priority_mask[cpu];
case 0x08: /* Binary Point */ case 0x08: /* Binary Point */
/* ??? Not implemented. */ return s->bpr[cpu];
return 0;
case 0x0c: /* Acknowledge */ case 0x0c: /* Acknowledge */
return gic_acknowledge_irq(s, cpu); return gic_acknowledge_irq(s, cpu);
case 0x14: /* Running Priority */ case 0x14: /* Running Priority */
return s->running_priority[cpu]; return s->running_priority[cpu];
case 0x18: /* Highest Pending Interrupt */ case 0x18: /* Highest Pending Interrupt */
return s->current_pending[cpu]; return s->current_pending[cpu];
case 0x1c: /* Aliased Binary Point */
return s->abpr[cpu];
default: default:
qemu_log_mask(LOG_GUEST_ERROR, qemu_log_mask(LOG_GUEST_ERROR,
"gic_cpu_read: Bad offset %x\n", (int)offset); "gic_cpu_read: Bad offset %x\n", (int)offset);
@ -695,10 +696,15 @@ static void gic_cpu_write(GICState *s, int cpu, int offset, uint32_t value)
s->priority_mask[cpu] = (value & 0xff); s->priority_mask[cpu] = (value & 0xff);
break; break;
case 0x08: /* Binary Point */ case 0x08: /* Binary Point */
/* ??? Not implemented. */ s->bpr[cpu] = (value & 0x7);
break; break;
case 0x10: /* End Of Interrupt */ case 0x10: /* End Of Interrupt */
return gic_complete_irq(s, cpu, value & 0x3ff); return gic_complete_irq(s, cpu, value & 0x3ff);
case 0x1c: /* Aliased Binary Point */
if (s->revision >= 2) {
s->abpr[cpu] = (value & 0x7);
}
break;
default: default:
qemu_log_mask(LOG_GUEST_ERROR, qemu_log_mask(LOG_GUEST_ERROR,
"gic_cpu_write: Bad offset %x\n", (int)offset); "gic_cpu_write: Bad offset %x\n", (int)offset);

6
hw/intc/arm_gic_common.c
View File

@ -58,8 +58,8 @@ static const VMStateDescription vmstate_gic_irq_state = {
static const VMStateDescription vmstate_gic = { static const VMStateDescription vmstate_gic = {
.name = "arm_gic", .name = "arm_gic",
.version_id = 5, .version_id = 6,
.minimum_version_id = 5, .minimum_version_id = 6,
.pre_save = gic_pre_save, .pre_save = gic_pre_save,
.post_load = gic_post_load, .post_load = gic_post_load,
.fields = (VMStateField[]) { .fields = (VMStateField[]) {
@ -76,6 +76,8 @@ static const VMStateDescription vmstate_gic = {
VMSTATE_UINT16_ARRAY(running_irq, GICState, GIC_NCPU), VMSTATE_UINT16_ARRAY(running_irq, GICState, GIC_NCPU),
VMSTATE_UINT16_ARRAY(running_priority, GICState, GIC_NCPU), VMSTATE_UINT16_ARRAY(running_priority, GICState, GIC_NCPU),
VMSTATE_UINT16_ARRAY(current_pending, GICState, GIC_NCPU), VMSTATE_UINT16_ARRAY(current_pending, GICState, GIC_NCPU),
VMSTATE_UINT8_ARRAY(bpr, GICState, GIC_NCPU),
VMSTATE_UINT8_ARRAY(abpr, GICState, GIC_NCPU),
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()
} }
}; };

7
include/hw/intc/arm_gic_common.h
View File

@ -68,6 +68,13 @@ typedef struct GICState {
uint16_t running_priority[GIC_NCPU]; uint16_t running_priority[GIC_NCPU];
uint16_t current_pending[GIC_NCPU]; uint16_t current_pending[GIC_NCPU];
/* We present the GICv2 without security extensions to a guest and
* therefore the guest can configure the GICC_CTLR to configure group 1
* binary point in the abpr.
*/
uint8_t bpr[GIC_NCPU];
uint8_t abpr[GIC_NCPU];
uint32_t num_cpu; uint32_t num_cpu;
MemoryRegion iomem; /* Distributor */ MemoryRegion iomem; /* Distributor */