Replace legacy reset callback register device_class_set_legacy_reset()
with new function resettable_class_set_parent_phases(). With new API,
it will call reset callback of parent object.

The internal state has been cleared in parent object
LOONGARCH_PIC_COMMON, here parent_phases.hold() is directly called.

Signed-off-by: Bibo Mao <maobibo@loongson.cn>
---
 hw/intc/loongarch_pch_pic.c         | 26 ++++++++------------------
 include/hw/intc/loongarch_pch_pic.h |  1 +
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/hw/intc/loongarch_pch_pic.c b/hw/intc/loongarch_pch_pic.c
index acd75ccb0c..32b7275996 100644
--- a/hw/intc/loongarch_pch_pic.c
+++ b/hw/intc/loongarch_pch_pic.c
@@ -354,25 +354,13 @@ static const MemoryRegionOps loongarch_pch_pic_reg8_ops = {
     .endianness = DEVICE_LITTLE_ENDIAN,
 };
 
-static void loongarch_pch_pic_reset(DeviceState *d)
+static void loongarch_pic_reset_hold(Object *obj, ResetType type)
 {
-    LoongArchPICCommonState *s = LOONGARCH_PIC_COMMON(d);
-    int i;
-
-    s->int_mask = -1;
-    s->htmsi_en = 0x0;
-    s->intedge  = 0x0;
-    s->intclr   = 0x0;
-    s->auto_crtl0 = 0x0;
-    s->auto_crtl1 = 0x0;
-    for (i = 0; i < 64; i++) {
-        s->route_entry[i] = 0x1;
-        s->htmsi_vector[i] = 0x0;
+    LoongarchPICClass *lpc = LOONGARCH_PIC_GET_CLASS(obj);
+
+    if (lpc->parent_phases.hold) {
+        lpc->parent_phases.hold(obj, type);
     }
-    s->intirr = 0x0;
-    s->intisr = 0x0;
-    s->last_intirr = 0x0;
-    s->int_polarity = 0x0;
 }
 
 static void loongarch_pic_realize(DeviceState *dev, Error **errp)
@@ -408,8 +396,10 @@ static void loongarch_pic_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
     LoongarchPICClass *lpc = LOONGARCH_PIC_CLASS(klass);
+    ResettableClass *rc = RESETTABLE_CLASS(klass);
 
-    device_class_set_legacy_reset(dc, loongarch_pch_pic_reset);
+    resettable_class_set_parent_phases(rc, NULL, loongarch_pic_reset_hold,
+                                       NULL, &lpc->parent_phases);
     device_class_set_parent_realize(dc, loongarch_pic_realize,
                                     &lpc->parent_realize);
 }
diff --git a/include/hw/intc/loongarch_pch_pic.h b/include/hw/intc/loongarch_pch_pic.h
index 481cc58aed..839a59a43b 100644
--- a/include/hw/intc/loongarch_pch_pic.h
+++ b/include/hw/intc/loongarch_pch_pic.h
@@ -22,6 +22,7 @@ struct LoongarchPICClass {
     LoongArchPICCommonClass parent_class;
 
     DeviceRealize parent_realize;
+    ResettablePhases parent_phases;
 };
 
 #endif /* HW_LOONGARCH_PCH_PIC_H */
-- 
2.39.3

在 2025/3/7 下午3:13, Bibo Mao 写道:
> Replace legacy reset callback register device_class_set_legacy_reset()
> with new function resettable_class_set_parent_phases(). With new API,
> it will call reset callback of parent object.
>
> The internal state has been cleared in parent object
> LOONGARCH_PIC_COMMON, here parent_phases.hold() is directly called.
>
> Signed-off-by: Bibo Mao <maobibo@loongson.cn>
> ---
>   hw/intc/loongarch_pch_pic.c         | 26 ++++++++------------------
>   include/hw/intc/loongarch_pch_pic.h |  1 +
>   2 files changed, 9 insertions(+), 18 deletions(-)
Reviewed-by: Song Gao <gaosong@loongson.cn>

thanks.
Song Gao
> diff --git a/hw/intc/loongarch_pch_pic.c b/hw/intc/loongarch_pch_pic.c
> index acd75ccb0c..32b7275996 100644
> --- a/hw/intc/loongarch_pch_pic.c
> +++ b/hw/intc/loongarch_pch_pic.c
> @@ -354,25 +354,13 @@ static const MemoryRegionOps loongarch_pch_pic_reg8_ops = {
>       .endianness = DEVICE_LITTLE_ENDIAN,
>   };
>   
> -static void loongarch_pch_pic_reset(DeviceState *d)
> +static void loongarch_pic_reset_hold(Object *obj, ResetType type)
>   {
> -    LoongArchPICCommonState *s = LOONGARCH_PIC_COMMON(d);
> -    int i;
> -
> -    s->int_mask = -1;
> -    s->htmsi_en = 0x0;
> -    s->intedge  = 0x0;
> -    s->intclr   = 0x0;
> -    s->auto_crtl0 = 0x0;
> -    s->auto_crtl1 = 0x0;
> -    for (i = 0; i < 64; i++) {
> -        s->route_entry[i] = 0x1;
> -        s->htmsi_vector[i] = 0x0;
> +    LoongarchPICClass *lpc = LOONGARCH_PIC_GET_CLASS(obj);
> +
> +    if (lpc->parent_phases.hold) {
> +        lpc->parent_phases.hold(obj, type);
>       }
> -    s->intirr = 0x0;
> -    s->intisr = 0x0;
> -    s->last_intirr = 0x0;
> -    s->int_polarity = 0x0;
>   }
>   
>   static void loongarch_pic_realize(DeviceState *dev, Error **errp)
> @@ -408,8 +396,10 @@ static void loongarch_pic_class_init(ObjectClass *klass, void *data)
>   {
>       DeviceClass *dc = DEVICE_CLASS(klass);
>       LoongarchPICClass *lpc = LOONGARCH_PIC_CLASS(klass);
> +    ResettableClass *rc = RESETTABLE_CLASS(klass);
>   
> -    device_class_set_legacy_reset(dc, loongarch_pch_pic_reset);
> +    resettable_class_set_parent_phases(rc, NULL, loongarch_pic_reset_hold,
> +                                       NULL, &lpc->parent_phases);
>       device_class_set_parent_realize(dc, loongarch_pic_realize,
>                                       &lpc->parent_realize);
>   }
> diff --git a/include/hw/intc/loongarch_pch_pic.h b/include/hw/intc/loongarch_pch_pic.h
> index 481cc58aed..839a59a43b 100644
> --- a/include/hw/intc/loongarch_pch_pic.h
> +++ b/include/hw/intc/loongarch_pch_pic.h
> @@ -22,6 +22,7 @@ struct LoongarchPICClass {
>       LoongArchPICCommonClass parent_class;
>   
>       DeviceRealize parent_realize;
> +    ResettablePhases parent_phases;
>   };
>   
>   #endif /* HW_LOONGARCH_PCH_PIC_H */