[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 16/21] target-arm: Add GICv3CPUState in CPUARMState s
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 16/21] target-arm: Add GICv3CPUState in CPUARMState struct |
Date: |
Tue, 28 Feb 2017 17:16:11 +0000 |
From: Vijaya Kumar K <address@hidden>
Add gicv3state void pointer to CPUARMState struct
to store GICv3CPUState.
In case of usecase like CPU reset, we need to reset
GICv3CPUState of the CPU. In such scenario, this pointer
becomes handy.
Signed-off-by: Vijaya Kumar K <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Reviewed-by: Eric Auger <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>
---
hw/intc/gicv3_internal.h | 2 ++
target/arm/cpu.h | 2 ++
hw/intc/arm_gicv3_common.c | 2 ++
hw/intc/arm_gicv3_cpuif.c | 8 ++++++++
4 files changed, 14 insertions(+)
diff --git a/hw/intc/gicv3_internal.h b/hw/intc/gicv3_internal.h
index 457118e..05303a5 100644
--- a/hw/intc/gicv3_internal.h
+++ b/hw/intc/gicv3_internal.h
@@ -408,4 +408,6 @@ static inline void
gicv3_cache_all_target_cpustates(GICv3State *s)
}
}
+void gicv3_set_gicv3state(CPUState *cpu, GICv3CPUState *s);
+
#endif /* QEMU_ARM_GICV3_INTERNAL_H */
diff --git a/target/arm/cpu.h b/target/arm/cpu.h
index 9e7b2df..25ceaab 100644
--- a/target/arm/cpu.h
+++ b/target/arm/cpu.h
@@ -521,6 +521,8 @@ typedef struct CPUARMState {
void *nvic;
const struct arm_boot_info *boot_info;
+ /* Store GICv3CPUState to access from this struct */
+ void *gicv3state;
} CPUARMState;
/**
diff --git a/hw/intc/arm_gicv3_common.c b/hw/intc/arm_gicv3_common.c
index 5b0e456..c6493d6 100644
--- a/hw/intc/arm_gicv3_common.c
+++ b/hw/intc/arm_gicv3_common.c
@@ -252,6 +252,8 @@ static void arm_gicv3_common_realize(DeviceState *dev,
Error **errp)
s->cpu[i].cpu = cpu;
s->cpu[i].gic = s;
+ /* Store GICv3CPUState in CPUARMState gicv3state pointer */
+ gicv3_set_gicv3state(cpu, &s->cpu[i]);
/* Pre-construct the GICR_TYPER:
* For our implementation:
diff --git a/hw/intc/arm_gicv3_cpuif.c b/hw/intc/arm_gicv3_cpuif.c
index f775aba..0b20856 100644
--- a/hw/intc/arm_gicv3_cpuif.c
+++ b/hw/intc/arm_gicv3_cpuif.c
@@ -19,6 +19,14 @@
#include "gicv3_internal.h"
#include "cpu.h"
+void gicv3_set_gicv3state(CPUState *cpu, GICv3CPUState *s)
+{
+ ARMCPU *arm_cpu = ARM_CPU(cpu);
+ CPUARMState *env = &arm_cpu->env;
+
+ env->gicv3state = (void *)s;
+};
+
static GICv3CPUState *icc_cs_from_env(CPUARMState *env)
{
/* Given the CPU, find the right GICv3CPUState struct.
--
2.7.4
- [Qemu-devel] [PULL 01/21] armv7m: Abstract out the "load kernel" code, (continued)
- [Qemu-devel] [PULL 01/21] armv7m: Abstract out the "load kernel" code, Peter Maydell, 2017/02/28
- [Qemu-devel] [PULL 04/21] armv7m: Use QOMified armv7m object in armv7m_init(), Peter Maydell, 2017/02/28
- [Qemu-devel] [PULL 18/21] qdev: Have qdev_set_parent_bus() handle devices already on a bus, Peter Maydell, 2017/02/28
- [Qemu-devel] [PULL 17/21] hw/intc/arm_gicv3_kvm: Reset GICv3 cpu interface registers, Peter Maydell, 2017/02/28
- [Qemu-devel] [PULL 07/21] armv7m: Make bitband device take the address space to access, Peter Maydell, 2017/02/28
- [Qemu-devel] [PULL 09/21] armv7m: Split systick out from NVIC, Peter Maydell, 2017/02/28
- [Qemu-devel] [PULL 21/21] bcm2835: add sdhost and gpio controllers, Peter Maydell, 2017/02/28
- [Qemu-devel] [PULL 15/21] hw/intc/arm_gicv3_kvm: Implement get/put functions, Peter Maydell, 2017/02/28
- [Qemu-devel] [PULL 10/21] stm32f205: Create armv7m object without using armv7m_init(), Peter Maydell, 2017/02/28
- [Qemu-devel] [PULL 14/21] hw/intc/arm_gicv3_kvm: Add ICC_SRE_EL1 register to vmstate, Peter Maydell, 2017/02/28
- [Qemu-devel] [PULL 16/21] target-arm: Add GICv3CPUState in CPUARMState struct,
Peter Maydell <=
- [Qemu-devel] [PULL 19/21] hw/sd: add card-reparenting function, Peter Maydell, 2017/02/28
- [Qemu-devel] [PULL 20/21] bcm2835_gpio: add bcm2835 gpio controller, Peter Maydell, 2017/02/28
- [Qemu-devel] [PULL 06/21] armv7m: Make NVIC expose a memory region rather than mapping itself, Peter Maydell, 2017/02/28
- [Qemu-devel] [PULL 13/21] update Linux headers to 4.11, Peter Maydell, 2017/02/28
- [Qemu-devel] [PULL 12/21] update-linux-headers: update for 4.11, Peter Maydell, 2017/02/28