Skip to contentSkip to conversation

hw/ppc: Snapshot support for several ppc devices

PATCH Superseded Caleb Schlossin 6 participants 21 messages Dec 16, 2025 – Jan 5

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

v3 cover hw/ppc: Snapshot support for several ppc devices

Addressing comments from V2 review:

Updates in V3:
- pnv_psi: Remove PSI_DEBUG section as it was not used
- pnv_psi: Add missing post_load and vmstate info

Updates in V2:
- Added new patch set for PnvPsi support as it fits with the rest
- Added vmstate support for Power8 and Power9 for LPC
- Fixed pnv_core.c commit message

Tested:
passed make check

Thanks,
Caleb

Michael Kowal (2):
hw/ppc: Add VMSTATE information for LPC model
hw/ppc: Add VMSTATE information to PnvPsi

Caleb Schlossin (2):
hw/ppc: Add pnv_spi vmstate support
hw/ppc: Add pnv_i2c vmstate support

Angelo Jaramillo (3):
hw/ppc: pnv_adu.c added vmstate support
hw/ppc: pnv_core.c add vmstate support
hw/ppc: pnv_chiptod.c add vmstate support

 hw/ppc/pnv_adu.c             | 12 +++++++++++
 hw/ppc/pnv_chiptod.c         | 38 +++++++++++++++++++++++++++++++++
 hw/ppc/pnv_core.c            | 22 +++++++++++++++++++
 hw/ppc/pnv_i2c.c             | 11 ++++++++++
 hw/ppc/pnv_lpc.c             | 41 ++++++++++++++++++++++++++++++++++++
 hw/ppc/pnv_psi.c             | 36 +++++++++++++++++++++++++++++--
 hw/ssi/pnv_spi.c             | 27 ++++++++++++++++++++++++
 include/hw/ppc/pnv_chiptod.h |  2 ++
 8 files changed, 187 insertions(+), 2 deletions(-)
Signature · 1 line
2.47.3
#1 lore raw

PATCH v3 1/7 hw/ppc: Add VMSTATE information for LPC model

The PNV LPC model needs snapshot/migration support. Added a VMSTATE descriptor to save model data and an associated post_load() method. Snapshot support added for Power8, Power9, and Power10.

---
 hw/ppc/pnv_lpc.c | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
hw/ppc/pnv_lpc.c +41 -0
index f6beba0917..e52a062181 100644
@@ -30,6 +30,7 @@
 #include "hw/ppc/pnv_lpc.h"
 #include "hw/ppc/pnv_xscom.h"
 #include "hw/ppc/fdt.h"
+#include "migration/vmstate.h"
 
 #include <libfdt.h>
 
@@ -696,6 +697,43 @@ static const MemoryRegionOps opb_master_ops = {
     },
 };
 
+static int vmstate_pnv_lpc_post_load(void *opaque, int version_id)
+{
+    PnvLpcController *lpc = PNV_LPC(opaque);
+
+    memory_region_set_alias_offset(&lpc->opb_isa_fw,
+                                   lpc->lpc_hc_fw_seg_idsel * LPC_FW_OPB_SIZE);
+    pnv_lpc_eval_serirq_routes(lpc);
+
+    pnv_lpc_eval_irqs(lpc);
+    return 0;
+}
+
+static const VMStateDescription vmstate_pnv_lpc = {
+    .name = TYPE_PNV_LPC,
+    .version_id = 1,
+    .minimum_version_id = 1,
+    .post_load = vmstate_pnv_lpc_post_load,
+    .fields = (const VMStateField[]) {
+        VMSTATE_UINT64(eccb_stat_reg,       PnvLpcController),
+        VMSTATE_UINT32(eccb_data_reg,       PnvLpcController),
+        VMSTATE_UINT32(opb_irq_route0,      PnvLpcController),
+        VMSTATE_UINT32(opb_irq_route1,      PnvLpcController),
+        VMSTATE_UINT32(opb_irq_stat,        PnvLpcController),
+        VMSTATE_UINT32(opb_irq_mask,        PnvLpcController),
+        VMSTATE_UINT32(opb_irq_pol,         PnvLpcController),
+        VMSTATE_UINT32(opb_irq_input,       PnvLpcController),
+        VMSTATE_UINT32(lpc_hc_irq_inputs,   PnvLpcController),
+        VMSTATE_UINT32(lpc_hc_fw_seg_idsel, PnvLpcController),
+        VMSTATE_UINT32(lpc_hc_irqser_ctrl,  PnvLpcController),
+        VMSTATE_UINT32(lpc_hc_irqmask,      PnvLpcController),
+        VMSTATE_UINT32(lpc_hc_irqstat,      PnvLpcController),
+        VMSTATE_UINT32(lpc_hc_error_addr,   PnvLpcController),
+        VMSTATE_UINT32(lpc_hc_fw_rd_acc_size,     PnvLpcController),
+        VMSTATE_END_OF_LIST()
+    }
+};
+
 static void pnv_lpc_power8_realize(DeviceState *dev, Error **errp)
 {
     PnvLpcController *lpc = PNV_LPC(dev);
@@ -721,6 +759,7 @@ static void pnv_lpc_power8_class_init(ObjectClass *klass, const void *data)
     PnvLpcClass *plc = PNV_LPC_CLASS(klass);
 
     dc->desc = "PowerNV LPC Controller POWER8";
+    dc->vmsd = &vmstate_pnv_lpc;
 
     xdc->dt_xscom = pnv_lpc_dt_xscom;
 
@@ -766,6 +805,7 @@ static void pnv_lpc_power9_class_init(ObjectClass *klass, const void *data)
     PnvLpcClass *plc = PNV_LPC_CLASS(klass);
 
     dc->desc = "PowerNV LPC Controller POWER9";
+    dc->vmsd = &vmstate_pnv_lpc;
 
     device_class_set_parent_realize(dc, pnv_lpc_power9_realize,
                                     &plc->parent_realize);
@@ -782,6 +822,7 @@ static void pnv_lpc_power10_class_init(ObjectClass *klass, const void *data)
     DeviceClass *dc = DEVICE_CLASS(klass);
 
     dc->desc = "PowerNV LPC Controller POWER10";
+    dc->vmsd = &vmstate_pnv_lpc;
 }
 
 static const TypeInfo pnv_lpc_power10_info = {
Signature · 1 line
2.47.3
Reviewed-by on v3 1/7
#2 lore raw

Re: [PATCH v3 1/7] hw/ppc: Add VMSTATE information for LPC model

Thanks, MAK

Quoted 90 lines · Caleb Schlossin

The PNV LPC model needs snapshot/migration support. Added a VMSTATE descriptor to save model data and an associated post_load() method. Snapshot support added for Power8, Power9, and Power10.

---
  hw/ppc/pnv_lpc.c | 41 +++++++++++++++++++++++++++++++++++++++++
  1 file changed, 41 insertions(+)
hw/ppc/pnv_lpc.c +41 -0
index f6beba0917..e52a062181 100644
@@ -30,6 +30,7 @@
  #include "hw/ppc/pnv_lpc.h"
  #include "hw/ppc/pnv_xscom.h"
  #include "hw/ppc/fdt.h"
+#include "migration/vmstate.h"
 
  #include <libfdt.h>
 
@@ -696,6 +697,43 @@ static const MemoryRegionOps opb_master_ops = {
      },
  };
 
