Re: [PATCH v3 12/17] hw/misc: Add nr_regs and cold_reset_values to NPCM CLK

[Philippe Mathieu-Daudé]

On 6/2/25 02:31, Hao Wu wrote:

These 2 values are different between NPCM7XX and NPCM8XX
CLKs. So we add them to the class and assign different values
to them.

Reviewed-by: Peter Maydell <peter.mayd...@linaro.org>
Signed-off-by: Hao Wu <wuhao...@google.com>
---
  hw/misc/npcm_clk.c         | 19 +++++++++++++------
  include/hw/misc/npcm_clk.h |  9 ++++++++-
  2 files changed, 21 insertions(+), 7 deletions(-)

@@ -870,10 +872,11 @@ static const struct MemoryRegionOps npcm_clk_ops = {
  static void npcm_clk_enter_reset(Object *obj, ResetType type)
  {
      NPCMCLKState *s = NPCM_CLK(obj);
+    NPCMCLKClass *c = NPCM_CLK_GET_CLASS(s);

- QEMU_BUILD_BUG_ON(sizeof(s->regs) != sizeof(cold_reset_values));

-
-    memcpy(s->regs, cold_reset_values, sizeof(cold_reset_values));
+    g_assert(sizeof(s->regs) >= sizeof(c->cold_reset_values));

Equivalent to:

       g_assert(sizeof(s->regs) >= sizeof(uintptr_t));

Not very useful IMHO.

+    g_assert(sizeof(s->regs) >= c->nr_regs * sizeof(uint32_t));
+    memcpy(s->regs, c->cold_reset_values, sizeof(s->regs));
      s->ref_ns = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
      npcm7xx_clk_update_all_clocks(s);
      /*
@@ -1045,11 +1048,14 @@ static void npcm_clk_class_init(ObjectClass *klass, 
void *data)

static void npcm7xx_clk_class_init(ObjectClass *klass, void *data)

  {
+    NPCMCLKClass *c = NPCM_CLK_CLASS(klass);
      DeviceClass *dc = DEVICE_CLASS(klass);

QEMU_BUILD_BUG_ON(NPCM7XX_CLK_REGS_END > NPCM_CLK_MAX_NR_REGS);

      QEMU_BUILD_BUG_ON(NPCM7XX_CLK_REGS_END != NPCM7XX_CLK_NR_REGS);
      dc->desc = "NPCM7xx Clock Control Registers";
+    c->nr_regs = NPCM7XX_CLK_NR_REGS;
+    c->cold_reset_values = npcm7xx_cold_reset_values;
  }

static const TypeInfo npcm7xx_clk_pll_info = {

@@ -1081,6 +1087,7 @@ static const TypeInfo npcm_clk_info = {
      .parent             = TYPE_SYS_BUS_DEVICE,
      .instance_size      = sizeof(NPCMCLKState),
      .instance_init      = npcm_clk_init,
+    .class_size         = sizeof(NPCMCLKClass),
      .class_init         = npcm_clk_class_init,
      .abstract           = true,
  };
diff --git a/include/hw/misc/npcm_clk.h b/include/hw/misc/npcm_clk.h
index db03b46a52..f47614ac8d 100644
--- a/include/hw/misc/npcm_clk.h
+++ b/include/hw/misc/npcm_clk.h
@@ -175,8 +175,15 @@ struct NPCMCLKState {
      Clock *clkref;
  };

+typedef struct NPCMCLKClass {

+    SysBusDeviceClass parent;
+
+    size_t nr_regs;
+    const uint32_t *cold_reset_values;
+} NPCMCLKClass;