From nobody Tue Apr 30 06:07:46 2024 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=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1679862245; cv=none; d=zohomail.com; s=zohoarc; b=bKzrZWCX+kih93z7ee7YzHyhP5utSgD8xbuws28dfaa0897pGoSRWO/izmyim8SzcVGJgdim+497Ua8fVB3XYRCsZCFk83TRHrEONtsdDppkXn4S2x2KIK64nbOpqtyktPgHSMAclf/Xv1fzTQBipgoVP+dJ6DuRTjbfhwI79j0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679862245; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=1qKmOF0kGCtL6maKftCGN0/x8w0CqBwnRgukN0d1Jqo=; b=bvuadZlRRaJbj5VPg9Q8BFjQu6/Sdc8zy9/0LCxLFGN3N7RjKYC3gywBOsgy/6bdj+iXEe97QnrNVNbXUhKxVBns/BbJPbSPrCJV+CQZ+WE0Ca8NrZWnJf7FW2zNpi7wzwJSUG0TOB1wh66P2gNjtKUf2qRepjLqVN/CnawW1aA= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1679862245428178.714774227392; Sun, 26 Mar 2023 13:24:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pgWtc-0001pP-O8; Sun, 26 Mar 2023 16:23:20 -0400 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 ) id 1pgWtb-0001nw-2g; Sun, 26 Mar 2023 16:23:19 -0400 Received: from mail-lj1-x231.google.com ([2a00:1450:4864:20::231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pgWtY-0003nj-3d; Sun, 26 Mar 2023 16:23:18 -0400 Received: by mail-lj1-x231.google.com with SMTP id s20so6897638ljp.1; Sun, 26 Mar 2023 13:23:15 -0700 (PDT) Received: from penguin.lxd (213-67-202-254-no43.tbcn.telia.com. [213.67.202.254]) by smtp.googlemail.com with ESMTPSA id u3-20020a2e9f03000000b002a2b9d9429esm1427773ljk.117.2023.03.26.13.23.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Mar 2023 13:23:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679862194; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1qKmOF0kGCtL6maKftCGN0/x8w0CqBwnRgukN0d1Jqo=; b=idER97g/L3pvuf/YOVLGwn8vYjIYj69zJV/9Di5eIdWIws4R46wcNC4/PfHnSaaeRM xt7M+KGk23184foFaf7MlRSUrKabj8QwoVJvI4X85mVX4e/QX5piWGm+jI3/JteWoru9 X2mLXzOeHiWxTGddIaQkg1p8HFjmTBF9ZIg91xgane/wHtKn328lJoudeI4jFDoT7T/M JqwaGsIXlFy5BqvUD/sPYMJGa3zn6xgEQA4VsWHEs2WLAGsrZTPMZgvI7M9zYuvENeVQ 2ZpTKtB3Sou8MF7cWOCM2b+oBEKMxlvhjRm+oKi/iXyAk979cpA5XCF7MrYeg6IecpgX dJUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679862194; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1qKmOF0kGCtL6maKftCGN0/x8w0CqBwnRgukN0d1Jqo=; b=BB1q1DE7td2/oWNF1W1Vqj3CPZw9g1NaXcPXvFUbdt9BpQ2cLBza2p7YJpgFFpkTl0 86TBKkSXYHcrL301uJYOL/2hPI2W84za8/rJ79ePuYzcs+8KR3dTqlvhkDDfHVTrdWUn qGKXClP1SpLMyW1HfsADV8ZfIrM2Xt1bYp/K3FN8fE+BglZZIXytrDW6Rq5DuXj9r1q2 9Aia4Vms59pJcMxIrXEqwBhY2hyaERmAY9iAHgGv+dhl6T37WbrgHPArmOLAqW+yOS3q yNf85eKbcUv8cw/w5kH/wYkuF0ahCkJoBUi3Bp9iRvJVAlsIb64LYvlIfVnk3G1OqcBl nBww== X-Gm-Message-State: AAQBX9cJ05f/y1tnJC1sp8tuNcfPz8CG/ug6UFHvo1dLfXN5mg3jIDye LZCDa53huWnAKaTzAP6U3Vnj0V0GNPJ00crs X-Google-Smtp-Source: AKy350ZHcR5VQcwNZLi+q3KUqJFYAG/+wYjgJVuiqQeqKFTNHOuS3ezlYlN/pfKkp6dleQ9uCXbwfQ== X-Received: by 2002:a2e:b686:0:b0:2a2:c618:1f4d with SMTP id l6-20020a2eb686000000b002a2c6181f4dmr2758347ljo.17.1679862193748; Sun, 26 Mar 2023 13:23:13 -0700 (PDT) From: Strahinja Jankovic X-Google-Original-From: Strahinja Jankovic To: Peter Maydell Cc: Beniamino Galvani , Niek Linnenbank , qemu-arm@nongnu.org, qemu-devel@nongnu.org, Strahinja Jankovic Subject: [PATCH v3 1/4] hw/watchdog: Allwinner WDT emulation for system reset Date: Sun, 26 Mar 2023 22:22:53 +0200 Message-Id: <20230326202256.22980-2-strahinja.p.jankovic@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230326202256.22980-1-strahinja.p.jankovic@gmail.com> References: <20230326202256.22980-1-strahinja.p.jankovic@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::231; envelope-from=strahinjapjankovic@gmail.com; helo=mail-lj1-x231.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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 @gmail.com) X-ZM-MESSAGEID: 1679862246458100001 Content-Type: text/plain; charset="utf-8" This patch adds basic support for Allwinner WDT. Both sun4i and sun6i variants are supported. However, interrupt generation is not supported, so WDT can be used only to = trigger system reset. Signed-off-by: Strahinja Jankovic Reviewed-by: Niek Linnenbank Tested-by: Niek Linnenbank --- hw/watchdog/Kconfig | 4 + hw/watchdog/allwinner-wdt.c | 416 ++++++++++++++++++++++++++++ hw/watchdog/meson.build | 1 + hw/watchdog/trace-events | 7 + include/hw/watchdog/allwinner-wdt.h | 123 ++++++++ 5 files changed, 551 insertions(+) create mode 100644 hw/watchdog/allwinner-wdt.c create mode 100644 include/hw/watchdog/allwinner-wdt.h diff --git a/hw/watchdog/Kconfig b/hw/watchdog/Kconfig index 66e1d029e3..861fd00334 100644 --- a/hw/watchdog/Kconfig +++ b/hw/watchdog/Kconfig @@ -20,3 +20,7 @@ config WDT_IMX2 =20 config WDT_SBSA bool + +config ALLWINNER_WDT + bool + select PTIMER diff --git a/hw/watchdog/allwinner-wdt.c b/hw/watchdog/allwinner-wdt.c new file mode 100644 index 0000000000..6205765efe --- /dev/null +++ b/hw/watchdog/allwinner-wdt.c @@ -0,0 +1,416 @@ +/* + * Allwinner Watchdog emulation + * + * Copyright (C) 2023 Strahinja Jankovic + * + * This file is derived from Allwinner RTC, + * by Niek Linnenbank. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "qemu/osdep.h" +#include "qemu/log.h" +#include "qemu/units.h" +#include "qemu/module.h" +#include "trace.h" +#include "hw/sysbus.h" +#include "hw/registerfields.h" +#include "hw/watchdog/allwinner-wdt.h" +#include "sysemu/watchdog.h" +#include "migration/vmstate.h" + +/* WDT registers */ +enum { + REG_IRQ_EN =3D 0, /* Watchdog interrupt enable */ + REG_IRQ_STA, /* Watchdog interrupt status */ + REG_CTRL, /* Watchdog control register */ + REG_CFG, /* Watchdog configuration register */ + REG_MODE, /* Watchdog mode register */ +}; + +/* Universal WDT register flags */ +#define WDT_RESTART_MASK (1 << 0) +#define WDT_EN_MASK (1 << 0) + +/* sun4i specific WDT register flags */ +#define RST_EN_SUN4I_MASK (1 << 1) +#define INTV_VALUE_SUN4I_SHIFT (3) +#define INTV_VALUE_SUN4I_MASK (0xfu << INTV_VALUE_SUN4I_SHIFT) + +/* sun6i specific WDT register flags */ +#define RST_EN_SUN6I_MASK (1 << 0) +#define KEY_FIELD_SUN6I_SHIFT (1) +#define KEY_FIELD_SUN6I_MASK (0xfffu << KEY_FIELD_SUN6I_SHIFT) +#define KEY_FIELD_SUN6I (0xA57u) +#define INTV_VALUE_SUN6I_SHIFT (4) +#define INTV_VALUE_SUN6I_MASK (0xfu << INTV_VALUE_SUN6I_SHIFT) + +/* Map of INTV_VALUE to 0.5s units. */ +static const uint8_t allwinner_wdt_count_map[] =3D { + 1, + 2, + 4, + 6, + 8, + 10, + 12, + 16, + 20, + 24, + 28, + 32 +}; + +/* WDT sun4i register map (offset to name) */ +const uint8_t allwinner_wdt_sun4i_regmap[] =3D { + [0x0000] =3D REG_CTRL, + [0x0004] =3D REG_MODE, +}; + +/* WDT sun6i register map (offset to name) */ +const uint8_t allwinner_wdt_sun6i_regmap[] =3D { + [0x0000] =3D REG_IRQ_EN, + [0x0004] =3D REG_IRQ_STA, + [0x0010] =3D REG_CTRL, + [0x0014] =3D REG_CFG, + [0x0018] =3D REG_MODE, +}; + +static bool allwinner_wdt_sun4i_read(AwWdtState *s, uint32_t offset) +{ + /* no sun4i specific registers currently implemented */ + return false; +} + +static bool allwinner_wdt_sun4i_write(AwWdtState *s, uint32_t offset, + uint32_t data) +{ + /* no sun4i specific registers currently implemented */ + return false; +} + +static bool allwinner_wdt_sun4i_can_reset_system(AwWdtState *s) +{ + if (s->regs[REG_MODE] & RST_EN_SUN4I_MASK) { + return true; + } else { + return false; + } +} + +static bool allwinner_wdt_sun4i_is_key_valid(AwWdtState *s, uint32_t val) +{ + /* sun4i has no key */ + return true; +} + +static uint8_t allwinner_wdt_sun4i_get_intv_value(AwWdtState *s) +{ + return ((s->regs[REG_MODE] & INTV_VALUE_SUN4I_MASK) >> + INTV_VALUE_SUN4I_SHIFT); +} + +static bool allwinner_wdt_sun6i_read(AwWdtState *s, uint32_t offset) +{ + const AwWdtClass *c =3D AW_WDT_GET_CLASS(s); + + switch (c->regmap[offset]) { + case REG_IRQ_EN: + case REG_IRQ_STA: + case REG_CFG: + return true; + default: + break; + } + return false; +} + +static bool allwinner_wdt_sun6i_write(AwWdtState *s, uint32_t offset, + uint32_t data) +{ + const AwWdtClass *c =3D AW_WDT_GET_CLASS(s); + + switch (c->regmap[offset]) { + case REG_IRQ_EN: + case REG_IRQ_STA: + case REG_CFG: + return true; + default: + break; + } + return false; +} + +static bool allwinner_wdt_sun6i_can_reset_system(AwWdtState *s) +{ + if (s->regs[REG_CFG] & RST_EN_SUN6I_MASK) { + return true; + } else { + return false; + } +} + +static bool allwinner_wdt_sun6i_is_key_valid(AwWdtState *s, uint32_t val) +{ + uint16_t key =3D (val & KEY_FIELD_SUN6I_MASK) >> KEY_FIELD_SUN6I_SHIFT; + return (key =3D=3D KEY_FIELD_SUN6I); +} + +static uint8_t allwinner_wdt_sun6i_get_intv_value(AwWdtState *s) +{ + return ((s->regs[REG_MODE] & INTV_VALUE_SUN6I_MASK) >> + INTV_VALUE_SUN6I_SHIFT); +} + +static void allwinner_wdt_update_timer(AwWdtState *s) +{ + const AwWdtClass *c =3D AW_WDT_GET_CLASS(s); + uint8_t count =3D c->get_intv_value(s); + + ptimer_transaction_begin(s->timer); + ptimer_stop(s->timer); + + /* Use map to convert. */ + if (count < sizeof(allwinner_wdt_count_map)) { + ptimer_set_count(s->timer, allwinner_wdt_count_map[count]); + } else { + qemu_log_mask(LOG_GUEST_ERROR, "%s: incorrect INTV_VALUE 0x%02x\n", + __func__, count); + } + + ptimer_run(s->timer, 1); + ptimer_transaction_commit(s->timer); + + trace_allwinner_wdt_update_timer(count); +} + +static uint64_t allwinner_wdt_read(void *opaque, hwaddr offset, + unsigned size) +{ + AwWdtState *s =3D AW_WDT(opaque); + const AwWdtClass *c =3D AW_WDT_GET_CLASS(s); + uint64_t r; + + if (offset >=3D c->regmap_size) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: out-of-bounds offset 0x%04x\n", + __func__, (uint32_t)offset); + return 0; + } + + switch (c->regmap[offset]) { + case REG_CTRL: + case REG_MODE: + r =3D s->regs[c->regmap[offset]]; + break; + default: + if (!c->read(s, offset)) { + qemu_log_mask(LOG_UNIMP, "%s: unimplemented register 0x%04x\n", + __func__, (uint32_t)offset); + return 0; + } + r =3D s->regs[c->regmap[offset]]; + break; + } + + trace_allwinner_wdt_read(offset, r, size); + + return r; +} + +static void allwinner_wdt_write(void *opaque, hwaddr offset, + uint64_t val, unsigned size) +{ + AwWdtState *s =3D AW_WDT(opaque); + const AwWdtClass *c =3D AW_WDT_GET_CLASS(s); + uint32_t old_val; + + if (offset >=3D c->regmap_size) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: out-of-bounds offset 0x%04x\n", + __func__, (uint32_t)offset); + return; + } + + trace_allwinner_wdt_write(offset, val, size); + + switch (c->regmap[offset]) { + case REG_CTRL: + if (c->is_key_valid(s, val)) { + if (val & WDT_RESTART_MASK) { + /* Kick timer */ + allwinner_wdt_update_timer(s); + } + } + break; + case REG_MODE: + old_val =3D s->regs[REG_MODE]; + s->regs[REG_MODE] =3D (uint32_t)val; + + /* Check for rising edge on WDOG_MODE_EN */ + if ((s->regs[REG_MODE] & ~old_val) & WDT_EN_MASK) { + allwinner_wdt_update_timer(s); + } + break; + default: + if (!c->write(s, offset, val)) { + qemu_log_mask(LOG_UNIMP, "%s: unimplemented register 0x%04x\n", + __func__, (uint32_t)offset); + } + s->regs[c->regmap[offset]] =3D (uint32_t)val; + break; + } +} + +static const MemoryRegionOps allwinner_wdt_ops =3D { + .read =3D allwinner_wdt_read, + .write =3D allwinner_wdt_write, + .endianness =3D DEVICE_NATIVE_ENDIAN, + .valid =3D { + .min_access_size =3D 4, + .max_access_size =3D 4, + }, + .impl.min_access_size =3D 4, +}; + +static void allwinner_wdt_expired(void *opaque) +{ + AwWdtState *s =3D AW_WDT(opaque); + const AwWdtClass *c =3D AW_WDT_GET_CLASS(s); + + bool enabled =3D s->regs[REG_MODE] & WDT_EN_MASK; + bool reset_enabled =3D c->can_reset_system(s); + + trace_allwinner_wdt_expired(enabled, reset_enabled); + + /* Perform watchdog action if watchdog is enabled and can trigger rese= t */ + if (enabled && reset_enabled) { + watchdog_perform_action(); + } +} + +static void allwinner_wdt_reset_enter(Object *obj, ResetType type) +{ + AwWdtState *s =3D AW_WDT(obj); + + trace_allwinner_wdt_reset_enter(); + + /* Clear registers */ + memset(s->regs, 0, sizeof(s->regs)); +} + +static const VMStateDescription allwinner_wdt_vmstate =3D { + .name =3D "allwinner-wdt", + .version_id =3D 1, + .minimum_version_id =3D 1, + .fields =3D (VMStateField[]) { + VMSTATE_PTIMER(timer, AwWdtState), + VMSTATE_UINT32_ARRAY(regs, AwWdtState, AW_WDT_REGS_NUM), + VMSTATE_END_OF_LIST() + } +}; + +static void allwinner_wdt_init(Object *obj) +{ + SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); + AwWdtState *s =3D AW_WDT(obj); + const AwWdtClass *c =3D AW_WDT_GET_CLASS(s); + + /* Memory mapping */ + memory_region_init_io(&s->iomem, OBJECT(s), &allwinner_wdt_ops, s, + TYPE_AW_WDT, c->regmap_size * 4); + sysbus_init_mmio(sbd, &s->iomem); +} + +static void allwinner_wdt_realize(DeviceState *dev, Error **errp) +{ + AwWdtState *s =3D AW_WDT(dev); + + s->timer =3D ptimer_init(allwinner_wdt_expired, s, + PTIMER_POLICY_NO_IMMEDIATE_TRIGGER | + PTIMER_POLICY_NO_IMMEDIATE_RELOAD | + PTIMER_POLICY_NO_COUNTER_ROUND_DOWN); + + ptimer_transaction_begin(s->timer); + /* Set to 2Hz (0.5s period); other periods are multiples of 0.5s. */ + ptimer_set_freq(s->timer, 2); + ptimer_set_limit(s->timer, 0xff, 1); + ptimer_transaction_commit(s->timer); +} + +static void allwinner_wdt_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + ResettableClass *rc =3D RESETTABLE_CLASS(klass); + + rc->phases.enter =3D allwinner_wdt_reset_enter; + dc->realize =3D allwinner_wdt_realize; + dc->vmsd =3D &allwinner_wdt_vmstate; +} + +static void allwinner_wdt_sun4i_class_init(ObjectClass *klass, void *data) +{ + AwWdtClass *awc =3D AW_WDT_CLASS(klass); + + awc->regmap =3D allwinner_wdt_sun4i_regmap; + awc->regmap_size =3D sizeof(allwinner_wdt_sun4i_regmap); + awc->read =3D allwinner_wdt_sun4i_read; + awc->write =3D allwinner_wdt_sun4i_write; + awc->can_reset_system =3D allwinner_wdt_sun4i_can_reset_system; + awc->is_key_valid =3D allwinner_wdt_sun4i_is_key_valid; + awc->get_intv_value =3D allwinner_wdt_sun4i_get_intv_value; +} + +static void allwinner_wdt_sun6i_class_init(ObjectClass *klass, void *data) +{ + AwWdtClass *awc =3D AW_WDT_CLASS(klass); + + awc->regmap =3D allwinner_wdt_sun6i_regmap; + awc->regmap_size =3D sizeof(allwinner_wdt_sun6i_regmap); + awc->read =3D allwinner_wdt_sun6i_read; + awc->write =3D allwinner_wdt_sun6i_write; + awc->can_reset_system =3D allwinner_wdt_sun6i_can_reset_system; + awc->is_key_valid =3D allwinner_wdt_sun6i_is_key_valid; + awc->get_intv_value =3D allwinner_wdt_sun6i_get_intv_value; +} + +static const TypeInfo allwinner_wdt_info =3D { + .name =3D TYPE_AW_WDT, + .parent =3D TYPE_SYS_BUS_DEVICE, + .instance_init =3D allwinner_wdt_init, + .instance_size =3D sizeof(AwWdtState), + .class_init =3D allwinner_wdt_class_init, + .class_size =3D sizeof(AwWdtClass), + .abstract =3D true, +}; + +static const TypeInfo allwinner_wdt_sun4i_info =3D { + .name =3D TYPE_AW_WDT_SUN4I, + .parent =3D TYPE_AW_WDT, + .class_init =3D allwinner_wdt_sun4i_class_init, +}; + +static const TypeInfo allwinner_wdt_sun6i_info =3D { + .name =3D TYPE_AW_WDT_SUN6I, + .parent =3D TYPE_AW_WDT, + .class_init =3D allwinner_wdt_sun6i_class_init, +}; + +static void allwinner_wdt_register(void) +{ + type_register_static(&allwinner_wdt_info); + type_register_static(&allwinner_wdt_sun4i_info); + type_register_static(&allwinner_wdt_sun6i_info); +} + +type_init(allwinner_wdt_register) diff --git a/hw/watchdog/meson.build b/hw/watchdog/meson.build index 8974b5cf4c..5dcd4fbe2f 100644 --- a/hw/watchdog/meson.build +++ b/hw/watchdog/meson.build @@ -1,4 +1,5 @@ softmmu_ss.add(files('watchdog.c')) +softmmu_ss.add(when: 'CONFIG_ALLWINNER_WDT', if_true: files('allwinner-wdt= .c')) softmmu_ss.add(when: 'CONFIG_CMSDK_APB_WATCHDOG', if_true: files('cmsdk-ap= b-watchdog.c')) softmmu_ss.add(when: 'CONFIG_WDT_IB6300ESB', if_true: files('wdt_i6300esb.= c')) softmmu_ss.add(when: 'CONFIG_WDT_IB700', if_true: files('wdt_ib700.c')) diff --git a/hw/watchdog/trace-events b/hw/watchdog/trace-events index 54371ae075..2739570652 100644 --- a/hw/watchdog/trace-events +++ b/hw/watchdog/trace-events @@ -1,5 +1,12 @@ # See docs/devel/tracing.rst for syntax documentation. =20 +# allwinner-wdt.c +allwinner_wdt_read(uint64_t offset, uint64_t data, unsigned size) "Allwinn= er watchdog read: offset 0x%" PRIx64 " data 0x%" PRIx64 " size %u" +allwinner_wdt_write(uint64_t offset, uint64_t data, unsigned size) "Allwin= ner watchdog write: offset 0x%" PRIx64 " data 0x%" PRIx64 " size %u" +allwinner_wdt_reset_enter(void) "Allwinner watchdog: reset" +allwinner_wdt_update_timer(uint8_t count) "Allwinner watchdog: count %" PR= Iu8 +allwinner_wdt_expired(bool enabled, bool reset_enabled) "Allwinner watchdo= g: enabled %u reset_enabled %u" + # cmsdk-apb-watchdog.c cmsdk_apb_watchdog_read(uint64_t offset, uint64_t data, unsigned size) "CM= SDK APB watchdog read: offset 0x%" PRIx64 " data 0x%" PRIx64 " size %u" cmsdk_apb_watchdog_write(uint64_t offset, uint64_t data, unsigned size) "C= MSDK APB watchdog write: offset 0x%" PRIx64 " data 0x%" PRIx64 " size %u" diff --git a/include/hw/watchdog/allwinner-wdt.h b/include/hw/watchdog/allw= inner-wdt.h new file mode 100644 index 0000000000..7fe41e20f2 --- /dev/null +++ b/include/hw/watchdog/allwinner-wdt.h @@ -0,0 +1,123 @@ +/* + * Allwinner Watchdog emulation + * + * Copyright (C) 2023 Strahinja Jankovic + * + * This file is derived from Allwinner RTC, + * by Niek Linnenbank. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef HW_WATCHDOG_ALLWINNER_WDT_H +#define HW_WATCHDOG_ALLWINNER_WDT_H + +#include "qom/object.h" +#include "hw/ptimer.h" +#include "hw/sysbus.h" + +/* + * This is a model of the Allwinner watchdog. + * Since watchdog registers belong to the timer module (and are shared wit= h the + * RTC module), the interrupt line from watchdog is not handled right now. + * In QEMU, we just wire up the watchdog reset to watchdog_perform_action(= ), + * at least for the moment. + */ + +#define TYPE_AW_WDT "allwinner-wdt" + +/** Allwinner WDT sun4i family (A10, A12), also sun7i (A20) */ +#define TYPE_AW_WDT_SUN4I TYPE_AW_WDT "-sun4i" + +/** Allwinner WDT sun6i family and newer (A31, H2+, H3, etc) */ +#define TYPE_AW_WDT_SUN6I TYPE_AW_WDT "-sun6i" + +/** Number of WDT registers */ +#define AW_WDT_REGS_NUM (5) + +OBJECT_DECLARE_TYPE(AwWdtState, AwWdtClass, AW_WDT) + +/** + * Allwinner WDT object instance state. + */ +struct AwWdtState { + /*< private >*/ + SysBusDevice parent_obj; + + /*< public >*/ + MemoryRegion iomem; + struct ptimer_state *timer; + + uint32_t regs[AW_WDT_REGS_NUM]; +}; + +/** + * Allwinner WDT class-level struct. + * + * This struct is filled by each sunxi device specific code + * such that the generic code can use this struct to support + * all devices. + */ +struct AwWdtClass { + /*< private >*/ + SysBusDeviceClass parent_class; + /*< public >*/ + + /** Defines device specific register map */ + const uint8_t *regmap; + + /** Size of the regmap in bytes */ + size_t regmap_size; + + /** + * Read device specific register + * + * @offset: register offset to read + * @return true if register read successful, false otherwise + */ + bool (*read)(AwWdtState *s, uint32_t offset); + + /** + * Write device specific register + * + * @offset: register offset to write + * @data: value to set in register + * @return true if register write successful, false otherwise + */ + bool (*write)(AwWdtState *s, uint32_t offset, uint32_t data); + + /** + * Check if watchdog can generate system reset + * + * @return true if watchdog can generate system reset + */ + bool (*can_reset_system)(AwWdtState *s); + + /** + * Check if provided key is valid + * + * @value: value written to register + * @return true if key is valid, false otherwise + */ + bool (*is_key_valid)(AwWdtState *s, uint32_t val); + + /** + * Get current INTV_VALUE setting + * + * @return current INTV_VALUE (0-15) + */ + uint8_t (*get_intv_value)(AwWdtState *s); +}; + +#endif /* HW_WATCHDOG_ALLWINNER_WDT_H */ --=20 2.30.2 From nobody Tue Apr 30 06:07:46 2024 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=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1679862258; cv=none; d=zohomail.com; s=zohoarc; b=gdfo45gq3DW0zj6EYktSacvyOqMmF+L6RSqZquygwRZkmJ2PvLbuttQf2VQamcevFa1YSURHNhnGXErmEDEDgSQ4Y93KcLN2McDKBiCOezknTb/GbvZf/WZCHF7FUJ9MFnNxsp7Xt4414+XIMYx95nWKVx8d4ec5vYHhWrzzHB0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679862258; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gibIWHp2DjKhjqmF4CDIwlJs//RfjUNBpQ15/PPbVXI=; b=Z+ssfkdaq/g2fKxJDRd/kbxDoVROzsTRPRhRY0p03dTdE07b+fBovH7XDv5t/iBwZmwq5feDUWsiSHOSob5AZFNQISTCDEVEpy6zhXhbexsZg7sK+0EFQ5WHnxcMRYyCfwmv9FnPxuWnL0kgobTMgJrzh3xrrs73ZTN/8ubXUzk= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1679862258574655.6317674043087; Sun, 26 Mar 2023 13:24:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pgWtd-0001pw-DD; Sun, 26 Mar 2023 16:23:21 -0400 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 ) id 1pgWtb-0001oB-ET; Sun, 26 Mar 2023 16:23:19 -0400 Received: from mail-lj1-x233.google.com ([2a00:1450:4864:20::233]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pgWtZ-0003ol-Nm; Sun, 26 Mar 2023 16:23:19 -0400 Received: by mail-lj1-x233.google.com with SMTP id t14so6895884ljd.5; Sun, 26 Mar 2023 13:23:16 -0700 (PDT) Received: from penguin.lxd (213-67-202-254-no43.tbcn.telia.com. [213.67.202.254]) by smtp.googlemail.com with ESMTPSA id u3-20020a2e9f03000000b002a2b9d9429esm1427773ljk.117.2023.03.26.13.23.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Mar 2023 13:23:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679862196; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gibIWHp2DjKhjqmF4CDIwlJs//RfjUNBpQ15/PPbVXI=; b=fJwFQC9marXJpg9H5cQS/7x7mMJvZzAVnxAPyaK8+/dGpbPHUQUO8upbsf/qFLRhBi JHWe3bsYycGQ+NIQX18W9ESCtxkLfyQ5LgkJwyN5A5fpyUmI4Nq2w1EQ3cGaiDcyCsUA ijZKpr0ae7DzfUCx6aRLNaAmUhIQ0n+PT2fdKEEz9MXPeFVmHcp/p+csFFykOZSKaU8b 0s/SEAHlAw6rZkrlz1RcL6dPfsFu8fWAvaJg/qRAFpnGUzJixUTVjJKwN7Dy0jPm3BzW 2RLJIfSflLF64lpQs4BkUzN0lufQWHYgcMb1UAt5xGzH8pF0dKevTPvunqTKLj3WD2rl AfZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679862196; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gibIWHp2DjKhjqmF4CDIwlJs//RfjUNBpQ15/PPbVXI=; b=YwhoUn+W4ZPHhsGozNSkA5fb3amm0P/W8Id9BlHFq2AcGypJs6MffZdmO1xVZmm6qh ht/zJNahrYwqrkfx+rVfw1+6PMGE8wZmIMzZ8+bcB0rwrbPLIbnJl4oIbkhe0XRTHYjs UuhyxtKIoDsLHYFXrm5yzy2/6/2+e18lYMvu7BQPTXtKXSz/ItNPATOqcE7+V1co270t E5v1yKW1xBjscOuLz5WXTacGYvB80ujqU561gQ5LIUk+PU3wnHhbm3zrx5B37LQtKoWS uj2SHcEoRxo25LmvNtw60fA2dW+em2drxkeOnkaT3wwua2OSnyyfII1LaF3OSs+PpyG8 wZSQ== X-Gm-Message-State: AAQBX9dSzWwhrKWFzHGax8TM1AQO1nyabHdKc1hRkEmMh29F6hD1AFZl rbhIy7wBJtN/hW64D4+gZTSMoWGogZr5UFCx X-Google-Smtp-Source: AKy350ZvEpaDDSzmpO+U6CZXqwbhmaDUXu1LWN17F6QzfdB6BHbhUVrxyV9Io2rza9usfV6xgmYEtg== X-Received: by 2002:a2e:7405:0:b0:295:9d05:4a56 with SMTP id p5-20020a2e7405000000b002959d054a56mr2737623ljc.9.1679862195862; Sun, 26 Mar 2023 13:23:15 -0700 (PDT) From: Strahinja Jankovic X-Google-Original-From: Strahinja Jankovic To: Peter Maydell Cc: Beniamino Galvani , Niek Linnenbank , qemu-arm@nongnu.org, qemu-devel@nongnu.org, Strahinja Jankovic Subject: [PATCH v3 2/4] hw/arm: Add WDT to Allwinner-A10 and Cubieboard Date: Sun, 26 Mar 2023 22:22:54 +0200 Message-Id: <20230326202256.22980-3-strahinja.p.jankovic@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230326202256.22980-1-strahinja.p.jankovic@gmail.com> References: <20230326202256.22980-1-strahinja.p.jankovic@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::233; envelope-from=strahinjapjankovic@gmail.com; helo=mail-lj1-x233.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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 @gmail.com) X-ZM-MESSAGEID: 1679862260479100005 Content-Type: text/plain; charset="utf-8" This patch adds WDT to Allwinner-A10 and Cubieboard. WDT is added as an overlay to the Timer module memory map. Signed-off-by: Strahinja Jankovic Reviewed-by: Niek Linnenbank --- docs/system/arm/cubieboard.rst | 1 + hw/arm/Kconfig | 1 + hw/arm/allwinner-a10.c | 7 +++++++ include/hw/arm/allwinner-a10.h | 2 ++ 4 files changed, 11 insertions(+) diff --git a/docs/system/arm/cubieboard.rst b/docs/system/arm/cubieboard.rst index 8d485f5435..58c4a2d3ea 100644 --- a/docs/system/arm/cubieboard.rst +++ b/docs/system/arm/cubieboard.rst @@ -15,3 +15,4 @@ Emulated devices: - USB controller - SATA controller - TWI (I2C) controller +- Watchdog timer diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index b5aed4aff5..ec15248536 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -325,6 +325,7 @@ config ALLWINNER_A10 select ALLWINNER_A10_PIC select ALLWINNER_A10_CCM select ALLWINNER_A10_DRAMC + select ALLWINNER_WDT select ALLWINNER_EMAC select ALLWINNER_I2C select AXP209_PMU diff --git a/hw/arm/allwinner-a10.c b/hw/arm/allwinner-a10.c index b7ca795c71..b0ea3f7f66 100644 --- a/hw/arm/allwinner-a10.c +++ b/hw/arm/allwinner-a10.c @@ -38,6 +38,7 @@ #define AW_A10_EHCI_BASE 0x01c14000 #define AW_A10_OHCI_BASE 0x01c14400 #define AW_A10_SATA_BASE 0x01c18000 +#define AW_A10_WDT_BASE 0x01c20c90 #define AW_A10_RTC_BASE 0x01c20d00 #define AW_A10_I2C0_BASE 0x01c2ac00 =20 @@ -92,6 +93,8 @@ static void aw_a10_init(Object *obj) object_initialize_child(obj, "mmc0", &s->mmc0, TYPE_AW_SDHOST_SUN4I); =20 object_initialize_child(obj, "rtc", &s->rtc, TYPE_AW_RTC_SUN4I); + + object_initialize_child(obj, "wdt", &s->wdt, TYPE_AW_WDT_SUN4I); } =20 static void aw_a10_realize(DeviceState *dev, Error **errp) @@ -203,6 +206,10 @@ static void aw_a10_realize(DeviceState *dev, Error **e= rrp) sysbus_realize(SYS_BUS_DEVICE(&s->i2c0), &error_fatal); sysbus_mmio_map(SYS_BUS_DEVICE(&s->i2c0), 0, AW_A10_I2C0_BASE); sysbus_connect_irq(SYS_BUS_DEVICE(&s->i2c0), 0, qdev_get_gpio_in(dev, = 7)); + + /* WDT */ + sysbus_realize(SYS_BUS_DEVICE(&s->wdt), &error_fatal); + sysbus_mmio_map_overlap(SYS_BUS_DEVICE(&s->wdt), 0, AW_A10_WDT_BASE, 1= ); } =20 static void aw_a10_class_init(ObjectClass *oc, void *data) diff --git a/include/hw/arm/allwinner-a10.h b/include/hw/arm/allwinner-a10.h index 095afb225d..cd1465c613 100644 --- a/include/hw/arm/allwinner-a10.h +++ b/include/hw/arm/allwinner-a10.h @@ -13,6 +13,7 @@ #include "hw/misc/allwinner-a10-ccm.h" #include "hw/misc/allwinner-a10-dramc.h" #include "hw/i2c/allwinner-i2c.h" +#include "hw/watchdog/allwinner-wdt.h" #include "sysemu/block-backend.h" =20 #include "target/arm/cpu.h" @@ -41,6 +42,7 @@ struct AwA10State { AwSdHostState mmc0; AWI2CState i2c0; AwRtcState rtc; + AwWdtState wdt; MemoryRegion sram_a; EHCISysBusState ehci[AW_A10_NUM_USB]; OHCISysBusState ohci[AW_A10_NUM_USB]; --=20 2.30.2 From nobody Tue Apr 30 06:07:46 2024 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=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1679862233; cv=none; d=zohomail.com; s=zohoarc; b=WErnV3BaV3ZCpwL4mpLqffoLpEoxld2XKOuD/9hlJXXCahHKvJcJJ901G8Il3H8lxOvwNSbc9uUFGACK+iDlRkiFoO6YRq+67P6qgs+XUtlN21BZOHCj6D3anShHyCdSojoK0cCQD6Iz18XOg6NB1B8DQciN01pHXFpxI8u3St4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679862233; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=J+9drRYcPap8x0rvwcbFK9iA3EPw67rquBQoOyVcYNs=; b=BOcl+bZN/u0jaQ/gKuBL81qAqTqPFqWy/P2qzO7d81uHK2l+wAtd4Tqm8jHBXUC7QwSWuSmobLXRgrdg61we30D4GH6cHSMqnBwPMLZGCzBOIUdOfwkRYJKAlMsOFtzGVO+rAn1flyFUZ9yAl9UBhSaprFWCKao26KYsIyNOuZk= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1679862233686551.5194737595766; Sun, 26 Mar 2023 13:23:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pgWtf-0001qy-5k; Sun, 26 Mar 2023 16:23:23 -0400 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 ) id 1pgWtc-0001pb-Py; Sun, 26 Mar 2023 16:23:20 -0400 Received: from mail-lf1-x129.google.com ([2a00:1450:4864:20::129]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pgWtb-0003pk-4i; Sun, 26 Mar 2023 16:23:20 -0400 Received: by mail-lf1-x129.google.com with SMTP id br6so8673596lfb.11; Sun, 26 Mar 2023 13:23:18 -0700 (PDT) Received: from penguin.lxd (213-67-202-254-no43.tbcn.telia.com. [213.67.202.254]) by smtp.googlemail.com with ESMTPSA id u3-20020a2e9f03000000b002a2b9d9429esm1427773ljk.117.2023.03.26.13.23.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Mar 2023 13:23:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679862197; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=J+9drRYcPap8x0rvwcbFK9iA3EPw67rquBQoOyVcYNs=; b=d89m837MjZMyo0BMzlsajrm+d3D6DtUlGOVF3P8PDsbvHGeFcM8jbo/UY5bfDPwL9B YDts53cniUujGZJ8tjncpNWjeIY2wNJN4BohNb2ekCPfPg1qy5yieDSGXZI/66GA3f/s 2iH92VcE3ILuaA/AruhxuB9an0uAGKKTkH6bJI2KVzlHgB4jkwYvll19YTdCzOyI0IIt GQ4AtVK6luL1H4yr1mihB4QJF/GMPVdrG3m1vvaRdE2mt6EC9GHaugwNDo3V4XcWKMvg 1/eaoLTtLXcly1eQxkRwSBX77//EMvQZrq3oD0+CD45Jx3aEGv1pp0kDYsim5BNvubXh kFCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679862197; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=J+9drRYcPap8x0rvwcbFK9iA3EPw67rquBQoOyVcYNs=; b=7Wvc3qvaAGoYXGCCmoOt43n9zWrUkwXs/MZL290L0vdsUM+n+/vjZb9bPPr4wRm3tu AsnbmDbSI1cLSXYbgA2QEG3wJQC2sL5+zx3gN4zNOZ6ohJOzRaQTfi7JL2PUFvHORjTH htrnzRnhwOc9N30HXgdlCUwJ6NWg++oL+ywYbeMZuLllVxDjyu1C/dlUZZKm3Uw3RYRW /iadmf3fQDjXoGQI+9jp8EyvhaatevWFlMmKCnA1hD9iQC6ymzr8KoovZYmRNoT8W+/+ B931xrlwXXKBxXnva4AeWgjsfP+wDORegS7ApHdD3vEuQCCKsJTG3tUmaemGPRaea51n uIBQ== X-Gm-Message-State: AAQBX9dn1UpqYGCVaVQqrPZyc5BS7/RuJi+TRw78d6VbaGDr1RDm8KMQ XC3Gwnea9IForZZJjCcgrUU= X-Google-Smtp-Source: AKy350YP7GYxUgrGaFZT/8NgmBdXDycZ94h6eHQGhCxhHoyqjmawbOOEfG+wO6c2vo2gKk+ZEL6X1g== X-Received: by 2002:ac2:55b8:0:b0:4e0:6e01:7ebf with SMTP id y24-20020ac255b8000000b004e06e017ebfmr2967784lfg.52.1679862197102; Sun, 26 Mar 2023 13:23:17 -0700 (PDT) From: Strahinja Jankovic X-Google-Original-From: Strahinja Jankovic To: Peter Maydell Cc: Beniamino Galvani , Niek Linnenbank , qemu-arm@nongnu.org, qemu-devel@nongnu.org, Strahinja Jankovic Subject: [PATCH v3 3/4] hw/arm: Add WDT to Allwinner-H3 and Orangepi-PC Date: Sun, 26 Mar 2023 22:22:55 +0200 Message-Id: <20230326202256.22980-4-strahinja.p.jankovic@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230326202256.22980-1-strahinja.p.jankovic@gmail.com> References: <20230326202256.22980-1-strahinja.p.jankovic@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::129; envelope-from=strahinjapjankovic@gmail.com; helo=mail-lf1-x129.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, WEIRD_QUOTING=0.001 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 @gmail.com) X-ZM-MESSAGEID: 1679862234886100001 Content-Type: text/plain; charset="utf-8" This patch adds WDT to Allwinner-H3 and Orangepi-PC. WDT is added as an overlay to the Timer module memory area. Signed-off-by: Strahinja Jankovic Reviewed-by: Niek Linnenbank --- docs/system/arm/orangepi.rst | 1 + hw/arm/Kconfig | 1 + hw/arm/allwinner-h3.c | 8 ++++++++ include/hw/arm/allwinner-h3.h | 5 ++++- 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/docs/system/arm/orangepi.rst b/docs/system/arm/orangepi.rst index e5973600a1..9afa54213b 100644 --- a/docs/system/arm/orangepi.rst +++ b/docs/system/arm/orangepi.rst @@ -26,6 +26,7 @@ The Orange Pi PC machine supports the following devices: * System Control module * Security Identifier device * TWI (I2C) + * Watchdog timer =20 Limitations """"""""""" diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index ec15248536..7d916f5450 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -337,6 +337,7 @@ config ALLWINNER_H3 select ALLWINNER_A10_PIT select ALLWINNER_SUN8I_EMAC select ALLWINNER_I2C + select ALLWINNER_WDT select SERIAL select ARM_TIMER select ARM_GIC diff --git a/hw/arm/allwinner-h3.c b/hw/arm/allwinner-h3.c index 69d0ad6f50..f05afddf7e 100644 --- a/hw/arm/allwinner-h3.c +++ b/hw/arm/allwinner-h3.c @@ -49,6 +49,7 @@ const hwaddr allwinner_h3_memmap[] =3D { [AW_H3_DEV_OHCI3] =3D 0x01c1d400, [AW_H3_DEV_CCU] =3D 0x01c20000, [AW_H3_DEV_PIT] =3D 0x01c20c00, + [AW_H3_DEV_WDT] =3D 0x01c20ca0, [AW_H3_DEV_UART0] =3D 0x01c28000, [AW_H3_DEV_UART1] =3D 0x01c28400, [AW_H3_DEV_UART2] =3D 0x01c28800, @@ -234,6 +235,8 @@ static void allwinner_h3_init(Object *obj) object_initialize_child(obj, "twi1", &s->i2c1, TYPE_AW_I2C_SUN6I); object_initialize_child(obj, "twi2", &s->i2c2, TYPE_AW_I2C_SUN6I); object_initialize_child(obj, "r_twi", &s->r_twi, TYPE_AW_I2C_SUN6I); + + object_initialize_child(obj, "wdt", &s->wdt, TYPE_AW_WDT_SUN6I); } =20 static void allwinner_h3_realize(DeviceState *dev, Error **errp) @@ -453,6 +456,11 @@ static void allwinner_h3_realize(DeviceState *dev, Err= or **errp) sysbus_connect_irq(SYS_BUS_DEVICE(&s->r_twi), 0, qdev_get_gpio_in(DEVICE(&s->gic), AW_H3_GIC_SPI_R_T= WI)); =20 + /* WDT */ + sysbus_realize(SYS_BUS_DEVICE(&s->wdt), &error_fatal); + sysbus_mmio_map_overlap(SYS_BUS_DEVICE(&s->wdt), 0, + s->memmap[AW_H3_DEV_WDT], 1); + /* Unimplemented devices */ for (i =3D 0; i < ARRAY_SIZE(unimplemented); i++) { create_unimplemented_device(unimplemented[i].device_name, diff --git a/include/hw/arm/allwinner-h3.h b/include/hw/arm/allwinner-h3.h index 59e0f822d2..f15d6d7cc7 100644 --- a/include/hw/arm/allwinner-h3.h +++ b/include/hw/arm/allwinner-h3.h @@ -48,6 +48,7 @@ #include "hw/net/allwinner-sun8i-emac.h" #include "hw/rtc/allwinner-rtc.h" #include "hw/i2c/allwinner-i2c.h" +#include "hw/watchdog/allwinner-wdt.h" #include "target/arm/cpu.h" #include "sysemu/block-backend.h" =20 @@ -96,7 +97,8 @@ enum { AW_H3_DEV_RTC, AW_H3_DEV_CPUCFG, AW_H3_DEV_R_TWI, - AW_H3_DEV_SDRAM + AW_H3_DEV_SDRAM, + AW_H3_DEV_WDT }; =20 /** Total number of CPU cores in the H3 SoC */ @@ -141,6 +143,7 @@ struct AwH3State { AWI2CState r_twi; AwSun8iEmacState emac; AwRtcState rtc; + AwWdtState wdt; GICState gic; MemoryRegion sram_a1; MemoryRegion sram_a2; --=20 2.30.2 From nobody Tue Apr 30 06:07:46 2024 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=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1679862268; cv=none; d=zohomail.com; s=zohoarc; b=QpdiqezjUS01C3LKtHBrgLbejBo1tcyX3BmQv0FqKq94oF/xIn0kNDyYJ8uiIfhx0U8hXYEDf1mZiqPVMCfPxMUcU59SesA6pcTjkYy42xG2fa9DAc1mR1ppMj+YwTM1sOdW8PjKMY1+52V+DA/FYqjintoa/HZ5fbww7AahxPs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679862268; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xfZjNMjzWHrnALAVPW0l5NgU6D15/Iv55fFst8PORK8=; b=hIttuQUTMR5C3P5Of2qBcegm5bY0DGknnhvLYwY3j2P9F+AU7bCkpdOq3zDzwWAdIodG24XxJSD6HNzTnRsCCrwiAz3cj4DdjzHbSoIn62zA3fpT5yq4QI4g4GFBxnJKim/RRCWXbpkOp//qGDTp2S+DPzbvLjnkmRkoSnpc4wk= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1679862268462546.7355566700612; Sun, 26 Mar 2023 13:24:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pgWtf-0001rH-ME; Sun, 26 Mar 2023 16:23:23 -0400 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 ) id 1pgWte-0001py-4J; Sun, 26 Mar 2023 16:23:22 -0400 Received: from mail-lj1-x22c.google.com ([2a00:1450:4864:20::22c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pgWtc-0003qZ-Jq; Sun, 26 Mar 2023 16:23:21 -0400 Received: by mail-lj1-x22c.google.com with SMTP id f16so6869932ljq.10; Sun, 26 Mar 2023 13:23:19 -0700 (PDT) Received: from penguin.lxd (213-67-202-254-no43.tbcn.telia.com. [213.67.202.254]) by smtp.googlemail.com with ESMTPSA id u3-20020a2e9f03000000b002a2b9d9429esm1427773ljk.117.2023.03.26.13.23.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Mar 2023 13:23:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679862198; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xfZjNMjzWHrnALAVPW0l5NgU6D15/Iv55fFst8PORK8=; b=c1RmMlHjJlHQafM3+qpaL5eyFu9qmYA6jYw5N7b/H1up3ykW8aUEKHyCdxKKJDDbjD xv//HO3XD6t+6mAFkV4I1sWyBsa1yQgVFBSCvxmpORS37zqf5IOlKde6VSEuuWr/dxvl mhZr0QZxlrLYOj6JLAnvQGTOYDfoSh4xC5opOV/J9O4wikQ4XxSiuxrrCy5iLXImr06R wrvQ1vx6egb8xlVGBSK3DPO7wd6RZi3SxmIqsrhdRJcLnAQmO/sCxzvM4ffKHCdPhaO7 eAQtt6FcOsWuD3vwc4Bf2lZpHyHf8IGQbpV0jpA/+qSjrTL8HLcOjo/+/Xgon/SiXqyf OIgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679862198; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xfZjNMjzWHrnALAVPW0l5NgU6D15/Iv55fFst8PORK8=; b=nwEJrXwvkOnOdS9k5DE2RHNXoo0SI5heoA4p9YHVqjAxgzbMr/XGxRDXdZxQFdRFQL bWw62WUkaTjniIe0AA0S/blAsmz0KptR+9jepYiM9sONc8UfrGKryvydV7XukG+CagVU tnAci+8AFpx9ZD3Upsfp6w8J8VOkcbg5bWdJealEO58i+4Pl1x881a2cOb06nWpLfADL 1LGC6y3B/AtUgvigEZJcQ+5pFknijOehJAkUx1aitnMKpPc7v7VckR6XqehP7EqIA/69 CCdpnCsRiqVKouRFByQu/oZz1igUSqh7R/wUsySFSTmYo5f4Z1uPhcNftwPt8YNomL/I /D8w== X-Gm-Message-State: AAQBX9cXqKEri/myyx3+NBDL4jt9S81ZV/mtVfYl2VipPA5Jgar5yhNP KsfpYqj6HK+ajiGK1kmEx+c= X-Google-Smtp-Source: AKy350ZmoZZgKjWyV+OeWzeQBmZC2FbUbH6CgBGubbFVsMhgQNaaYkY9HRTq4p8hIm/FWI5aMKNLEg== X-Received: by 2002:a2e:7a08:0:b0:299:ac26:f781 with SMTP id v8-20020a2e7a08000000b00299ac26f781mr3036650ljc.18.1679862198650; Sun, 26 Mar 2023 13:23:18 -0700 (PDT) From: Strahinja Jankovic X-Google-Original-From: Strahinja Jankovic To: Peter Maydell Cc: Beniamino Galvani , Niek Linnenbank , qemu-arm@nongnu.org, qemu-devel@nongnu.org, Strahinja Jankovic Subject: [PATCH v3 4/4] tests/avocado: Add reboot tests to Cubieboard Date: Sun, 26 Mar 2023 22:22:56 +0200 Message-Id: <20230326202256.22980-5-strahinja.p.jankovic@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230326202256.22980-1-strahinja.p.jankovic@gmail.com> References: <20230326202256.22980-1-strahinja.p.jankovic@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::22c; envelope-from=strahinjapjankovic@gmail.com; helo=mail-lj1-x22c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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 @gmail.com) X-ZM-MESSAGEID: 1679862270595100001 Content-Type: text/plain; charset="utf-8" Cubieboard tests end with comment "reboot not functioning; omit test". Fix this so reboot is done at the end of each test. Signed-off-by: Strahinja Jankovic Reviewed-by: Niek Linnenbank Tested-by: Niek Linnenbank --- tests/avocado/boot_linux_console.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/tests/avocado/boot_linux_console.py b/tests/avocado/boot_linux= _console.py index 574609bf43..c0675809e6 100644 --- a/tests/avocado/boot_linux_console.py +++ b/tests/avocado/boot_linux_console.py @@ -581,7 +581,10 @@ def test_arm_cubieboard_initrd(self): 'Allwinner sun4i/sun5i') exec_command_and_wait_for_pattern(self, 'cat /proc/iomem', 'system-control@1c00000') - # cubieboard's reboot is not functioning; omit reboot test. + exec_command_and_wait_for_pattern(self, 'reboot', + 'reboot: Restarting system= ') + # Wait for VM to shut down gracefully + self.vm.wait() =20 def test_arm_cubieboard_sata(self): """ @@ -625,7 +628,10 @@ def test_arm_cubieboard_sata(self): 'Allwinner sun4i/sun5i') exec_command_and_wait_for_pattern(self, 'cat /proc/partitions', 'sda') - # cubieboard's reboot is not functioning; omit reboot test. + exec_command_and_wait_for_pattern(self, 'reboot', + 'reboot: Restarting system= ') + # Wait for VM to shut down gracefully + self.vm.wait() =20 @skipUnless(os.getenv('AVOCADO_ALLOW_LARGE_STORAGE'), 'storage limited= ') def test_arm_cubieboard_openwrt_22_03_2(self): @@ -672,7 +678,10 @@ def test_arm_cubieboard_openwrt_22_03_2(self): =20 exec_command_and_wait_for_pattern(self, 'cat /proc/cpuinfo', 'Allwinner sun4i/sun5i') - # cubieboard's reboot is not functioning; omit reboot test. + exec_command_and_wait_for_pattern(self, 'reboot', + 'reboot: Restarting system= ') + # Wait for VM to shut down gracefully + self.vm.wait() =20 @skipUnless(os.getenv('AVOCADO_TIMEOUT_EXPECTED'), 'Test might timeout= ') def test_arm_quanta_gsj(self): --=20 2.30.2