From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8FAB5C6FD18 for ; Tue, 18 Apr 2023 17:37:29 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1popGC-0002eP-Tc; Tue, 18 Apr 2023 13:36:56 -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 1popGA-0002cV-4G for qemu-devel@nongnu.org; Tue, 18 Apr 2023 13:36:54 -0400 Received: from mail-ej1-f47.google.com ([209.85.218.47]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1popG8-0007HO-As for qemu-devel@nongnu.org; Tue, 18 Apr 2023 13:36:53 -0400 Received: by mail-ej1-f47.google.com with SMTP id u3so23250237ejj.12 for ; Tue, 18 Apr 2023 10:36:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681839411; x=1684431411; 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=JpAMgmt2TgpqVrboahAY5/F1nVHhsfZscl13tr9kfxg=; b=VvkxopEUqGj5arlWa4uRMCpC/KnqwJcm5l028IbrJV6zsrrgj4ZJGyrXvcrWwT5wg4 ZF0ixQ2XKBIdreakY/DovWn8IwXZvyvHiLsVAAifjH6HWY82aqzUKxJc/JeS21wuMY08 tjQfwJQJkVJS7rx8fx3Yb69buJwBYDi5hq0lq11Amup9ZM4Pzex5yOSV3md6KOs4VtWr U26lI6XdwdEqUcX58RnUcPeLvPP5DZQTBnqbYKqP1SauiWRpPd/IUPw+xxs8fBerH2ol anKkc+HLBO17jt0RlZK9WdzNcgpCplB1wNByREcBvog0t3RdMAcV0KXhRZqxjXhLP4I3 7oaA== X-Gm-Message-State: AAQBX9fFARcK5CuROvSbBlL5iO+PO3H3bbD0zvxCAwuL+DFOkhQuAsWj Zy9SPh4I3hznjIuFZd60CBqJb2C4JMjc8hwq X-Google-Smtp-Source: AKy350Ze6gTJbihLuToqTn/P4+7NDMTb96Bi3KHaHVYUp19v198OpWLZYIRf0ScIf8YzqL4fSLLC3A== X-Received: by 2002:a17:906:4b1a:b0:94f:3f22:2d37 with SMTP id y26-20020a1709064b1a00b0094f3f222d37mr9335269eju.55.1681839410782; Tue, 18 Apr 2023 10:36:50 -0700 (PDT) Received: from localhost.localdomain (aftr-62-216-205-204.dynamic.mnet-online.de. [62.216.205.204]) by smtp.googlemail.com with ESMTPSA id j23-20020a1709066c1700b0095342bfb701sm73738ejr.16.2023.04.18.10.36.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Apr 2023 10:36:50 -0700 (PDT) From: Johannes Thumshirn To: qemu-devel@nongnu.org Cc: Alistair Francis , Javier Rodriguez , =?UTF-8?q?Jorge=20Sanjuan=20Garc=C3=ADa?= , Peter Maydell , Dmitry Fomichev , Johannes Thumshirn Subject: [PATCH v4 4/4] wdt_z069: Add support for MEN 16z069 Watchdog Date: Tue, 18 Apr 2023 19:35:56 +0200 Message-Id: <20230418173556.177985-5-jth@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230418173556.177985-1-jth@kernel.org> References: <20230418173556.177985-1-jth@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=209.85.218.47; envelope-from=morbidrsa@gmail.com; helo=mail-ej1-f47.google.com X-Spam_score_int: -13 X-Spam_score: -1.4 X-Spam_bar: - X-Spam_report: (-1.4 / 5.0 requ) BAYES_00=-1.9, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Add 16z069 Watchdog over MEN Chameleon BUS emulation. Signed-off-by: Johannes Thumshirn --- hw/watchdog/Kconfig | 5 + hw/watchdog/meson.build | 1 + hw/watchdog/trace-events | 6 ++ hw/watchdog/wdt_z069.c | 207 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 219 insertions(+) create mode 100644 hw/watchdog/wdt_z069.c diff --git a/hw/watchdog/Kconfig b/hw/watchdog/Kconfig index 66e1d029e3..a3f1196f66 100644 --- a/hw/watchdog/Kconfig +++ b/hw/watchdog/Kconfig @@ -20,3 +20,8 @@ config WDT_IMX2 config WDT_SBSA bool + +config WDT_Z069 + bool + default y if MCB + depends on MCB diff --git a/hw/watchdog/meson.build b/hw/watchdog/meson.build index 8974b5cf4c..7bc353774e 100644 --- a/hw/watchdog/meson.build +++ b/hw/watchdog/meson.build @@ -6,4 +6,5 @@ softmmu_ss.add(when: 'CONFIG_WDT_DIAG288', if_true: files('wdt_diag288.c')) softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('wdt_aspeed.c')) softmmu_ss.add(when: 'CONFIG_WDT_IMX2', if_true: files('wdt_imx2.c')) softmmu_ss.add(when: 'CONFIG_WDT_SBSA', if_true: files('sbsa_gwdt.c')) +softmmu_ss.add(when: 'CONFIG_WDT_Z069', if_true: files('wdt_z069.c')) specific_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr_watchdog.c')) diff --git a/hw/watchdog/trace-events b/hw/watchdog/trace-events index 54371ae075..854fa3f0c8 100644 --- a/hw/watchdog/trace-events +++ b/hw/watchdog/trace-events @@ -17,6 +17,12 @@ spapr_watchdog_query(uint64_t caps) "caps=0x%" PRIx64 spapr_watchdog_query_lpm(uint64_t caps) "caps=0x%" PRIx64 spapr_watchdog_expired(uint64_t num, unsigned action) "num=%" PRIu64 " action=%u" +# wdt_z069.c +men_z069_wdt_enable(unsigned int timeout) "next timeout will fire in +%dms" +men_z069_wdt_write_wtr(uint16_t tout, uint16_t t, unsigned int timeout) "new timeout: %u (0x%x) %u" +men_z069_wdt_write_wvr(uint16_t wvr, unsigned int timeout) "watchdog triggered (wvr=0x%x), next timeout will fire in +%dms" +men_z069_wdt_read(unsigned long addr, int size, uint64_t ret) "addr=0x%lx, size=%d, ret=0x%" PRIx64 + # watchdog.c watchdog_perform_action(unsigned int action) "action=%u" watchdog_set_action(unsigned int action) "action=%u" diff --git a/hw/watchdog/wdt_z069.c b/hw/watchdog/wdt_z069.c new file mode 100644 index 0000000000..eb58a44697 --- /dev/null +++ b/hw/watchdog/wdt_z069.c @@ -0,0 +1,207 @@ +/* + * QEMU MEN 16z069 Watchdog over MCB emulation + * + * Copyright (C) 2023 Johannes Thumshirn + * + * This code is licensed under the GPL version 2 or later. See the + * COPYING file in the top-level directory. + */ +#include "qemu/osdep.h" +#include "qemu/module.h" +#include "qemu/timer.h" +#include "sysemu/watchdog.h" +#include "hw/mcb/mcb.h" +#include "migration/vmstate.h" +#include "hw/qdev-properties.h" +#include "trace.h" + +#define MEN_Z069_WTR 0x10 +#define MEN_Z069_WTR_WDEN BIT(15) +#define MEN_Z069_WTR_WDET_MASK 0x7fff +#define MEN_Z069_WVR 0x14 + +#define CLK_500(x) ((x) * 2) /* 500Hz in ms */ + +typedef struct { + /*< private >*/ + MCBDevice dev; + + /*< public >*/ + QEMUTimer *timer; + + bool enabled; + unsigned int timeout; + + MemoryRegion mmio; + + /* Registers */ + uint16_t wtr; + uint16_t wvr; +} MENZ069State; + +static void men_z069_wdt_enable(MENZ069State *s) +{ + trace_men_z069_wdt_enable(s->timeout); + timer_mod(s->timer, qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + s->timeout); +} + +static void men_z069_wdt_disable(MENZ069State *s) +{ + timer_del(s->timer); +} + +static uint64_t men_z069_wdt_read(void *opaque, hwaddr addr, unsigned size) +{ + MENZ069State *s = opaque; + uint64_t ret; + + switch (addr) { + case MEN_Z069_WTR: + ret = s->wtr; + break; + case MEN_Z069_WVR: + ret = s->wvr; + break; + default: + ret = 0UL; + break; + } + + trace_men_z069_wdt_read(addr, size, ret); + return ret; +} + +static void men_z069_wdt_write(void *opaque, hwaddr addr, uint64_t v, + unsigned size) +{ + MENZ069State *s = opaque; + bool old_ena = s->enabled; + uint16_t val = v & 0xffff; + uint16_t tout; + + switch (addr) { + case MEN_Z069_WTR: + s->wtr = val; + tout = val & MEN_Z069_WTR_WDET_MASK; + s->timeout = CLK_500(tout); + s->enabled = val & MEN_Z069_WTR_WDEN; + trace_men_z069_wdt_write_wtr(tout, tout, s->timeout); + + if (old_ena && !s->enabled) { + men_z069_wdt_disable(s); + } else if (!old_ena && s->enabled) { + men_z069_wdt_enable(s); + } + + break; + case MEN_Z069_WVR: + /* The watchdog trigger value toggles between 0x5555 and 0xaaaa */ + if (val == (s->wvr ^ 0xffff)) { + s->wvr = val; + trace_men_z069_wdt_write_wvr(s->wvr, s->timeout); + timer_mod(s->timer, + qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + s->timeout); + } + break; + default: + break; + } + return; +} + +static const MemoryRegionOps men_z069_io_ops = { + .read = men_z069_wdt_read, + .write = men_z069_wdt_write, + .endianness = DEVICE_LITTLE_ENDIAN, + .valid = { + .min_access_size = 2, + .max_access_size = 2 + }, + .impl = { + .min_access_size = 2, + .max_access_size = 2 + }, +}; + +static void men_z069_timer_expired(void *opaque) +{ + MENZ069State *s = opaque; + + watchdog_perform_action(); + timer_del(s->timer); +} + +static void men_z069_wdt_realize(DeviceState *dev, Error **errp) +{ + MCBDevice *mdev = MCB_DEVICE(dev); + MENZ069State *s = DO_UPCAST(MENZ069State, dev, mdev); + MCBus *bus = MCB_BUS(qdev_get_parent_bus(DEVICE(dev))); + + mdev->gdd = mcb_new_chameleon_descriptor(bus, 69, mdev->rev, + mdev->var, 0x18); + if (!mdev->gdd) { + return; + } + + s->wvr = 0x5555; + s->wtr = 0x7fff; + s->timeout = CLK_500(s->wtr & MEN_Z069_WTR_WDET_MASK); + s->timer = timer_new_ms(QEMU_CLOCK_VIRTUAL, + men_z069_timer_expired, s); + + memory_region_init_io(&s->mmio, OBJECT(s), + &men_z069_io_ops, s, "z069.wdt", 0x16); + memory_region_add_subregion(&bus->mmio_region, mdev->gdd->offset, + &s->mmio); +} + +static void men_z069_wdt_unrealize(DeviceState *dev) +{ + MCBDevice *mdev = MCB_DEVICE(dev); + + g_free(&mdev->gdd); +} + +static const VMStateDescription vmstate_z069_wdt = { + .name = "z069-wdt", + .version_id = 1, + .minimum_version_id = 1, + .fields = (VMStateField[]) { + VMSTATE_MCB_DEVICE(dev, MENZ069State), + VMSTATE_TIMER_PTR(timer, MENZ069State), + VMSTATE_END_OF_LIST() + } +}; + +static Property men_z069_wdt_properties[] = { + DEFINE_PROP_UINT8("rev", MENZ069State, dev.rev, 0), + DEFINE_PROP_UINT8("var", MENZ069State, dev.var, 0), + DEFINE_PROP_END_OF_LIST(), +}; + +static void men_z069_wdt_class_intifn(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + MCBDeviceClass *mc = MCB_DEVICE_CLASS(klass); + + mc->realize = men_z069_wdt_realize; + mc->unrealize = men_z069_wdt_unrealize; + + dc->desc = "MEN 16z069 Watchdog Timer"; + dc->vmsd = &vmstate_z069_wdt; + device_class_set_props(dc, men_z069_wdt_properties); +} + +static const TypeInfo men_z069_wdt_info = { + .name = "z069-wdt", + .parent = TYPE_MCB_DEVICE, + .instance_size = sizeof(MENZ069State), + .class_init = men_z069_wdt_class_intifn, +}; + +static void men_z069_wdt_register_types(void) +{ + type_register_static(&men_z069_wdt_info); +} + +type_init(men_z069_wdt_register_types); -- 2.39.2