On Sat, 30 Mar 2024 at 10:33, Jinjie Ruan <ruanjin...@huawei.com> wrote:
>
> A SPI, PPI or SGI interrupt can have non-maskable property. So maintain
> non-maskable property in PendingIrq and GICR/GICD. Since add new device
> state, it also needs to be migrated, so also save NMI info in
> vmstate_gicv3_cpu and vmstate_gicv3.
>
> Signed-off-by: Jinjie Ruan <ruanjin...@huawei.com>
> Acked-by: Richard Henderson <richard.hender...@linaro.org>
> ---
> v11:
> - Put vmstate_gicv3_cpu_nmi and vmstate_gicv3_gicd_nmi into existing list.
> - Remove the excess != 0.
> v10:
> - superprio -> nmi, gicr_isuperprio -> gicr_inmir0.
> - Save NMI state in vmstate_gicv3_cpu and vmstate_gicv3.
> - Update the commit message.
> v3:
> - Place this ahead of implement GICR_INMIR.
> - Add Acked-by.
> ---
> hw/intc/arm_gicv3_common.c | 38 ++++++++++++++++++++++++++++++
> include/hw/intc/arm_gicv3_common.h | 4 ++++
> 2 files changed, 42 insertions(+)
>
> diff --git a/hw/intc/arm_gicv3_common.c b/hw/intc/arm_gicv3_common.c
> index 2d2cea6858..189258e1ca 100644
> --- a/hw/intc/arm_gicv3_common.c
> +++ b/hw/intc/arm_gicv3_common.c
> @@ -164,6 +164,24 @@ const VMStateDescription vmstate_gicv3_gicv4 = {
> }
> };
>
> +static bool nmi_needed(void *opaque)
> +{
> + GICv3CPUState *cs = opaque;
> +
> + return cs->gic->nmi_support;
> +}
I think we should call this function gicv3_cpu_nmi_needed()...
> +
> +static const VMStateDescription vmstate_gicv3_cpu_nmi = {
> + .name = "arm_gicv3_cpu/nmi",
> + .version_id = 1,
> + .minimum_version_id = 1,
> + .needed = nmi_needed,
> + .fields = (const VMStateField[]) {
> + VMSTATE_UINT32(gicr_inmir0, GICv3CPUState),
> + VMSTATE_END_OF_LIST()
> + }
> +};
> +
> static const VMStateDescription vmstate_gicv3_cpu = {
> .name = "arm_gicv3_cpu",
> .version_id = 1,
> @@ -196,6 +214,7 @@ static const VMStateDescription vmstate_gicv3_cpu = {
> &vmstate_gicv3_cpu_virt,
> &vmstate_gicv3_cpu_sre_el1,
> &vmstate_gicv3_gicv4,
> + &vmstate_gicv3_cpu_nmi,
> NULL
> }
> };
> @@ -238,6 +257,24 @@ const VMStateDescription
> vmstate_gicv3_gicd_no_migration_shift_bug = {
> }
> };
>
> +static bool needed_nmi(void *opaque)
> +{
> + GICv3State *cs = opaque;
> +
> + return cs->nmi_support;
> +}
...and this one gicv3_nmi_needed().
Otherwise
Reviewed-by: Peter Maydell <peter.mayd...@linaro.org>
thanks
-- PMM
