Hi,
On 23/02/2017 12:51, vijay.kil...@gmail.com wrote:
> From: Vijaya Kumar K <vijaya.ku...@cavium.com>
>
> 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 <vijaya.ku...@cavium.com>
> Reviewed-by: Peter Maydell <peter.mayd...@linaro.org>
Reviewed-by: Eric Auger <eric.au...@redhat.com>
Eric
> ---
> hw/intc/arm_gicv3_common.c | 2 ++
> hw/intc/arm_gicv3_cpuif.c | 8 ++++++++
> hw/intc/gicv3_internal.h | 2 ++
> target/arm/cpu.h | 2 ++
> 4 files changed, 14 insertions(+)
>
> 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 c25ee03..7849783 100644
> --- a/hw/intc/arm_gicv3_cpuif.c
> +++ b/hw/intc/arm_gicv3_cpuif.c
> @@ -18,6 +18,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.
> 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 0956a54..d2eb7bf 100644
> --- a/target/arm/cpu.h
> +++ b/target/arm/cpu.h
> @@ -517,6 +517,8 @@ typedef struct CPUARMState {
>
> void *nvic;
> const struct arm_boot_info *boot_info;
> + /* Store GICv3CPUState to access from this struct */
> + void *gicv3state;
> } CPUARMState;
>
> /**
>