+static int vmstate_pnv_lpc_post_load(void *opaque, int version_id)
+{
+    PnvLpcController *lpc = PNV_LPC(opaque);
+
+    memory_region_set_alias_offset(&lpc->opb_isa_fw,
+                                   lpc->lpc_hc_fw_seg_idsel * LPC_FW_OPB_SIZE);
+    pnv_lpc_eval_serirq_routes(lpc);
+
+    pnv_lpc_eval_irqs(lpc);
+    return 0;
+}
+
+static const VMStateDescription vmstate_pnv_lpc = {
+    .name = TYPE_PNV_LPC,
+    .version_id = 1,
+    .minimum_version_id = 1,
+    .post_load = vmstate_pnv_lpc_post_load,
+    .fields = (const VMStateField[]) {
+        VMSTATE_UINT64(eccb_stat_reg,       PnvLpcController),
+        VMSTATE_UINT32(eccb_data_reg,       PnvLpcController),
+        VMSTATE_UINT32(opb_irq_route0,      PnvLpcController),
+        VMSTATE_UINT32(opb_irq_route1,      PnvLpcController),
+        VMSTATE_UINT32(opb_irq_stat,        PnvLpcController),
+        VMSTATE_UINT32(opb_irq_mask,        PnvLpcController),
+        VMSTATE_UINT32(opb_irq_pol,         PnvLpcController),
+        VMSTATE_UINT32(opb_irq_input,       PnvLpcController),
+        VMSTATE_UINT32(lpc_hc_irq_inputs,   PnvLpcController),
+        VMSTATE_UINT32(lpc_hc_fw_seg_idsel, PnvLpcController),
+        VMSTATE_UINT32(lpc_hc_irqser_ctrl,  PnvLpcController),
+        VMSTATE_UINT32(lpc_hc_irqmask,      PnvLpcController),
+        VMSTATE_UINT32(lpc_hc_irqstat,      PnvLpcController),
+        VMSTATE_UINT32(lpc_hc_error_addr,   PnvLpcController),
+        VMSTATE_UINT32(lpc_hc_fw_rd_acc_size,     PnvLpcController),
+        VMSTATE_END_OF_LIST()
+    }
+};
+
  static void pnv_lpc_power8_realize(DeviceState *dev, Error **errp)
  {
      PnvLpcController *lpc = PNV_LPC(dev);
@@ -721,6 +759,7 @@ static void pnv_lpc_power8_class_init(ObjectClass *klass, const void *data)
      PnvLpcClass *plc = PNV_LPC_CLASS(klass);
 
      dc->desc = "PowerNV LPC Controller POWER8";
+    dc->vmsd = &vmstate_pnv_lpc;
 
      xdc->dt_xscom = pnv_lpc_dt_xscom;
 
@@ -766,6 +805,7 @@ static void pnv_lpc_power9_class_init(ObjectClass *klass, const void *data)
      PnvLpcClass *plc = PNV_LPC_CLASS(klass);
 
      dc->desc = "PowerNV LPC Controller POWER9";
+    dc->vmsd = &vmstate_pnv_lpc;
 
      device_class_set_parent_realize(dc, pnv_lpc_power9_realize,
                                      &plc->parent_realize);
@@ -782,6 +822,7 @@ static void pnv_lpc_power10_class_init(ObjectClass *klass, const void *data)
      DeviceClass *dc = DEVICE_CLASS(klass);
 
      dc->desc = "PowerNV LPC Controller POWER10";
+    dc->vmsd = &vmstate_pnv_lpc;
  }
 
  static const TypeInfo pnv_lpc_power10_info = {
#3 lore raw

PATCH v3 2/7 hw/ppc: Add pnv_spi vmstate support

In reply to Caleb Schlossin

- Add support for needed PnvSpi structure variables

---
 hw/ssi/pnv_spi.c | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
hw/ssi/pnv_spi.c +27 -0
index f40e8836b9..389a2cca6b 100644
@@ -13,6 +13,7 @@
 #include "hw/ssi/pnv_spi.h"
 #include "hw/ssi/pnv_spi_regs.h"
 #include "hw/ssi/ssi.h"
+#include "migration/vmstate.h"
 #include <libfdt.h>
 #include "hw/irq.h"
 #include "trace.h"
@@ -1199,6 +1200,31 @@ static int pnv_spi_dt_xscom(PnvXScomInterface *dev, void *fdt,
     return 0;
 }
 
+static const VMStateDescription pnv_spi_vmstate = {
+    .name = TYPE_PNV_SPI,
+    .version_id = 1,
+    .fields = (const VMStateField[]) {
+        VMSTATE_UINT8(fail_count, PnvSpi),
+        VMSTATE_UINT8(transfer_len, PnvSpi),
+        VMSTATE_UINT8(responder_select, PnvSpi),
+        VMSTATE_BOOL(shift_n1_done, PnvSpi),
+        VMSTATE_UINT8(loop_counter_1, PnvSpi),
+        VMSTATE_UINT8(loop_counter_2, PnvSpi),
+        VMSTATE_UINT8(N1_bits, PnvSpi),
+        VMSTATE_UINT8(N2_bits, PnvSpi),
+        VMSTATE_UINT8(N1_bytes, PnvSpi),
+        VMSTATE_UINT8(N2_bytes, PnvSpi),
+        VMSTATE_UINT8(N1_tx, PnvSpi),
+        VMSTATE_UINT8(N2_tx, PnvSpi),
+        VMSTATE_UINT8(N1_rx, PnvSpi),
+        VMSTATE_UINT8(N2_rx, PnvSpi),
+        VMSTATE_UINT64_ARRAY(regs, PnvSpi, PNV_SPI_REGS),
+        VMSTATE_UINT8_ARRAY(seq_op, PnvSpi, PNV_SPI_REG_SIZE),
+        VMSTATE_UINT64(status, PnvSpi),
+        VMSTATE_END_OF_LIST(),
+    },
+};
+
 static void pnv_spi_class_init(ObjectClass *klass, const void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
@@ -1209,6 +1235,7 @@ static void pnv_spi_class_init(ObjectClass *klass, const void *data)
     dc->desc = "PowerNV SPI";
     dc->realize = pnv_spi_realize;
     device_class_set_legacy_reset(dc, do_reset);
+    dc->vmsd = &pnv_spi_vmstate;
     device_class_set_props(dc, pnv_spi_properties);
 }
 
Signature · 1 line
2.47.3
Reviewed-by on v3 2/7
#4 lore raw

Re: [PATCH v3 2/7] hw/ppc: Add pnv_spi vmstate support

Thanks, MAK

Quoted 59 lines · Caleb Schlossin

- Add support for needed PnvSpi structure variables

---
  hw/ssi/pnv_spi.c | 27 +++++++++++++++++++++++++++
  1 file changed, 27 insertions(+)
hw/ssi/pnv_spi.c +27 -0
index f40e8836b9..389a2cca6b 100644
@@ -13,6 +13,7 @@
  #include "hw/ssi/pnv_spi.h"
  #include "hw/ssi/pnv_spi_regs.h"
  #include "hw/ssi/ssi.h"
+#include "migration/vmstate.h"
  #include <libfdt.h>
  #include "hw/irq.h"
  #include "trace.h"
@@ -1199,6 +1200,31 @@ static int pnv_spi_dt_xscom(PnvXScomInterface *dev, void *fdt,
      return 0;
  }
 
+static const VMStateDescription pnv_spi_vmstate = {
+    .name = TYPE_PNV_SPI,
+    .version_id = 1,
+    .fields = (const VMStateField[]) {
+        VMSTATE_UINT8(fail_count, PnvSpi),
+        VMSTATE_UINT8(transfer_len, PnvSpi),
+        VMSTATE_UINT8(responder_select, PnvSpi),
+        VMSTATE_BOOL(shift_n1_done, PnvSpi),
+        VMSTATE_UINT8(loop_counter_1, PnvSpi),
+        VMSTATE_UINT8(loop_counter_2, PnvSpi),
+        VMSTATE_UINT8(N1_bits, PnvSpi),
+        VMSTATE_UINT8(N2_bits, PnvSpi),
+        VMSTATE_UINT8(N1_bytes, PnvSpi),
+        VMSTATE_UINT8(N2_bytes, PnvSpi),
+        VMSTATE_UINT8(N1_tx, PnvSpi),
+        VMSTATE_UINT8(N2_tx, PnvSpi),
+        VMSTATE_UINT8(N1_rx, PnvSpi),
+        VMSTATE_UINT8(N2_rx, PnvSpi),
+        VMSTATE_UINT64_ARRAY(regs, PnvSpi, PNV_SPI_REGS),
+        VMSTATE_UINT8_ARRAY(seq_op, PnvSpi, PNV_SPI_REG_SIZE),
+        VMSTATE_UINT64(status, PnvSpi),
+        VMSTATE_END_OF_LIST(),
+    },
+};
+
  static void pnv_spi_class_init(ObjectClass *klass, const void *data)
  {
      DeviceClass *dc = DEVICE_CLASS(klass);
@@ -1209,6 +1235,7 @@ static void pnv_spi_class_init(ObjectClass *klass, const void *data)
      dc->desc = "PowerNV SPI";
      dc->realize = pnv_spi_realize;
      device_class_set_legacy_reset(dc, do_reset);
+    dc->vmsd = &pnv_spi_vmstate;
      device_class_set_props(dc, pnv_spi_properties);
  }
 
#5 lore raw

PATCH v3 3/7 hw/ppc: Add pnv_i2c vmstate support

In reply to Caleb Schlossin

- Add vmstate support for i2c registers

---
 hw/ppc/pnv_i2c.c | 11 +++++++++++
 1 file changed, 11 insertions(+)
hw/ppc/pnv_i2c.c +11 -0
index 60de479491..1018078228 100644
@@ -19,6 +19,7 @@
 #include "hw/ppc/pnv_i2c.h"
 #include "hw/ppc/pnv_xscom.h"
 #include "hw/ppc/fdt.h"
+#include "migration/vmstate.h"
 
 #include <libfdt.h>
 
@@ -549,6 +550,15 @@ static const Property pnv_i2c_properties[] = {
     DEFINE_PROP_UINT32("num-busses", PnvI2C, num_busses, 1),
 };
 
+static const VMStateDescription pnv_i2c_vmstate = {
+    .name = TYPE_PNV_I2C,
+    .version_id = 1,
+    .fields = (const VMStateField[]) {
+        VMSTATE_UINT64_ARRAY(regs, PnvI2C, PNV_I2C_REGS),
+        VMSTATE_END_OF_LIST(),
+    },
+};
+
 static void pnv_i2c_class_init(ObjectClass *klass, const void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
@@ -561,6 +571,7 @@ static void pnv_i2c_class_init(ObjectClass *klass, const void *data)
 
     dc->desc = "PowerNV I2C";
     dc->realize = pnv_i2c_realize;
+    dc->vmsd = &pnv_i2c_vmstate;
     device_class_set_props(dc, pnv_i2c_properties);
 }
 
Signature · 1 line
2.47.3
Reviewed-by on v3 3/7
#6 lore raw

Re: [PATCH v3 3/7] hw/ppc: Add pnv_i2c vmstate support

Thanks, MAK

Quoted 43 lines · Caleb Schlossin

- Add vmstate support for i2c registers

---
  hw/ppc/pnv_i2c.c | 11 +++++++++++
  1 file changed, 11 insertions(+)
hw/ppc/pnv_i2c.c +11 -0
index 60de479491..1018078228 100644
@@ -19,6 +19,7 @@
  #include "hw/ppc/pnv_i2c.h"
  #include "hw/ppc/pnv_xscom.h"
  #include "hw/ppc/fdt.h"
+#include "migration/vmstate.h"
 
  #include <libfdt.h>
 
@@ -549,6 +550,15 @@ static const Property pnv_i2c_properties[] = {
      DEFINE_PROP_UINT32("num-busses", PnvI2C, num_busses, 1),
  };
 
+static const VMStateDescription pnv_i2c_vmstate = {
+    .name = TYPE_PNV_I2C,
+    .version_id = 1,
+    .fields = (const VMStateField[]) {
+        VMSTATE_UINT64_ARRAY(regs, PnvI2C, PNV_I2C_REGS),
+        VMSTATE_END_OF_LIST(),
+    },
+};
+
  static void pnv_i2c_class_init(ObjectClass *klass, const void *data)
  {
      DeviceClass *dc = DEVICE_CLASS(klass);
@@ -561,6 +571,7 @@ static void pnv_i2c_class_init(ObjectClass *klass, const void *data)
 
      dc->desc = "PowerNV I2C";
      dc->realize = pnv_i2c_realize;
+    dc->vmsd = &pnv_i2c_vmstate;
      device_class_set_props(dc, pnv_i2c_properties);
  }
 
#7 lore raw

PATCH v3 4/7 hw/ppc: pnv_adu.c added vmstate support

In reply to Caleb Schlossin

- Added vmstate support for ADU model

---
 hw/ppc/pnv_adu.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)
