qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Cédric Le Goater" <clg@redhat.com>
To: qemu-arm@nongnu.org, qemu-devel@nongnu.org
Cc: "Jamin Lin" <jamin_lin@aspeedtech.com>,
	"Troy Lee" <troy_lee@aspeedtech.com>,
	"Cédric Le Goater" <clg@kaod.org>
Subject: [PULL 02/19] aspeed/wdt: Add AST2700 support
Date: Fri, 14 Jun 2024 09:26:03 +0200	[thread overview]
Message-ID: <20240614072620.1262053-3-clg@redhat.com> (raw)
In-Reply-To: <20240614072620.1262053-1-clg@redhat.com>

From: Jamin Lin <jamin_lin@aspeedtech.com>

AST2700 wdt controller is similiar to AST2600's wdt, but
the AST2700 has 8 watchdogs, and they each have 0x80 of registers.
Introduce ast2700 object class and increase the number of regs(offset) of
ast2700 model.

Signed-off-by: Troy Lee <troy_lee@aspeedtech.com>
Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
---
 include/hw/watchdog/wdt_aspeed.h |  3 ++-
 hw/watchdog/wdt_aspeed.c         | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/include/hw/watchdog/wdt_aspeed.h b/include/hw/watchdog/wdt_aspeed.h
index e90ef86651e8..830b0a79368a 100644
--- a/include/hw/watchdog/wdt_aspeed.h
+++ b/include/hw/watchdog/wdt_aspeed.h
@@ -19,9 +19,10 @@ OBJECT_DECLARE_TYPE(AspeedWDTState, AspeedWDTClass, ASPEED_WDT)
 #define TYPE_ASPEED_2400_WDT TYPE_ASPEED_WDT "-ast2400"
 #define TYPE_ASPEED_2500_WDT TYPE_ASPEED_WDT "-ast2500"
 #define TYPE_ASPEED_2600_WDT TYPE_ASPEED_WDT "-ast2600"
+#define TYPE_ASPEED_2700_WDT TYPE_ASPEED_WDT "-ast2700"
 #define TYPE_ASPEED_1030_WDT TYPE_ASPEED_WDT "-ast1030"
 
-#define ASPEED_WDT_REGS_MAX        (0x30 / 4)
+#define ASPEED_WDT_REGS_MAX        (0x80 / 4)
 
 struct AspeedWDTState {
     /*< private >*/
diff --git a/hw/watchdog/wdt_aspeed.c b/hw/watchdog/wdt_aspeed.c
index d70b656f8e75..75685c56470d 100644
--- a/hw/watchdog/wdt_aspeed.c
+++ b/hw/watchdog/wdt_aspeed.c
@@ -422,12 +422,36 @@ static const TypeInfo aspeed_1030_wdt_info = {
     .class_init = aspeed_1030_wdt_class_init,
 };
 
+static void aspeed_2700_wdt_class_init(ObjectClass *klass, void *data)
+{
+    DeviceClass *dc = DEVICE_CLASS(klass);
+    AspeedWDTClass *awc = ASPEED_WDT_CLASS(klass);
+
+    dc->desc = "ASPEED 2700 Watchdog Controller";
+    awc->iosize = 0x80;
+    awc->ext_pulse_width_mask = 0xfffff; /* TODO */
+    awc->reset_ctrl_reg = AST2600_SCU_RESET_CONTROL1;
+    awc->reset_pulse = aspeed_2500_wdt_reset_pulse;
+    awc->wdt_reload = aspeed_wdt_reload_1mhz;
+    awc->sanitize_ctrl = aspeed_2600_sanitize_ctrl;
+    awc->default_status = 0x014FB180;
+    awc->default_reload_value = 0x014FB180;
+}
+
+static const TypeInfo aspeed_2700_wdt_info = {
+    .name = TYPE_ASPEED_2700_WDT,
+    .parent = TYPE_ASPEED_WDT,
+    .instance_size = sizeof(AspeedWDTState),
+    .class_init = aspeed_2700_wdt_class_init,
+};
+
 static void wdt_aspeed_register_types(void)
 {
     type_register_static(&aspeed_wdt_info);
     type_register_static(&aspeed_2400_wdt_info);
     type_register_static(&aspeed_2500_wdt_info);
     type_register_static(&aspeed_2600_wdt_info);
+    type_register_static(&aspeed_2700_wdt_info);
     type_register_static(&aspeed_1030_wdt_info);
 }
 
-- 
2.45.2



  parent reply	other threads:[~2024-06-14  7:28 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-06-14  7:26 [PULL 00/19] aspeed queue Cédric Le Goater
2024-06-14  7:26 ` [PULL 01/19] aspeed/smc: Reintroduce "dram-base" property for AST2700 Cédric Le Goater
2024-06-14  7:26 ` Cédric Le Goater [this message]
2024-06-14  7:26 ` [PULL 03/19] aspeed/sli: Add AST2700 support Cédric Le Goater
2024-06-14  7:26 ` [PULL 04/19] aspeed/sdmc: remove redundant macros Cédric Le Goater
2024-06-14  7:26 ` [PULL 05/19] aspeed/sdmc: fix coding style Cédric Le Goater
2024-06-14  7:26 ` [PULL 06/19] aspeed/sdmc: Add AST2700 support Cédric Le Goater
2024-06-14  7:26 ` [PULL 07/19] aspeed/smc: correct device description Cédric Le Goater
2024-06-14  7:26 ` [PULL 08/19] aspeed/smc: support dma start length and 1 byte length unit Cédric Le Goater
2024-06-14  7:26 ` [PULL 09/19] aspeed/smc: support 64 bits dma dram address Cédric Le Goater
2024-06-14  7:26 ` [PULL 10/19] aspeed/smc: support different memory region ops for SMC flash region Cédric Le Goater
2024-06-14  7:26 ` [PULL 11/19] aspeed/smc: Add AST2700 support Cédric Le Goater
2024-06-14  7:26 ` [PULL 12/19] aspeed/scu: " Cédric Le Goater
2024-06-14  7:26 ` [PULL 13/19] aspeed/intc: " Cédric Le Goater
2024-06-14  7:26 ` [PULL 14/19] aspeed/soc: " Cédric Le Goater
2024-06-14  7:26 ` [PULL 15/19] aspeed: Add an AST2700 eval board Cédric Le Goater
2024-06-14  7:26 ` [PULL 16/19] aspeed/soc: fix incorrect dram size for AST2700 Cédric Le Goater
2024-06-14  7:26 ` [PULL 17/19] test/avocado/machine_aspeed.py: Add AST2700 test case Cédric Le Goater
2024-06-14  7:26 ` [PULL 18/19] docs:aspeed: Add AST2700 Evaluation board Cédric Le Goater
2024-06-14  7:26 ` [PULL 19/19] MAINTAINERS: Add reviewers for ASPEED BMCs Cédric Le Goater
2024-06-15 16:14 ` [PULL 00/19] aspeed queue Richard Henderson
2024-06-15 21:56   ` Cédric Le Goater

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240614072620.1262053-3-clg@redhat.com \
    --to=clg@redhat.com \
    --cc=clg@kaod.org \
    --cc=jamin_lin@aspeedtech.com \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=troy_lee@aspeedtech.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).