ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/intc/arm_gic: Implement Non-secure view of RPR 

For GICs with Security Extensions Non-secure reads have a restricted
view on the current running priority.

Signed-off-by: Fabian Aggeler <aggelerf@ethz.ch>
Signed-off-by: Greg Bellows <greg.bellows@linaro.org>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1430502643-25909-10-git-send-email-peter.maydell@linaro.org
Message-id: 1429113742-8371-11-git-send-email-greg.bellows@linaro.org
[PMM: make function static, minor comment tweak]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Fabian Aggeler 2015-05-12 11:57:17 +01:00 committed by Peter Maydell
parent 3295186083
commit 08efa9f2d1
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hw/intc/arm_gic.c
View File

@ -286,6 +286,23 @@ static void gic_set_cpu_control(GICState *s, int cpu, uint32_t value,
(s->cpu_ctlr[cpu] & GICC_CTLR_EN_GRP1) ? "En" : "Dis"); (s->cpu_ctlr[cpu] & GICC_CTLR_EN_GRP1) ? "En" : "Dis");
} }
static uint8_t gic_get_running_priority(GICState *s, int cpu, MemTxAttrs attrs)
{
if (s->security_extn && !attrs.secure) {
if (s->running_priority[cpu] & 0x80) {
/* Running priority in upper half of range: return the Non-secure
* view of the priority.
*/
return s->running_priority[cpu] << 1;
} else {
/* Running priority in lower half of range: RAZ */
return 0;
}
} else {
return s->running_priority[cpu];
}
}
void gic_complete_irq(GICState *s, int cpu, int irq) void gic_complete_irq(GICState *s, int cpu, int irq)
{ {
int update = 0; int update = 0;
@ -817,7 +834,7 @@ static MemTxResult gic_cpu_read(GICState *s, int cpu, int offset,
*data = gic_acknowledge_irq(s, cpu); *data = gic_acknowledge_irq(s, cpu);
break; break;
case 0x14: /* Running Priority */ case 0x14: /* Running Priority */
*data = s->running_priority[cpu]; *data = gic_get_running_priority(s, cpu, attrs);
break; break;
case 0x18: /* Highest Pending Interrupt */ case 0x18: /* Highest Pending Interrupt */
*data = s->current_pending[cpu]; *data = s->current_pending[cpu];