hw/ppc/pnv_adu.c +12 -0
index 005fbda475..bd2a9e233a 100644
@@ -23,6 +23,7 @@
 #include "hw/ppc/pnv_chip.h"
 #include "hw/ppc/pnv_lpc.h"
 #include "hw/ppc/pnv_xscom.h"
+#include "migration/vmstate.h"
 #include "trace.h"
 
 #define ADU_LPC_BASE_REG     0x40
@@ -189,6 +190,16 @@ static const Property pnv_adu_properties[] = {
     DEFINE_PROP_LINK("lpc", PnvADU, lpc, TYPE_PNV_LPC, PnvLpcController *),
 };
 
+static const VMStateDescription pnv_adu_vmstate = {
+    .name = TYPE_PNV_ADU,
+    .version_id = 1,
+    .fields = (const VMStateField[]) {
+        VMSTATE_UINT64(lpc_cmd_reg, PnvADU),
+        VMSTATE_UINT64(lpc_data_reg, PnvADU),
+        VMSTATE_END_OF_LIST(),
+    },
+};
+
 static void pnv_adu_class_init(ObjectClass *klass, const void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
@@ -197,6 +208,7 @@ static void pnv_adu_class_init(ObjectClass *klass, const void *data)
     dc->desc = "PowerNV ADU";
     device_class_set_props(dc, pnv_adu_properties);
     dc->user_creatable = false;
+    dc->vmsd = &pnv_adu_vmstate;
 }
 
 static const TypeInfo pnv_adu_type_info = {
Signature · 1 line
2.47.3
Reviewed-by on v3 4/7
#8 lore raw

Re: [PATCH v3 4/7] hw/ppc: pnv_adu.c added vmstate support

Thanks, MAK

Quoted 45 lines · Caleb Schlossin

- Added vmstate support for ADU model

---
  hw/ppc/pnv_adu.c | 12 ++++++++++++
  1 file changed, 12 insertions(+)
hw/ppc/pnv_adu.c +12 -0
index 005fbda475..bd2a9e233a 100644
@@ -23,6 +23,7 @@
  #include "hw/ppc/pnv_chip.h"
  #include "hw/ppc/pnv_lpc.h"
  #include "hw/ppc/pnv_xscom.h"
+#include "migration/vmstate.h"
  #include "trace.h"
 
  #define ADU_LPC_BASE_REG     0x40
@@ -189,6 +190,16 @@ static const Property pnv_adu_properties[] = {
      DEFINE_PROP_LINK("lpc", PnvADU, lpc, TYPE_PNV_LPC, PnvLpcController *),
  };
 
+static const VMStateDescription pnv_adu_vmstate = {
+    .name = TYPE_PNV_ADU,
+    .version_id = 1,
+    .fields = (const VMStateField[]) {
+        VMSTATE_UINT64(lpc_cmd_reg, PnvADU),
+        VMSTATE_UINT64(lpc_data_reg, PnvADU),
+        VMSTATE_END_OF_LIST(),
+    },
+};
+
  static void pnv_adu_class_init(ObjectClass *klass, const void *data)
  {
      DeviceClass *dc = DEVICE_CLASS(klass);
@@ -197,6 +208,7 @@ static void pnv_adu_class_init(ObjectClass *klass, const void *data)
      dc->desc = "PowerNV ADU";
      device_class_set_props(dc, pnv_adu_properties);
      dc->user_creatable = false;
+    dc->vmsd = &pnv_adu_vmstate;
  }
 
  static const TypeInfo pnv_adu_type_info = {
#9 lore raw

PATCH v3 5/7 hw/ppc: pnv_core.c add vmstate support

In reply to Caleb Schlossin

- Add vmstate support PnvCore and PnvQuad capturing scratch registers and special wakeup registers

---
 hw/ppc/pnv_core.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
hw/ppc/pnv_core.c +22 -0
index fb2dfc7ba2..03b64f0013 100644
@@ -31,6 +31,7 @@
 #include "hw/ppc/xics.h"
 #include "hw/qdev-properties.h"
 #include "helper_regs.h"
+#include "migration/vmstate.h"
 
 static const char *pnv_core_cpu_typename(PnvCore *pc)
 {
@@ -478,6 +479,15 @@ static void pnv_core_power11_class_init(ObjectClass *oc, const void *data)
     pnv_core_power10_class_init(oc, data);
 }
 
+static const VMStateDescription pnv_core_vmstate = {
+    .name = TYPE_PNV_CORE,
+    .version_id = 1,
+    .fields = (const VMStateField[]) {
+        VMSTATE_UINT64_ARRAY(scratch, PnvCore, 8),
+        VMSTATE_END_OF_LIST(),
+    },
+};
+
 static void pnv_core_class_init(ObjectClass *oc, const void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(oc);
@@ -486,6 +496,7 @@ static void pnv_core_class_init(ObjectClass *oc, const void *data)
     dc->unrealize = pnv_core_unrealize;
     device_class_set_props(dc, pnv_core_properties);
     dc->user_creatable = false;
+    dc->vmsd = &pnv_core_vmstate;
 }
 
 #define DEFINE_PNV_CORE_TYPE(family, cpu_model) \
@@ -737,12 +748,23 @@ static void pnv_quad_power11_class_init(ObjectClass *oc, const void *data)
     pnv_quad_power10_class_init(oc, data);
 }
 
+static const VMStateDescription pnv_quad_vmstate = {
+    .name = TYPE_PNV_QUAD,
+    .version_id = 1,
+    .fields = (const VMStateField[]) {
+        VMSTATE_BOOL(special_wakeup_done, PnvQuad),
+        VMSTATE_BOOL_ARRAY(special_wakeup, PnvQuad, 4),
+        VMSTATE_END_OF_LIST(),
+    },
+};
+
 static void pnv_quad_class_init(ObjectClass *oc, const void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(oc);
 
     device_class_set_props(dc, pnv_quad_properties);
     dc->user_creatable = false;
+    dc->vmsd = &pnv_quad_vmstate;
 }
 
 static const TypeInfo pnv_quad_infos[] = {
Signature · 1 line
2.47.3
Reviewed-by on v3 5/7
#10 lore raw

Re: [PATCH v3 5/7] hw/ppc: pnv_core.c add vmstate support

Thanks,

Glenn

Quoted 69 lines · Caleb Schlossin

- Add vmstate support PnvCore and PnvQuad capturing scratch registers and special wakeup registers

---
 hw/ppc/pnv_core.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
hw/ppc/pnv_core.c +22 -0
index fb2dfc7ba2..03b64f0013 100644
@@ -31,6 +31,7 @@
 #include "hw/ppc/xics.h"
 #include "hw/qdev-properties.h"
 #include "helper_regs.h"
+#include "migration/vmstate.h"
 
 static const char *pnv_core_cpu_typename(PnvCore *pc)
 {
@@ -478,6 +479,15 @@ static void pnv_core_power11_class_init(ObjectClass *oc, const void *data)
     pnv_core_power10_class_init(oc, data);
 }
 
+static const VMStateDescription pnv_core_vmstate = {
+    .name = TYPE_PNV_CORE,
+    .version_id = 1,
+    .fields = (const VMStateField[]) {
+        VMSTATE_UINT64_ARRAY(scratch, PnvCore, 8),
+        VMSTATE_END_OF_LIST(),
+    },
+};
+
 static void pnv_core_class_init(ObjectClass *oc, const void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(oc);
@@ -486,6 +496,7 @@ static void pnv_core_class_init(ObjectClass *oc, const void *data)
     dc->unrealize = pnv_core_unrealize;
     device_class_set_props(dc, pnv_core_properties);
     dc->user_creatable = false;
+    dc->vmsd = &pnv_core_vmstate;
 }
 
 #define DEFINE_PNV_CORE_TYPE(family, cpu_model) \
@@ -737,12 +748,23 @@ static void pnv_quad_power11_class_init(ObjectClass *oc, const void *data)
     pnv_quad_power10_class_init(oc, data);
 }
 
+static const VMStateDescription pnv_quad_vmstate = {
+    .name = TYPE_PNV_QUAD,
+    .version_id = 1,
+    .fields = (const VMStateField[]) {
+        VMSTATE_BOOL(special_wakeup_done, PnvQuad),
+        VMSTATE_BOOL_ARRAY(special_wakeup, PnvQuad, 4),
+        VMSTATE_END_OF_LIST(),
+    },
+};
+
 static void pnv_quad_class_init(ObjectClass *oc, const void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(oc);
 
     device_class_set_props(dc, pnv_quad_properties);
     dc->user_creatable = false;
+    dc->vmsd = &pnv_quad_vmstate;
 }
 
 static const TypeInfo pnv_quad_infos[] = {
#11 lore raw

Re: [PATCH v3 5/7] hw/ppc: pnv_core.c add vmstate support

In reply to Caleb Schlossin
Quoted 22 lines · Caleb Schlossin

- Add vmstate support PnvCore and PnvQuad capturing scratch registers and special wakeup registers

---
  hw/ppc/pnv_core.c | 22 ++++++++++++++++++++++
  1 file changed, 22 insertions(+)
hw/ppc/pnv_core.c +1 -0
index fb2dfc7ba2..03b64f0013 100644
@@ -31,6 +31,7 @@
  #include "hw/ppc/xics.h"
  #include "hw/qdev-properties.h"
  #include "helper_regs.h"
+#include "migration/vmstate.h"
 
  static const char *pnv_core_cpu_typename(PnvCore *pc)
  {

hw/ppc/pnv_core.c static void pnv_core_power11_class_init(ObjectClass *oc, const void *data) · line 486

Quoted 8 lines
hw/ppc/pnv_core.c +5 -0
@@ -478,6 +479,15 @@ static void pnv_core_power11_class_init(ObjectClass *oc, const void *data)
      pnv_core_power10_class_init(oc, data);
  }
 
+static const VMStateDescription pnv_core_vmstate = {
+    .name = TYPE_PNV_CORE,
+    .version_id = 1,
+    .fields = (const VMStateField[]) {
+        VMSTATE_UINT64_ARRAY(scratch, PnvCore, 8),

This should probably be a constant or dynamically calculated.

MAK

Quoted 16 lines
hw/ppc/pnv_core.c +5 -0
+        VMSTATE_END_OF_LIST(),
+    },
+};
+
  static void pnv_core_class_init(ObjectClass *oc, const void *data)
  {
      DeviceClass *dc = DEVICE_CLASS(oc);
@@ -486,6 +496,7 @@ static void pnv_core_class_init(ObjectClass *oc, const void *data)
      dc->unrealize = pnv_core_unrealize;
      device_class_set_props(dc, pnv_core_properties);
      dc->user_creatable = false;
+    dc->vmsd = &pnv_core_vmstate;
  }
 
  #define DEFINE_PNV_CORE_TYPE(family, cpu_model) \

hw/ppc/pnv_core.c static void pnv_quad_power11_class_init(ObjectClass *oc, const void *data) · line 756

Quoted 9 lines
hw/ppc/pnv_core.c +6 -0
@@ -737,12 +748,23 @@ static void pnv_quad_power11_class_init(ObjectClass *oc, const void *data)
      pnv_quad_power10_class_init(oc, data);
  }
 
+static const VMStateDescription pnv_quad_vmstate = {
+    .name = TYPE_PNV_QUAD,
+    .version_id = 1,
+    .fields = (const VMStateField[]) {
+        VMSTATE_BOOL(special_wakeup_done, PnvQuad),
+        VMSTATE_BOOL_ARRAY(special_wakeup, PnvQuad, 4),

Same as above...

MAK

Quoted 14 lines
hw/ppc/pnv_core.c +5 -0
+        VMSTATE_END_OF_LIST(),
+    },
+};
+
  static void pnv_quad_class_init(ObjectClass *oc, const void *data)
  {
      DeviceClass *dc = DEVICE_CLASS(oc);
 
      device_class_set_props(dc, pnv_quad_properties);
      dc->user_creatable = false;
+    dc->vmsd = &pnv_quad_vmstate;
  }
 
  static const TypeInfo pnv_quad_infos[] = {
#12 lore raw

PATCH v3 6/7 hw/ppc: pnv_chiptod.c add vmstate support

In reply to Caleb Schlossin

- Added pre_save and post_load methods to handle slave_pc_target and tod_state

---
 hw/ppc/pnv_chiptod.c         | 38 ++++++++++++++++++++++++++++++++++++
 include/hw/ppc/pnv_chiptod.h |  2 ++
 2 files changed, 40 insertions(+)
hw/ppc/pnv_chiptod.c +38 -0
index f887a18cde..9dc5942ca0 100644
@@ -37,6 +37,7 @@
 #include "hw/ppc/pnv_core.h"
 #include "hw/ppc/pnv_xscom.h"
 #include "hw/ppc/pnv_chiptod.h"
+#include "migration/vmstate.h"
 #include "trace.h"
 
 #include <libfdt.h>
@@ -341,6 +342,8 @@ static void pnv_chiptod_xscom_write(void *opaque, hwaddr addr,
                           " TOD_TX_TTYPE_CTRL_REG val 0x%" PRIx64
                           " invalid slave address\n", val);
         }
+        /* Write slave_pc_target to a uint64_t variable for vmstate support. */
+        chiptod->tx_ttype_ctrl = val;
         break;
     case TOD_ERROR_REG:
         chiptod->tod_error &= ~val;
@@ -613,6 +616,40 @@ static void pnv_chiptod_unrealize(DeviceState *dev)
     qemu_unregister_reset(pnv_chiptod_reset, chiptod);
 }
 
