From nobody Tue Feb 10 03:15:56 2026 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=1739991060; cv=none; d=zohomail.com; s=zohoarc; b=MRJp5E2/vOXemS6hKPC4/cnJ92mBIrnEYmW8KCBrS1TcFf3IgC+7o8V5wi2FRw1afDHmpupz2bJh0kFpgJ+A5ZG3D50TbmEE15z269Xx9zeydoac6phX+YsPGS1eyrIoZeJhTbJtR8XVoP151pnT6xWOa3bwcat1U23xzh2oXoY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1739991060; 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=DOX2NXbz0HslYt+n1dFJGvqfvtJ8wmCtAwMzsry5EDQ=; b=mrkU4HJDs5Qoc0kJiN+LveV78CqACu/4g/Y4Nrzu+1EsSJ9FDDWvjjQ0xxZb6+BOvGiaeFOtYGBevVkhzeihD/E1slSFOSZkMUZ8HFpCDqIW1ZdEV+/FZql7XxmoRZu01RFCCG84hRhweABse0acMLDLkGjZqb8FzsboIQLKGJM= 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 1739991060795838.7890972576396; Wed, 19 Feb 2025 10:51:00 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tkp6N-00039x-C4; Wed, 19 Feb 2025 13:47:19 -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 <3FSe2ZwgKCoA0ylesxwlksskpi.gsquiqy-hiziprsrkry.svk@flex--wuhaotsh.bounces.google.com>) id 1tkp5u-00035v-NR for qemu-devel@nongnu.org; Wed, 19 Feb 2025 13:46:54 -0500 Received: from mail-pj1-x1049.google.com ([2607:f8b0:4864:20::1049]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <3FSe2ZwgKCoA0ylesxwlksskpi.gsquiqy-hiziprsrkry.svk@flex--wuhaotsh.bounces.google.com>) id 1tkp5r-0004nw-Ee for qemu-devel@nongnu.org; Wed, 19 Feb 2025 13:46:50 -0500 Received: by mail-pj1-x1049.google.com with SMTP id 98e67ed59e1d1-2fc0bc05b36so275559a91.3 for ; Wed, 19 Feb 2025 10:46:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1739990806; x=1740595606; 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=DOX2NXbz0HslYt+n1dFJGvqfvtJ8wmCtAwMzsry5EDQ=; b=h/R4yYys6UQR3RlgOXQTF5GVP+9f+ppZ2MMYxj3O8RDZMXjX4f9GWUwJeTlHie350j 8mnGgoa0hon976Yw/yFzvsy74dzQtw1+GOGtcesBcFxuiaZnaZis/+pLyVoVdNm3oz7U 85EQ5WhRLoltqYy2ilDWci0wQdO5fF3LUyA/IdhV0vmNKgMaiuPnZ9zrKDatZIpNeKNV 2h/whTzspCGd8BdbPYUDSSlSQvStF7cjOMiIAonznqE3Pd8LRCFHsCfPRGFXn/fvGbzY GGneHfzvt4HHwaj+Bm+WxyQGXZkP9ATF29FV4h7bmrUcTueDE1I6NE9d3OMpTWPyHrW/ 9nVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739990806; x=1740595606; 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=DOX2NXbz0HslYt+n1dFJGvqfvtJ8wmCtAwMzsry5EDQ=; b=oBhhSpso9UJc9Rbwc7JR1sps0JuDhdHWkaLQheWyyPtfmR7G26Liz+pLVtIydjDFHF JIWvMxqqhM7Zg/ms80FP2QyOnRz7+AdwAD3zyav7HLSEU6qWI0Nq6BPRYRBGRxkVfzyG Pb6NXf7Zn/8mDAVLZdBxcg2ZkMST3bwxJDC9ZZt+0GKorXvNEwWlHm2wsWRuemcoRGaf /pKAfPzhMa3nVIVqf15Vsmykw/sCuwAU6v5yHZQORGAZ5lngS3QgVNuYlvuec85GY6+c 7gQkBl4kec4uuZ9853aMkWg/7VKE3ziINd2X1r7+UvaPP2kNlKXcBWzhLJ6aSlSuGmvW pK8A== X-Forwarded-Encrypted: i=1; AJvYcCUs/qrNjN70Ghgq90L8jXaElQoqZIXcgt+5UWr2JOrFIeLDKwNNzJu+Uu5s/KdUfE1Olu8JRBh1+XAr@nongnu.org X-Gm-Message-State: AOJu0YxOg+aEntSaI7/37JV8/XTRuR+wf5x+AX7sB7k76sVDaPLzltJj fOsT11fK7vh0AfxJbRy+a4/a/E2jARZ3yfW/EapWLYs2fu5pycmopSvg/4/TkyHRgRaaGQahcIb KqAf8JxeIog== X-Google-Smtp-Source: AGHT+IECysh7BfMAzeEaX9cOpQ4MDITn9hw/gwz81hcB7helKRLZGDTrsVH3OvYFuMPlbJxG2BOIpNWHzAcBEQ== X-Received: from pjbpd16.prod.google.com ([2002:a17:90b:1dd0:b0:2ef:8055:93d9]) (user=wuhaotsh job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:5546:b0:2ee:f80c:6892 with SMTP id 98e67ed59e1d1-2fc40c1a7f6mr28386527a91.3.1739990805743; Wed, 19 Feb 2025 10:46:45 -0800 (PST) Date: Wed, 19 Feb 2025 10:46:04 -0800 In-Reply-To: <20250219184609.1839281-1-wuhaotsh@google.com> Mime-Version: 1.0 References: <20250219184609.1839281-1-wuhaotsh@google.com> X-Mailer: git-send-email 2.48.1.601.g30ceb7b040-goog Message-ID: <20250219184609.1839281-14-wuhaotsh@google.com> Subject: [PATCH v5 13/17] hw/misc: Support NPCM8XX CLK Module Registers 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::1049; envelope-from=3FSe2ZwgKCoA0ylesxwlksskpi.gsquiqy-hiziprsrkry.svk@flex--wuhaotsh.bounces.google.com; helo=mail-pj1-x1049.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: 1739991062870019100 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" NPCM8XX adds a few new registers and have a different set of reset values to the CLK modules. This patch supports them. This patch doesn't support the new clock values generated by these registers. Currently no modules use these new clock values so they are not necessary at this point. Implementation of these clocks might be required when implementing these modules. Reviewed-by: Titus Rwantare Reviewed-by: Peter Maydell Signed-off-by: Hao Wu --- hw/misc/npcm_clk.c | 117 +++++++++++++++++++++++++++++++++++-- include/hw/misc/npcm_clk.h | 10 +++- 2 files changed, 119 insertions(+), 8 deletions(-) diff --git a/hw/misc/npcm_clk.c b/hw/misc/npcm_clk.c index 78144b14e3..d1f29759d5 100644 --- a/hw/misc/npcm_clk.c +++ b/hw/misc/npcm_clk.c @@ -1,5 +1,5 @@ /* - * Nuvoton NPCM7xx Clock Control Registers. + * Nuvoton NPCM7xx/8xx Clock Control Registers. * * Copyright 2020 Google LLC * @@ -72,7 +72,57 @@ enum NPCM7xxCLKRegisters { NPCM7XX_CLK_AHBCKFI, NPCM7XX_CLK_SECCNT, NPCM7XX_CLK_CNTR25M, - NPCM7XX_CLK_REGS_END, +}; + +enum NPCM8xxCLKRegisters { + NPCM8XX_CLK_CLKEN1, + NPCM8XX_CLK_CLKSEL, + NPCM8XX_CLK_CLKDIV1, + NPCM8XX_CLK_PLLCON0, + NPCM8XX_CLK_PLLCON1, + NPCM8XX_CLK_SWRSTR, + NPCM8XX_CLK_IPSRST1 =3D 0x20 / sizeof(uint32_t), + NPCM8XX_CLK_IPSRST2, + NPCM8XX_CLK_CLKEN2, + NPCM8XX_CLK_CLKDIV2, + NPCM8XX_CLK_CLKEN3, + NPCM8XX_CLK_IPSRST3, + NPCM8XX_CLK_WD0RCR, + NPCM8XX_CLK_WD1RCR, + NPCM8XX_CLK_WD2RCR, + NPCM8XX_CLK_SWRSTC1, + NPCM8XX_CLK_SWRSTC2, + NPCM8XX_CLK_SWRSTC3, + NPCM8XX_CLK_TIPRSTC, + NPCM8XX_CLK_PLLCON2, + NPCM8XX_CLK_CLKDIV3, + NPCM8XX_CLK_CORSTC, + NPCM8XX_CLK_PLLCONG, + NPCM8XX_CLK_AHBCKFI, + NPCM8XX_CLK_SECCNT, + NPCM8XX_CLK_CNTR25M, + /* Registers unique to NPCM8XX SoC */ + NPCM8XX_CLK_CLKEN4, + NPCM8XX_CLK_IPSRST4, + NPCM8XX_CLK_BUSTO, + NPCM8XX_CLK_CLKDIV4, + NPCM8XX_CLK_WD0RCRB, + NPCM8XX_CLK_WD1RCRB, + NPCM8XX_CLK_WD2RCRB, + NPCM8XX_CLK_SWRSTC1B, + NPCM8XX_CLK_SWRSTC2B, + NPCM8XX_CLK_SWRSTC3B, + NPCM8XX_CLK_TIPRSTCB, + NPCM8XX_CLK_CORSTCB, + NPCM8XX_CLK_IPSRSTDIS1, + NPCM8XX_CLK_IPSRSTDIS2, + NPCM8XX_CLK_IPSRSTDIS3, + NPCM8XX_CLK_IPSRSTDIS4, + NPCM8XX_CLK_CLKENDIS1, + NPCM8XX_CLK_CLKENDIS2, + NPCM8XX_CLK_CLKENDIS3, + NPCM8XX_CLK_CLKENDIS4, + NPCM8XX_CLK_THRTL_CNT, }; =20 /* @@ -103,6 +153,46 @@ static const uint32_t npcm7xx_cold_reset_values[NPCM7X= X_CLK_NR_REGS] =3D { [NPCM7XX_CLK_AHBCKFI] =3D 0x000000c8, }; =20 +/* + * These reset values were taken from version 0.92 of the NPCM8xx data she= et. + */ +static const uint32_t npcm8xx_cold_reset_values[NPCM8XX_CLK_NR_REGS] =3D { + [NPCM8XX_CLK_CLKEN1] =3D 0xffffffff, + [NPCM8XX_CLK_CLKSEL] =3D 0x154aaaaa, + [NPCM8XX_CLK_CLKDIV1] =3D 0x5413f855, + [NPCM8XX_CLK_PLLCON0] =3D 0x00222101 | PLLCON_LOKI, + [NPCM8XX_CLK_PLLCON1] =3D 0x00202101 | PLLCON_LOKI, + [NPCM8XX_CLK_IPSRST1] =3D 0x00001000, + [NPCM8XX_CLK_IPSRST2] =3D 0x80000000, + [NPCM8XX_CLK_CLKEN2] =3D 0xffffffff, + [NPCM8XX_CLK_CLKDIV2] =3D 0xaa4f8f9f, + [NPCM8XX_CLK_CLKEN3] =3D 0xffffffff, + [NPCM8XX_CLK_IPSRST3] =3D 0x03000000, + [NPCM8XX_CLK_WD0RCR] =3D 0xffffffff, + [NPCM8XX_CLK_WD1RCR] =3D 0xffffffff, + [NPCM8XX_CLK_WD2RCR] =3D 0xffffffff, + [NPCM8XX_CLK_SWRSTC1] =3D 0x00000003, + [NPCM8XX_CLK_SWRSTC2] =3D 0x00000001, + [NPCM8XX_CLK_SWRSTC3] =3D 0x00000001, + [NPCM8XX_CLK_TIPRSTC] =3D 0x00000001, + [NPCM8XX_CLK_PLLCON2] =3D 0x00c02105 | PLLCON_LOKI, + [NPCM8XX_CLK_CLKDIV3] =3D 0x00009100, + [NPCM8XX_CLK_CORSTC] =3D 0x04000003, + [NPCM8XX_CLK_PLLCONG] =3D 0x01228606 | PLLCON_LOKI, + [NPCM8XX_CLK_AHBCKFI] =3D 0x000000c8, + [NPCM8XX_CLK_CLKEN4] =3D 0xffffffff, + [NPCM8XX_CLK_CLKDIV4] =3D 0x70009000, + [NPCM8XX_CLK_IPSRST4] =3D 0x02000000, + [NPCM8XX_CLK_WD0RCRB] =3D 0xfffffe71, + [NPCM8XX_CLK_WD1RCRB] =3D 0xfffffe71, + [NPCM8XX_CLK_WD2RCRB] =3D 0xfffffe71, + [NPCM8XX_CLK_SWRSTC1B] =3D 0xfffffe71, + [NPCM8XX_CLK_SWRSTC2B] =3D 0xfffffe71, + [NPCM8XX_CLK_SWRSTC3B] =3D 0xfffffe71, + [NPCM8XX_CLK_TIPRSTCB] =3D 0xfffffe71, + [NPCM8XX_CLK_CORSTCB] =3D 0xfffffe71, +}; + /* The number of watchdogs that can trigger a reset. */ #define NPCM7XX_NR_WATCHDOGS (3) =20 @@ -1000,8 +1090,8 @@ static const VMStateDescription vmstate_npcm7xx_clk_d= ivider =3D { =20 static const VMStateDescription vmstate_npcm_clk =3D { .name =3D "npcm-clk", - .version_id =3D 2, - .minimum_version_id =3D 2, + .version_id =3D 3, + .minimum_version_id =3D 3, .post_load =3D npcm_clk_post_load, .fields =3D (const VMStateField[]) { VMSTATE_UINT32_ARRAY(regs, NPCMCLKState, NPCM_CLK_MAX_NR_REGS), @@ -1050,13 +1140,21 @@ static void npcm7xx_clk_class_init(ObjectClass *kla= ss, void *data) NPCMCLKClass *c =3D NPCM_CLK_CLASS(klass); DeviceClass *dc =3D DEVICE_CLASS(klass); =20 - QEMU_BUILD_BUG_ON(NPCM7XX_CLK_REGS_END > NPCM_CLK_MAX_NR_REGS); - QEMU_BUILD_BUG_ON(NPCM7XX_CLK_REGS_END !=3D NPCM7XX_CLK_NR_REGS); dc->desc =3D "NPCM7xx Clock Control Registers"; c->nr_regs =3D NPCM7XX_CLK_NR_REGS; c->cold_reset_values =3D npcm7xx_cold_reset_values; } =20 +static void npcm8xx_clk_class_init(ObjectClass *klass, void *data) +{ + NPCMCLKClass *c =3D NPCM_CLK_CLASS(klass); + DeviceClass *dc =3D DEVICE_CLASS(klass); + + dc->desc =3D "NPCM8xx Clock Control Registers"; + c->nr_regs =3D NPCM8XX_CLK_NR_REGS; + c->cold_reset_values =3D npcm8xx_cold_reset_values; +} + static const TypeInfo npcm7xx_clk_pll_info =3D { .name =3D TYPE_NPCM7XX_CLOCK_PLL, .parent =3D TYPE_DEVICE, @@ -1097,6 +1195,12 @@ static const TypeInfo npcm7xx_clk_info =3D { .class_init =3D npcm7xx_clk_class_init, }; =20 +static const TypeInfo npcm8xx_clk_info =3D { + .name =3D TYPE_NPCM8XX_CLK, + .parent =3D TYPE_NPCM_CLK, + .class_init =3D npcm8xx_clk_class_init, +}; + static void npcm7xx_clk_register_type(void) { type_register_static(&npcm7xx_clk_pll_info); @@ -1104,5 +1208,6 @@ static void npcm7xx_clk_register_type(void) type_register_static(&npcm7xx_clk_divider_info); type_register_static(&npcm_clk_info); type_register_static(&npcm7xx_clk_info); + type_register_static(&npcm8xx_clk_info); } type_init(npcm7xx_clk_register_type); diff --git a/include/hw/misc/npcm_clk.h b/include/hw/misc/npcm_clk.h index f47614ac8d..8fa1e14bdd 100644 --- a/include/hw/misc/npcm_clk.h +++ b/include/hw/misc/npcm_clk.h @@ -1,5 +1,5 @@ /* - * Nuvoton NPCM7xx Clock Control Registers. + * Nuvoton NPCM7xx/8xx Clock Control Registers. * * Copyright 2020 Google LLC * @@ -21,11 +21,12 @@ #include "hw/sysbus.h" =20 #define NPCM7XX_CLK_NR_REGS (0x70 / sizeof(uint32_t)) +#define NPCM8XX_CLK_NR_REGS (0xc4 / sizeof(uint32_t)) /* * Number of maximum registers in NPCM device state structure. Don't change * this without incrementing the version_id in the vmstate. */ -#define NPCM_CLK_MAX_NR_REGS NPCM7XX_CLK_NR_REGS +#define NPCM_CLK_MAX_NR_REGS NPCM8XX_CLK_NR_REGS =20 #define NPCM7XX_WATCHDOG_RESET_GPIO_IN "npcm7xx-clk-watchdog-reset-gpio-in" =20 @@ -162,6 +163,10 @@ struct NPCMCLKState { MemoryRegion iomem; =20 /* Clock converters */ + /* + * TODO: Implement unique clock converters for NPCM8xx. + * NPCM8xx adds a few more clock outputs. + */ NPCM7xxClockPLLState plls[NPCM7XX_CLOCK_NR_PLLS]; NPCM7xxClockSELState sels[NPCM7XX_CLOCK_NR_SELS]; NPCM7xxClockDividerState dividers[NPCM7XX_CLOCK_NR_DIVIDERS]; @@ -185,5 +190,6 @@ typedef struct NPCMCLKClass { #define TYPE_NPCM_CLK "npcm-clk" OBJECT_DECLARE_TYPE(NPCMCLKState, NPCMCLKClass, NPCM_CLK) #define TYPE_NPCM7XX_CLK "npcm7xx-clk" +#define TYPE_NPCM8XX_CLK "npcm8xx-clk" =20 #endif /* NPCM_CLK_H */ --=20 2.48.1.601.g30ceb7b040-goog