From nobody Fri Mar 14 13:11:40 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=reject dis=none) header.from=google.com ARC-Seal: i=1; a=rsa-sha256; t=1738880264; cv=none; d=zohomail.com; s=zohoarc; b=Lix5Lfrkq2iZB3ZhwMIogcpi7lxIySAvIPEdSceqCNtaxq8Nn+YDaiY9TT6tvZfHqW+3RGzC1Ra6aOYIl3Lq7lXvdzZTet0I/48bBBs4FurVvOcelwgYx2ie/IgxgVS5bGa4z6PAAd51Ys+kJtXg6TLANjRxshinx1O1hmP36E8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1738880264; h=Content-Type:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=IvP54eDjsC367WmbzkmPSQcGqsW89VifxXa9QXW/jdM=; b=U7jXKjCuFMECnPP7AlUVEKPcOlfsKEPmM+drWDSddAKm/1QBHk/G4PVDibisrHWrICeh2QpEvcpmBQ+g/aGjeZ5T+xerpvydv4+fF3vV9KGt7toD3zRulD2QnVHaq6S4D3kqrXp30FK4IOBThcg4g/uNfWQUGtzsOTyXyGy66lk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1738880264537352.5826656366828; Thu, 6 Feb 2025 14:17:44 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgA6x-0005tv-Ax; Thu, 06 Feb 2025 17:12:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <3wTOlZwgKCgIywjcqvujiqqing.eqosgow-fgxgnpqpipw.qti@flex--wuhaotsh.bounces.google.com>) id 1tgA6h-0005da-8j for qemu-devel@nongnu.org; Thu, 06 Feb 2025 17:12:26 -0500 Received: from mail-pl1-x64a.google.com ([2607:f8b0:4864:20::64a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <3wTOlZwgKCgIywjcqvujiqqing.eqosgow-fgxgnpqpipw.qti@flex--wuhaotsh.bounces.google.com>) id 1tgA6d-0001R1-1N for qemu-devel@nongnu.org; Thu, 06 Feb 2025 17:12:20 -0500 Received: by mail-pl1-x64a.google.com with SMTP id d9443c01a7336-216430a88b0so31178515ad.0 for ; Thu, 06 Feb 2025 14:12:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1738879937; x=1739484737; darn=nongnu.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=IvP54eDjsC367WmbzkmPSQcGqsW89VifxXa9QXW/jdM=; b=mbizO04fcuXP2PXlo1iTuxoj/wVzvqEivrEL4LrPM/1WkoutT+/I8lbsSzc7ilRux8 Ofjfh9Z3hVz89Pu4mwFJO9YcABbHMoD0Zu5zNLsb3Yu6tl7NbsIoT6v22Od7mwmOyNat xmSQAgqwckX57XgQO7RExtxRkbiLXaRidHDBx5kdq+I98vl0Z0uHAFwS0TmhJtHxBSP+ 9kBx/UkPD3RQ/bsl/bXCEdYW/Aw/gmPLUaMpSdkkqlwADJ/BGmmUd8SUccOvfFK1U0kS +H/8vRE9fqjDy3h7u0EGewaL8HjI0Z8mhcWEfAo79jRLURaMSeAyJH34fw6EoSoDze8H V4Uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738879937; x=1739484737; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=IvP54eDjsC367WmbzkmPSQcGqsW89VifxXa9QXW/jdM=; b=bn3vULQGRoxVyOZkp9gmfvhiohx5ZC+W2wK+vth99OVl3E/nJZ7DPrPCqhutoQwpzN Ls4UF74z5+dChCkQkm+mqomNqnE28hkSznJ9q7SyoBti7JWSKT9c3tkO115oH0LOak7r yg+Wu6CAqlBoB+GWDlL/m9vvoQXjX7lgnY0vkCK5fnOXDLaKhTIeUKMHmBYSI0dVQBy4 64v4hZ+QUDltNqWhqWRxPV4sF9nmrXSsTDroHQiG2hKjeTUAo/UdIfsm2P/JT8reAIhJ JAZnP9TlIfP5H3JVgRDXtiyBEywF5T+6VkAvnKqJ6iCe9VePGVFibA61UL33D2b58JKJ cmKg== X-Forwarded-Encrypted: i=1; AJvYcCWDPauooW9+FkLFtXJhp9Au9Ex8FhRLSqke7hNcVERXILlGIgFDJf1r+dy/ts6loxf2ishZ6AxcOZUJ@nongnu.org X-Gm-Message-State: AOJu0YwmeipNxENZApalHhn8W3p4KeYJxn65vbqL88KbiYH90tmHZfdP dZeO6nLAof/vMsOrkGWD4prQd/QlX9obcIHsxgB2d/a1Gu4Yc56XalqQLcB9mwkN68xQ+fj1heK dLy9fCmfv3g== X-Google-Smtp-Source: AGHT+IFMDAgl7TKKNuJS6kizzV3LA6n4lkhLIh1K5CG4qU0yGeD+jGsog0yWdgxcLGXuF5l0EJ+YLhREvQe1Ag== X-Received: from pgev18.prod.google.com ([2002:a63:ac12:0:b0:abb:a12f:81a8]) (user=wuhaotsh job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:68c:b0:1db:e3c7:9974 with SMTP id adf61e73a8af0-1ee03a3f22emr1889105637.12.1738879937125; Thu, 06 Feb 2025 14:12:17 -0800 (PST) Date: Thu, 6 Feb 2025 14:11:52 -0800 In-Reply-To: <20250206221203.4187217-1-wuhaotsh@google.com> Mime-Version: 1.0 References: <20250206221203.4187217-1-wuhaotsh@google.com> X-Mailer: git-send-email 2.48.1.502.g6dc24dfdaf-goog Message-ID: <20250206221203.4187217-7-wuhaotsh@google.com> Subject: [PATCH v4 06/17] hw/misc: Add nr_regs and cold_reset_values to NPCM GCR From: Hao Wu To: peter.maydell@linaro.org Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, wuhaotsh@google.com, venture@google.com, Avi.Fishman@nuvoton.com, kfting@nuvoton.com, hskinnemoen@google.com, titusr@google.com, chli30@nuvoton.corp-partner.google.com, pbonzini@redhat.com, jasowang@redhat.com, alistair@alistair23.me, philmd@linaro.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::64a; envelope-from=3wTOlZwgKCgIywjcqvujiqqing.eqosgow-fgxgnpqpipw.qti@flex--wuhaotsh.bounces.google.com; helo=mail-pl1-x64a.google.com X-Spam_score_int: -95 X-Spam_score: -9.6 X-Spam_bar: --------- X-Spam_report: (-9.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, USER_IN_DEF_DKIM_WL=-7.5 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @google.com) X-ZM-MESSAGEID: 1738880266031019100 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" These 2 values are different between NPCM7XX and NPCM8XX GCRs. So we add them to the class and assign different values to them. Reviewed-by: Peter Maydell Signed-off-by: Hao Wu --- hw/misc/npcm_gcr.c | 27 ++++++++++++++++----------- include/hw/misc/npcm_gcr.h | 13 +++++++++++-- 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/hw/misc/npcm_gcr.c b/hw/misc/npcm_gcr.c index 0959f2e5c4..d89e8c2c3b 100644 --- a/hw/misc/npcm_gcr.c +++ b/hw/misc/npcm_gcr.c @@ -66,10 +66,9 @@ enum NPCM7xxGCRRegisters { NPCM7XX_GCR_SCRPAD =3D 0x013c / sizeof(uint32_t), NPCM7XX_GCR_USB1PHYCTL, NPCM7XX_GCR_USB2PHYCTL, - NPCM7XX_GCR_REGS_END, }; =20 -static const uint32_t cold_reset_values[NPCM7XX_GCR_NR_REGS] =3D { +static const uint32_t npcm7xx_cold_reset_values[NPCM7XX_GCR_NR_REGS] =3D { [NPCM7XX_GCR_PDID] =3D 0x04a92750, /* Poleg A1 */ [NPCM7XX_GCR_MISCPE] =3D 0x0000ffff, [NPCM7XX_GCR_SPSWC] =3D 0x00000003, @@ -88,8 +87,9 @@ static uint64_t npcm_gcr_read(void *opaque, hwaddr offset= , unsigned size) { uint32_t reg =3D offset / sizeof(uint32_t); NPCMGCRState *s =3D opaque; + NPCMGCRClass *c =3D NPCM_GCR_GET_CLASS(s); =20 - if (reg >=3D NPCM7XX_GCR_NR_REGS) { + if (reg >=3D c->nr_regs) { qemu_log_mask(LOG_GUEST_ERROR, "%s: offset 0x%04" HWADDR_PRIx " out of range\n", __func__, offset); @@ -106,11 +106,12 @@ static void npcm_gcr_write(void *opaque, hwaddr offse= t, { uint32_t reg =3D offset / sizeof(uint32_t); NPCMGCRState *s =3D opaque; + NPCMGCRClass *c =3D NPCM_GCR_GET_CLASS(s); uint32_t value =3D v; =20 - trace_npcm_gcr_write(offset, value); + trace_npcm_gcr_write(offset, v); =20 - if (reg >=3D NPCM7XX_GCR_NR_REGS) { + if (reg >=3D c->nr_regs) { qemu_log_mask(LOG_GUEST_ERROR, "%s: offset 0x%04" HWADDR_PRIx " out of range\n", __func__, offset); @@ -156,10 +157,12 @@ static const struct MemoryRegionOps npcm_gcr_ops =3D { static void npcm7xx_gcr_enter_reset(Object *obj, ResetType type) { NPCMGCRState *s =3D NPCM_GCR(obj); + NPCMGCRClass *c =3D NPCM_GCR_GET_CLASS(obj); =20 - QEMU_BUILD_BUG_ON(sizeof(s->regs) !=3D sizeof(cold_reset_values)); - - memcpy(s->regs, cold_reset_values, sizeof(s->regs)); + g_assert(sizeof(s->regs) >=3D sizeof(c->cold_reset_values)); + g_assert(sizeof(s->regs) >=3D c->nr_regs * sizeof(uint32_t)); + memcpy(s->regs, c->cold_reset_values, c->nr_regs * sizeof(uint32_t)); + /* These 3 registers are at the same location in both 7xx and 8xx. */ s->regs[NPCM7XX_GCR_PWRON] =3D s->reset_pwron; s->regs[NPCM7XX_GCR_MDLR] =3D s->reset_mdlr; s->regs[NPCM7XX_GCR_INTCR3] =3D s->reset_intcr3; @@ -224,7 +227,7 @@ static const VMStateDescription vmstate_npcm_gcr =3D { .version_id =3D 1, .minimum_version_id =3D 1, .fields =3D (const VMStateField[]) { - VMSTATE_UINT32_ARRAY(regs, NPCMGCRState, NPCM7XX_GCR_NR_REGS), + VMSTATE_UINT32_ARRAY(regs, NPCMGCRState, NPCM_GCR_MAX_NR_REGS), VMSTATE_END_OF_LIST(), }, }; @@ -238,7 +241,6 @@ static void npcm_gcr_class_init(ObjectClass *klass, voi= d *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); =20 - QEMU_BUILD_BUG_ON(NPCM7XX_GCR_REGS_END > NPCM7XX_GCR_NR_REGS); dc->realize =3D npcm_gcr_realize; dc->vmsd =3D &vmstate_npcm_gcr; =20 @@ -247,13 +249,15 @@ static void npcm_gcr_class_init(ObjectClass *klass, v= oid *data) =20 static void npcm7xx_gcr_class_init(ObjectClass *klass, void *data) { + NPCMGCRClass *c =3D NPCM_GCR_CLASS(klass); DeviceClass *dc =3D DEVICE_CLASS(klass); ResettableClass *rc =3D RESETTABLE_CLASS(klass); =20 - QEMU_BUILD_BUG_ON(NPCM7XX_GCR_REGS_END !=3D NPCM7XX_GCR_NR_REGS); dc->desc =3D "NPCM7xx System Global Control Registers"; rc->phases.enter =3D npcm7xx_gcr_enter_reset; =20 + c->nr_regs =3D NPCM7XX_GCR_NR_REGS; + c->cold_reset_values =3D npcm7xx_cold_reset_values; } =20 static const TypeInfo npcm_gcr_info[] =3D { @@ -262,6 +266,7 @@ static const TypeInfo npcm_gcr_info[] =3D { .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(NPCMGCRState), .instance_init =3D npcm_gcr_init, + .class_size =3D sizeof(NPCMGCRClass), .class_init =3D npcm_gcr_class_init, .abstract =3D true, }, diff --git a/include/hw/misc/npcm_gcr.h b/include/hw/misc/npcm_gcr.h index 6d3d00d260..9af24e5cdc 100644 --- a/include/hw/misc/npcm_gcr.h +++ b/include/hw/misc/npcm_gcr.h @@ -18,6 +18,7 @@ =20 #include "exec/memory.h" #include "hw/sysbus.h" +#include "qom/object.h" =20 /* * NPCM7XX PWRON STRAP bit fields @@ -53,6 +54,7 @@ * Number of registers in our device state structure. Don't change this wi= thout * incrementing the version_id in the vmstate. */ +#define NPCM_GCR_MAX_NR_REGS NPCM7XX_GCR_NR_REGS #define NPCM7XX_GCR_NR_REGS (0x148 / sizeof(uint32_t)) =20 typedef struct NPCMGCRState { @@ -60,15 +62,22 @@ typedef struct NPCMGCRState { =20 MemoryRegion iomem; =20 - uint32_t regs[NPCM7XX_GCR_NR_REGS]; + uint32_t regs[NPCM_GCR_MAX_NR_REGS]; =20 uint32_t reset_pwron; uint32_t reset_mdlr; uint32_t reset_intcr3; } NPCMGCRState; =20 +typedef struct NPCMGCRClass { + SysBusDeviceClass parent; + + size_t nr_regs; + const uint32_t *cold_reset_values; +} NPCMGCRClass; + #define TYPE_NPCM_GCR "npcm-gcr" #define TYPE_NPCM7XX_GCR "npcm7xx-gcr" -OBJECT_DECLARE_SIMPLE_TYPE(NPCMGCRState, NPCM_GCR) +OBJECT_DECLARE_TYPE(NPCMGCRState, NPCMGCRClass, NPCM_GCR) =20 #endif /* NPCM_GCR_H */ --=20 2.48.1.502.g6dc24dfdaf-goog