+static int vmstate_pnv_chiptod_pre_save(void *opaque)
+{
+    PnvChipTOD *chiptod = PNV_CHIPTOD(opaque);
+    chiptod->tod_state_val = (uint8_t)chiptod->tod_state;
+    return 0;
+}
+
+static int vmstate_pnv_chiptod_post_load(void *opaque)
+{
+    PnvChipTOD *chiptod = PNV_CHIPTOD(opaque);
+    if (chiptod->tx_ttype_ctrl != 0) {
+        pnv_chiptod_xscom_write(chiptod, TOD_TX_TTYPE_CTRL_REG << 3,
+                                chiptod->tx_ttype_ctrl, 8);
+    }
+    chiptod->tod_state = (enum tod_state)chiptod->tod_state_val;
+    return 0;
+}
+
+static const VMStateDescription pnv_chiptod_vmstate = {
+    .name = TYPE_PNV_CHIPTOD,
+    .version_id = 1,
+    .pre_save = vmstate_pnv_chiptod_pre_save,
+    .pre_load = vmstate_pnv_chiptod_post_load,
+    .fields = (const VMStateField[]) {
+        VMSTATE_BOOL(primary, PnvChipTOD),
+        VMSTATE_BOOL(secondary, PnvChipTOD),
+        VMSTATE_UINT64(tod_error, PnvChipTOD),
+        VMSTATE_UINT64(pss_mss_ctrl_reg, PnvChipTOD),
+        VMSTATE_UINT64(tx_ttype_ctrl, PnvChipTOD),
+        VMSTATE_UINT8(tod_state_val, PnvChipTOD),
+        VMSTATE_END_OF_LIST(),
+    },
+};
+
 static void pnv_chiptod_class_init(ObjectClass *klass, const void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
@@ -621,6 +658,7 @@ static void pnv_chiptod_class_init(ObjectClass *klass, const void *data)
     dc->unrealize = pnv_chiptod_unrealize;
     dc->desc = "PowerNV ChipTOD Controller";
     dc->user_creatable = false;
+    dc->vmsd = &pnv_chiptod_vmstate;
 }
 
 static const TypeInfo pnv_chiptod_type_info = {
include/hw/ppc/pnv_chiptod.h +2 -0
index 466b06560a..3e5e3b02b2 100644
@@ -41,6 +41,8 @@ struct PnvChipTOD {
     uint64_t tod_error;
     uint64_t pss_mss_ctrl_reg;
     PnvCore *slave_pc_target;
+    uint64_t tx_ttype_ctrl;
+    uint8_t tod_state_val;
 };
 
 struct PnvChipTODClass {
Signature · 1 line
2.47.3
Reviewed-by on v3 6/7
#13 lore raw

Re: [PATCH v3 6/7] hw/ppc: pnv_chiptod.c add vmstate support

Thanks, MAK

Quoted 92 lines · Caleb Schlossin

- Added pre_save and post_load methods to handle slave_pc_target and tod_state

---
  hw/ppc/pnv_chiptod.c         | 38 ++++++++++++++++++++++++++++++++++++
  include/hw/ppc/pnv_chiptod.h |  2 ++
  2 files changed, 40 insertions(+)
hw/ppc/pnv_chiptod.c +38 -0
index f887a18cde..9dc5942ca0 100644
@@ -37,6 +37,7 @@
  #include "hw/ppc/pnv_core.h"
  #include "hw/ppc/pnv_xscom.h"
  #include "hw/ppc/pnv_chiptod.h"
+#include "migration/vmstate.h"
  #include "trace.h"
 
  #include <libfdt.h>
@@ -341,6 +342,8 @@ static void pnv_chiptod_xscom_write(void *opaque, hwaddr addr,
                            " TOD_TX_TTYPE_CTRL_REG val 0x%" PRIx64
                            " invalid slave address\n", val);
          }
+        /* Write slave_pc_target to a uint64_t variable for vmstate support. */
+        chiptod->tx_ttype_ctrl = val;
          break;
      case TOD_ERROR_REG:
          chiptod->tod_error &= ~val;
@@ -613,6 +616,40 @@ static void pnv_chiptod_unrealize(DeviceState *dev)
      qemu_unregister_reset(pnv_chiptod_reset, chiptod);
  }
 
