|
@@ -379,13 +379,25 @@ static void loongarch_pch_pic_reset(DeviceState *d)
|
|
|
s->int_polarity = 0x0;
|
|
|
}
|
|
|
|
|
|
+static void loongarch_pic_common_realize(DeviceState *dev, Error **errp)
|
|
|
+{
|
|
|
+ LoongArchPICCommonState *s = LOONGARCH_PCH_PIC(dev);
|
|
|
+
|
|
|
+ if (!s->irq_num || s->irq_num > VIRT_PCH_PIC_IRQ_NUM) {
|
|
|
+ error_setg(errp, "Invalid 'pic_irq_num'");
|
|
|
+ return;
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
static void loongarch_pch_pic_realize(DeviceState *dev, Error **errp)
|
|
|
{
|
|
|
LoongArchPCHPIC *s = LOONGARCH_PCH_PIC(dev);
|
|
|
SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
|
|
|
+ Error *local_err = NULL;
|
|
|
|
|
|
- if (!s->irq_num || s->irq_num > VIRT_PCH_PIC_IRQ_NUM) {
|
|
|
- error_setg(errp, "Invalid 'pic_irq_num'");
|
|
|
+ loongarch_pic_common_realize(dev, &local_err);
|
|
|
+ if (local_err) {
|
|
|
+ error_propagate(errp, local_err);
|
|
|
return;
|
|
|
}
|
|
|
|
|
@@ -405,28 +417,28 @@ static void loongarch_pch_pic_realize(DeviceState *dev, Error **errp)
|
|
|
|
|
|
}
|
|
|
|
|
|
-static const Property loongarch_pch_pic_properties[] = {
|
|
|
- DEFINE_PROP_UINT32("pch_pic_irq_num", LoongArchPCHPIC, irq_num, 0),
|
|
|
+static const Property loongarch_pic_common_properties[] = {
|
|
|
+ DEFINE_PROP_UINT32("pch_pic_irq_num", LoongArchPICCommonState, irq_num, 0),
|
|
|
DEFINE_PROP_END_OF_LIST(),
|
|
|
};
|
|
|
|
|
|
-static const VMStateDescription vmstate_loongarch_pch_pic = {
|
|
|
- .name = TYPE_LOONGARCH_PCH_PIC,
|
|
|
+static const VMStateDescription vmstate_loongarch_pic_common = {
|
|
|
+ .name = "loongarch_pch_pic",
|
|
|
.version_id = 1,
|
|
|
.minimum_version_id = 1,
|
|
|
.fields = (const VMStateField[]) {
|
|
|
- VMSTATE_UINT64(int_mask, LoongArchPCHPIC),
|
|
|
- VMSTATE_UINT64(htmsi_en, LoongArchPCHPIC),
|
|
|
- VMSTATE_UINT64(intedge, LoongArchPCHPIC),
|
|
|
- VMSTATE_UINT64(intclr, LoongArchPCHPIC),
|
|
|
- VMSTATE_UINT64(auto_crtl0, LoongArchPCHPIC),
|
|
|
- VMSTATE_UINT64(auto_crtl1, LoongArchPCHPIC),
|
|
|
- VMSTATE_UINT8_ARRAY(route_entry, LoongArchPCHPIC, 64),
|
|
|
- VMSTATE_UINT8_ARRAY(htmsi_vector, LoongArchPCHPIC, 64),
|
|
|
- VMSTATE_UINT64(last_intirr, LoongArchPCHPIC),
|
|
|
- VMSTATE_UINT64(intirr, LoongArchPCHPIC),
|
|
|
- VMSTATE_UINT64(intisr, LoongArchPCHPIC),
|
|
|
- VMSTATE_UINT64(int_polarity, LoongArchPCHPIC),
|
|
|
+ VMSTATE_UINT64(int_mask, LoongArchPICCommonState),
|
|
|
+ VMSTATE_UINT64(htmsi_en, LoongArchPICCommonState),
|
|
|
+ VMSTATE_UINT64(intedge, LoongArchPICCommonState),
|
|
|
+ VMSTATE_UINT64(intclr, LoongArchPICCommonState),
|
|
|
+ VMSTATE_UINT64(auto_crtl0, LoongArchPICCommonState),
|
|
|
+ VMSTATE_UINT64(auto_crtl1, LoongArchPICCommonState),
|
|
|
+ VMSTATE_UINT8_ARRAY(route_entry, LoongArchPICCommonState, 64),
|
|
|
+ VMSTATE_UINT8_ARRAY(htmsi_vector, LoongArchPICCommonState, 64),
|
|
|
+ VMSTATE_UINT64(last_intirr, LoongArchPICCommonState),
|
|
|
+ VMSTATE_UINT64(intirr, LoongArchPICCommonState),
|
|
|
+ VMSTATE_UINT64(intisr, LoongArchPICCommonState),
|
|
|
+ VMSTATE_UINT64(int_polarity, LoongArchPICCommonState),
|
|
|
VMSTATE_END_OF_LIST()
|
|
|
}
|
|
|
};
|
|
@@ -437,8 +449,8 @@ static void loongarch_pch_pic_class_init(ObjectClass *klass, void *data)
|
|
|
|
|
|
dc->realize = loongarch_pch_pic_realize;
|
|
|
device_class_set_legacy_reset(dc, loongarch_pch_pic_reset);
|
|
|
- dc->vmsd = &vmstate_loongarch_pch_pic;
|
|
|
- device_class_set_props(dc, loongarch_pch_pic_properties);
|
|
|
+ dc->vmsd = &vmstate_loongarch_pic_common;
|
|
|
+ device_class_set_props(dc, loongarch_pic_common_properties);
|
|
|
}
|
|
|
|
|
|
static const TypeInfo loongarch_pch_pic_info = {
|