+static int vmstate_pnv_chiptod_pre_save(void *opaque)
+{
+    PnvChipTOD *chiptod = PNV_CHIPTOD(opaque);
+    chiptod->tod_state_val = (uint8_t)chiptod->tod_state;
+    return 0;
+}
+
+static int vmstate_pnv_chiptod_post_load(void *opaque)
+{
+    PnvChipTOD *chiptod = PNV_CHIPTOD(opaque);
+    if (chiptod->tx_ttype_ctrl != 0) {
+        pnv_chiptod_xscom_write(chiptod, TOD_TX_TTYPE_CTRL_REG << 3,
+                                chiptod->tx_ttype_ctrl, 8);
+    }
+    chiptod->tod_state = (enum tod_state)chiptod->tod_state_val;
+    return 0;
+}
+
+static const VMStateDescription pnv_chiptod_vmstate = {
+    .name = TYPE_PNV_CHIPTOD,
+    .version_id = 1,
+    .pre_save = vmstate_pnv_chiptod_pre_save,
+    .pre_load = vmstate_pnv_chiptod_post_load,
+    .fields = (const VMStateField[]) {
+        VMSTATE_BOOL(primary, PnvChipTOD),
+        VMSTATE_BOOL(secondary, PnvChipTOD),
+        VMSTATE_UINT64(tod_error, PnvChipTOD),
+        VMSTATE_UINT64(pss_mss_ctrl_reg, PnvChipTOD),
+        VMSTATE_UINT64(tx_ttype_ctrl, PnvChipTOD),
+        VMSTATE_UINT8(tod_state_val, PnvChipTOD),
+        VMSTATE_END_OF_LIST(),
+    },
+};
+
  static void pnv_chiptod_class_init(ObjectClass *klass, const void *data)
  {
      DeviceClass *dc = DEVICE_CLASS(klass);
@@ -621,6 +658,7 @@ static void pnv_chiptod_class_init(ObjectClass *klass, const void *data)
      dc->unrealize = pnv_chiptod_unrealize;
      dc->desc = "PowerNV ChipTOD Controller";
      dc->user_creatable = false;
+    dc->vmsd = &pnv_chiptod_vmstate;
  }
 
  static const TypeInfo pnv_chiptod_type_info = {
include/hw/ppc/pnv_chiptod.h +2 -0
index 466b06560a..3e5e3b02b2 100644
@@ -41,6 +41,8 @@ struct PnvChipTOD {
      uint64_t tod_error;
      uint64_t pss_mss_ctrl_reg;
      PnvCore *slave_pc_target;
+    uint64_t tx_ttype_ctrl;
+    uint8_t tod_state_val;
  };
 
  struct PnvChipTODClass {
#14 lore raw

PATCH v3 7/7 hw/ppc: Add VMSTATE information to PnvPsi

In reply to Caleb Schlossin

PnvPsi needs to be able to save/load snapshots. Add VMSTATE information to the device class and a post_load() method to restore dynamic data items and memory region mappings.

---
 hw/ppc/pnv_psi.c | 36 ++++++++++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)
hw/ppc/pnv_psi.c +34 -2
index 5d947d8b52..67bc911e4b 100644
@@ -25,6 +25,7 @@
 #include "qemu/module.h"
 #include "system/reset.h"
 #include "qapi/error.h"
+#include "migration/vmstate.h"
 
 
 #include "hw/ppc/fdt.h"
@@ -130,12 +131,11 @@ static void pnv_psi_set_bar(PnvPsi *psi, uint64_t bar)
 {
     PnvPsiClass *ppc = PNV_PSI_GET_CLASS(psi);
     MemoryRegion *sysmem = get_system_memory();
-    uint64_t old = psi->regs[PSIHB_XSCOM_BAR];
 
     psi->regs[PSIHB_XSCOM_BAR] = bar & (ppc->bar_mask | PSIHB_BAR_EN);
 
     /* Update MR, always remove it first */
-    if (old & PSIHB_BAR_EN) {
+    if (memory_region_is_mapped(&psi->regs_mr)) {
         memory_region_del_subregion(sysmem, &psi->regs_mr);
     }
 
@@ -919,6 +919,37 @@ static const TypeInfo pnv_psi_power9_info = {
     },
 };
 
+static int vmstate_pnv_psi_post_load(void *opaque, int version_id)
+{
+    PnvPsi *psi = PNV_PSI(opaque);
+    Pnv9Psi *psi9 = PNV9_PSI(psi);
+    MemoryRegion   *sysmem = get_system_memory();
+    uint64_t esb_bar;
+    hwaddr esb_addr;
+
+    /* Set the ESB MMIO mapping */
+    esb_bar = psi->regs[PSIHB_REG(PSIHB9_ESB_CI_BASE)];
+
+    if (esb_bar & PSIHB9_ESB_CI_VALID) {
+        esb_addr = esb_bar & PSIHB9_ESB_CI_ADDR_MASK;
+        memory_region_add_subregion(sysmem, esb_addr,
+                                    &psi9->source.esb_mmio);
+    }
+
+    return 0;
+}
+
+static const VMStateDescription vmstate_pnv_psi = {
+    .name = TYPE_PNV_PSI,
+    .version_id = 1,
+    .minimum_version_id = 1,
+    .post_load = vmstate_pnv_psi_post_load,
+    .fields = (const VMStateField[]) {
+        VMSTATE_UINT64_ARRAY(regs, PnvPsi, PSIHB_XSCOM_MAX),
+        VMSTATE_END_OF_LIST()
+    }
+};
+
 static void pnv_psi_power10_class_init(ObjectClass *klass, const void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
@@ -926,6 +957,7 @@ static void pnv_psi_power10_class_init(ObjectClass *klass, const void *data)
     static const char compat[] = "ibm,power10-psihb-x\0ibm,psihb-x";
 
     dc->desc    = "PowerNV PSI Controller POWER10";
+    dc->vmsd = &vmstate_pnv_psi;
 
     ppc->xscom_pcba = PNV10_XSCOM_PSIHB_BASE;
     ppc->xscom_size = PNV10_XSCOM_PSIHB_SIZE;
Signature · 1 line
2.47.3
Reviewed-by on v3 7/7
#15 lore raw

Re: [PATCH v3 7/7] hw/ppc: Add VMSTATE information to PnvPsi

Thanks,

Glenn

Quoted 82 lines · Caleb Schlossin

PnvPsi needs to be able to save/load snapshots. Add VMSTATE information to the device class and a post_load() method to restore dynamic data items and memory region mappings.

---
 hw/ppc/pnv_psi.c | 36 ++++++++++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)
hw/ppc/pnv_psi.c +34 -2
index 5d947d8b52..67bc911e4b 100644
@@ -25,6 +25,7 @@
 #include "qemu/module.h"
 #include "system/reset.h"
 #include "qapi/error.h"
+#include "migration/vmstate.h"
 
 
 #include "hw/ppc/fdt.h"
@@ -130,12 +131,11 @@ static void pnv_psi_set_bar(PnvPsi *psi, uint64_t bar)
 {
     PnvPsiClass *ppc = PNV_PSI_GET_CLASS(psi);
     MemoryRegion *sysmem = get_system_memory();
-    uint64_t old = psi->regs[PSIHB_XSCOM_BAR];
 
     psi->regs[PSIHB_XSCOM_BAR] = bar & (ppc->bar_mask | PSIHB_BAR_EN);
 
     /* Update MR, always remove it first */
-    if (old & PSIHB_BAR_EN) {
+    if (memory_region_is_mapped(&psi->regs_mr)) {
         memory_region_del_subregion(sysmem, &psi->regs_mr);
     }
 
@@ -919,6 +919,37 @@ static const TypeInfo pnv_psi_power9_info = {
     },
 };
 
+static int vmstate_pnv_psi_post_load(void *opaque, int version_id)
+{
+    PnvPsi *psi = PNV_PSI(opaque);
+    Pnv9Psi *psi9 = PNV9_PSI(psi);
+    MemoryRegion   *sysmem = get_system_memory();
+    uint64_t esb_bar;
+    hwaddr esb_addr;
+
+    /* Set the ESB MMIO mapping */
+    esb_bar = psi->regs[PSIHB_REG(PSIHB9_ESB_CI_BASE)];
+
+    if (esb_bar & PSIHB9_ESB_CI_VALID) {
+        esb_addr = esb_bar & PSIHB9_ESB_CI_ADDR_MASK;
+        memory_region_add_subregion(sysmem, esb_addr,
+                                    &psi9->source.esb_mmio);
+    }
+
+    return 0;
+}
+
+static const VMStateDescription vmstate_pnv_psi = {
+    .name = TYPE_PNV_PSI,
+    .version_id = 1,
+    .minimum_version_id = 1,
+    .post_load = vmstate_pnv_psi_post_load,
+    .fields = (const VMStateField[]) {
+        VMSTATE_UINT64_ARRAY(regs, PnvPsi, PSIHB_XSCOM_MAX),
+        VMSTATE_END_OF_LIST()
+    }
+};
+
 static void pnv_psi_power10_class_init(ObjectClass *klass, const void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
@@ -926,6 +957,7 @@ static void pnv_psi_power10_class_init(ObjectClass *klass, const void *data)
     static const char compat[] = "ibm,power10-psihb-x\0ibm,psihb-x";
 
     dc->desc    = "PowerNV PSI Controller POWER10";
+    dc->vmsd = &vmstate_pnv_psi;
 
     ppc->xscom_pcba = PNV10_XSCOM_PSIHB_BASE;
     ppc->xscom_size = PNV10_XSCOM_PSIHB_SIZE;
Reviewed-by
#16 lore raw

Re: [PATCH v3 7/7] hw/ppc: Add VMSTATE information to PnvPsi

Thanks, MAK

Quoted 89 lines · Miles Glenn

Thanks,

Glenn

Quoted 82 lines · Caleb Schlossin

PnvPsi needs to be able to save/load snapshots. Add VMSTATE information to the device class and a post_load() method to restore dynamic data items and memory region mappings.

---
  hw/ppc/pnv_psi.c | 36 ++++++++++++++++++++++++++++++++++--
  1 file changed, 34 insertions(+), 2 deletions(-)
hw/ppc/pnv_psi.c +34 -2
index 5d947d8b52..67bc911e4b 100644
@@ -25,6 +25,7 @@
  #include "qemu/module.h"
  #include "system/reset.h"
  #include "qapi/error.h"
+#include "migration/vmstate.h"
 
 
  #include "hw/ppc/fdt.h"
@@ -130,12 +131,11 @@ static void pnv_psi_set_bar(PnvPsi *psi, uint64_t bar)
  {
      PnvPsiClass *ppc = PNV_PSI_GET_CLASS(psi);
      MemoryRegion *sysmem = get_system_memory();
-    uint64_t old = psi->regs[PSIHB_XSCOM_BAR];
 
      psi->regs[PSIHB_XSCOM_BAR] = bar & (ppc->bar_mask | PSIHB_BAR_EN);
 
      /* Update MR, always remove it first */
-    if (old & PSIHB_BAR_EN) {
+    if (memory_region_is_mapped(&psi->regs_mr)) {
          memory_region_del_subregion(sysmem, &psi->regs_mr);
      }
 
@@ -919,6 +919,37 @@ static const TypeInfo pnv_psi_power9_info = {
      },
  };
 
+static int vmstate_pnv_psi_post_load(void *opaque, int version_id)
+{
+    PnvPsi *psi = PNV_PSI(opaque);
+    Pnv9Psi *psi9 = PNV9_PSI(psi);
+    MemoryRegion   *sysmem = get_system_memory();
+    uint64_t esb_bar;
+    hwaddr esb_addr;
+
+    /* Set the ESB MMIO mapping */
+    esb_bar = psi->regs[PSIHB_REG(PSIHB9_ESB_CI_BASE)];
+
+    if (esb_bar & PSIHB9_ESB_CI_VALID) {
+        esb_addr = esb_bar & PSIHB9_ESB_CI_ADDR_MASK;
+        memory_region_add_subregion(sysmem, esb_addr,
+                                    &psi9->source.esb_mmio);
+    }
+
+    return 0;
+}
+
+static const VMStateDescription vmstate_pnv_psi = {
+    .name = TYPE_PNV_PSI,
+    .version_id = 1,
+    .minimum_version_id = 1,
+    .post_load = vmstate_pnv_psi_post_load,
+    .fields = (const VMStateField[]) {
+        VMSTATE_UINT64_ARRAY(regs, PnvPsi, PSIHB_XSCOM_MAX),
+        VMSTATE_END_OF_LIST()
+    }
+};
+
  static void pnv_psi_power10_class_init(ObjectClass *klass, const void *data)
  {
      DeviceClass *dc = DEVICE_CLASS(klass);
@@ -926,6 +957,7 @@ static void pnv_psi_power10_class_init(ObjectClass *klass, const void *data)
      static const char compat[] = "ibm,power10-psihb-x\0ibm,psihb-x";
 
      dc->desc    = "PowerNV PSI Controller POWER10";
+    dc->vmsd = &vmstate_pnv_psi;
 
      ppc->xscom_pcba = PNV10_XSCOM_PSIHB_BASE;
      ppc->xscom_size = PNV10_XSCOM_PSIHB_SIZE;
Reviewed-by on the v3 series
#17 lore raw
In reply to Caleb Schlossin
Quoted 5 lines · Caleb Schlossin

Addressing comments from V2 review:

Updates in V3:
- pnv_psi: Remove PSI_DEBUG section as it was not used
- pnv_psi: Add missing post_load and vmstate info

Looks good to me now. Thanks for introducing this functionality in pnv devices.

For the series:

Thanks,
- Aditya G

Quoted 38 lines

Updates in V2:
- Added new patch set for PnvPsi support as it fits with the rest
- Added vmstate support for Power8 and Power9 for LPC
- Fixed pnv_core.c commit message

Tested:
passed make check

Thanks,
Caleb

Michael Kowal (2):
hw/ppc: Add VMSTATE information for LPC model
hw/ppc: Add VMSTATE information to PnvPsi

Caleb Schlossin (2):
hw/ppc: Add pnv_spi vmstate support
hw/ppc: Add pnv_i2c vmstate support

Angelo Jaramillo (3):
hw/ppc: pnv_adu.c added vmstate support
hw/ppc: pnv_core.c add vmstate support
hw/ppc: pnv_chiptod.c add vmstate support

 hw/ppc/pnv_adu.c             | 12 +++++++++++
 hw/ppc/pnv_chiptod.c         | 38 +++++++++++++++++++++++++++++++++
 hw/ppc/pnv_core.c            | 22 +++++++++++++++++++
 hw/ppc/pnv_i2c.c             | 11 ++++++++++
 hw/ppc/pnv_lpc.c             | 41 ++++++++++++++++++++++++++++++++++++
 hw/ppc/pnv_psi.c             | 36 +++++++++++++++++++++++++++++--
 hw/ssi/pnv_spi.c             | 27 ++++++++++++++++++++++++
 include/hw/ppc/pnv_chiptod.h |  2 ++
 8 files changed, 187 insertions(+), 2 deletions(-)
Signature · 1 line
2.47.3
Reviewed-by on the v3 series
#18 lore raw
In reply to Caleb Schlossin

For the series:

<mailto:[email protected]>Thank You,

Chalapathi

Quoted 40 lines · Caleb Schlossin

Addressing comments from V2 review:

Updates in V3:
- pnv_psi: Remove PSI_DEBUG section as it was not used
- pnv_psi: Add missing post_load and vmstate info

Updates in V2:
- Added new patch set for PnvPsi support as it fits with the rest
- Added vmstate support for Power8 and Power9 for LPC
- Fixed pnv_core.c commit message

Tested:
passed make check

Thanks,
Caleb

Michael Kowal (2):
hw/ppc: Add VMSTATE information for LPC model
hw/ppc: Add VMSTATE information to PnvPsi

Caleb Schlossin (2):
hw/ppc: Add pnv_spi vmstate support
hw/ppc: Add pnv_i2c vmstate support

Angelo Jaramillo (3):
hw/ppc: pnv_adu.c added vmstate support
hw/ppc: pnv_core.c add vmstate support
hw/ppc: pnv_chiptod.c add vmstate support

  hw/ppc/pnv_adu.c             | 12 +++++++++++
  hw/ppc/pnv_chiptod.c         | 38 +++++++++++++++++++++++++++++++++
  hw/ppc/pnv_core.c            | 22 +++++++++++++++++++
  hw/ppc/pnv_i2c.c             | 11 ++++++++++
  hw/ppc/pnv_lpc.c             | 41 ++++++++++++++++++++++++++++++++++++
  hw/ppc/pnv_psi.c             | 36 +++++++++++++++++++++++++++++--
  hw/ssi/pnv_spi.c             | 27 ++++++++++++++++++++++++
  include/hw/ppc/pnv_chiptod.h |  2 ++
  8 files changed, 187 insertions(+), 2 deletions(-)
#19 lore raw

Hi Caleb,

Thanks for addressing the review comments.
I am seeing a git am failure on top of upstream commit 159107e390609f. Could you please take a look, rebase and resend?

% git am patches/v3_20251216_calebs_hw_ppc_snapshot_support_for_several_ppc_devices.mbx
Applying: hw/ppc: Add VMSTATE information for LPC model
Applying: hw/ppc: Add pnv_spi vmstate support
error: patch failed: hw/ssi/pnv_spi.c:13
error: hw/ssi/pnv_spi.c: patch does not apply
Patch failed at 0002 hw/ppc: Add pnv_spi vmstate support
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"

Thanks
Harsh

Quoted 52 lines · Chalapathi V

For the series: Reviewed-by: Chalapathi V <chalapathi. v@ linux. ibm.  com> Thank You, Chalapathi On 16/12/25 8: 43 pm, Caleb Schlossin wrote: Addressing comments from V2 review: Updates in V3: - pnv_psi: Remove PSI_DEBUG section as it was not

For the series:

<mailto:[email protected]>Thank You,

Chalapathi

Quoted 40 lines · Caleb Schlossin

Addressing comments from V2 review:

Updates in V3:
- pnv_psi: Remove PSI_DEBUG section as it was not used
- pnv_psi: Add missing post_load and vmstate info

Updates in V2:
- Added new patch set for PnvPsi support as it fits with the rest
- Added vmstate support for Power8 and Power9 for LPC
- Fixed pnv_core.c commit message

Tested:
passed make check

Thanks,
Caleb

Michael Kowal (2):
hw/ppc: Add VMSTATE information for LPC model
hw/ppc: Add VMSTATE information to PnvPsi

Caleb Schlossin (2):
hw/ppc: Add pnv_spi vmstate support
hw/ppc: Add pnv_i2c vmstate support

Angelo Jaramillo (3):
hw/ppc: pnv_adu.c added vmstate support
hw/ppc: pnv_core.c add vmstate support
hw/ppc: pnv_chiptod.c add vmstate support

  hw/ppc/pnv_adu.c             | 12 +++++++++++
  hw/ppc/pnv_chiptod.c         | 38 +++++++++++++++++++++++++++++++++
  hw/ppc/pnv_core.c            | 22 +++++++++++++++++++
  hw/ppc/pnv_i2c.c             | 11 ++++++++++
  hw/ppc/pnv_lpc.c             | 41 ++++++++++++++++++++++++++++++++++++
  hw/ppc/pnv_psi.c             | 36 +++++++++++++++++++++++++++++--
  hw/ssi/pnv_spi.c             | 27 ++++++++++++++++++++++++
  include/hw/ppc/pnv_chiptod.h |  2 ++
  8 files changed, 187 insertions(+), 2 deletions(-)
#20 lore raw
Quoted 18 lines · Harsh Prateek Bora

Hi Caleb,

Thanks for addressing the review comments.
I am seeing a git am failure on top of upstream commit 159107e390609f. Could you please take a look, rebase and resend?

% git am patches/v3_20251216_calebs_hw_ppc_snapshot_support_for_several_ppc_devices.mbx
Applying: hw/ppc: Add VMSTATE information for LPC model
Applying: hw/ppc: Add pnv_spi vmstate support
error: patch failed: hw/ssi/pnv_spi.c:13
error: hw/ssi/pnv_spi.c: patch does not apply
Patch failed at 0002 hw/ppc: Add pnv_spi vmstate support
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"

Quoted 2 lines

Thanks
Harsh

Thanks for letting me know. Will rebase and fix as part of v4 patch set.

Thanks,
Caleb

Quoted 55 lines · Chalapathi V
Quoted 52 lines

For the series: Reviewed-by: Chalapathi V <chalapathi. v@ linux. ibm.  com> Thank You, Chalapathi On 16/12/25 8: 43 pm, Caleb Schlossin wrote: Addressing comments from V2 review: Updates in V3: - pnv_psi: Remove PSI_DEBUG section as it was not

For the series:

<mailto:[email protected]>Thank You,

Chalapathi

Quoted 40 lines · Caleb Schlossin

Addressing comments from V2 review:

Updates in V3:
- pnv_psi: Remove PSI_DEBUG section as it was not used
- pnv_psi: Add missing post_load and vmstate info

Updates in V2:
- Added new patch set for PnvPsi support as it fits with the rest
- Added vmstate support for Power8 and Power9 for LPC
- Fixed pnv_core.c commit message

Tested:
passed make check

Thanks,
Caleb

Michael Kowal (2):
   hw/ppc: Add VMSTATE information for LPC model
   hw/ppc: Add VMSTATE information to PnvPsi

Caleb Schlossin (2):
   hw/ppc: Add pnv_spi vmstate support
   hw/ppc: Add pnv_i2c vmstate support

Angelo Jaramillo (3):
   hw/ppc: pnv_adu.c added vmstate support
   hw/ppc: pnv_core.c add vmstate support
   hw/ppc: pnv_chiptod.c add vmstate support

  hw/ppc/pnv_adu.c             | 12 +++++++++++ hw/ppc/pnv_chiptod.c         | 38 +++++++++++++++++++++++++++++++++ hw/ppc/pnv_core.c            | 22 +++++++++++++++++++

  hw/ppc/pnv_i2c.c             | 11 ++++++++++
  hw/ppc/pnv_lpc.c             | 41 ++++++++++++++++++++++++++++++++++++
  hw/ppc/pnv_psi.c             | 36 +++++++++++++++++++++++++++++--
  hw/ssi/pnv_spi.c             | 27 ++++++++++++++++++++++++
  include/hw/ppc/pnv_chiptod.h |  2 ++
  8 files changed, 187 insertions(+), 2 deletions(-)