From nobody Wed Nov 5 09:26:54 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1533738775071819.5765735747133; Wed, 8 Aug 2018 07:32:55 -0700 (PDT) Received: from localhost ([::1]:44096 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnPW9-0007Qt-TU for importer@patchew.org; Wed, 08 Aug 2018 10:32:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38043) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnPIt-0003JK-Rj for qemu-devel@nongnu.org; Wed, 08 Aug 2018 10:19:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fnPIn-0001hM-HO for qemu-devel@nongnu.org; Wed, 08 Aug 2018 10:19:11 -0400 Received: from mx2.suse.de ([195.135.220.15]:56858 helo=mx1.suse.de) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fnPIn-0001en-5y for qemu-devel@nongnu.org; Wed, 08 Aug 2018 10:19:05 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id F0B23AE29 for ; Wed, 8 Aug 2018 14:19:02 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Johannes Thumshirn To: qemu-devel@nongnu.org Date: Wed, 8 Aug 2018 16:17:00 +0200 Message-Id: <20180808141700.21333-5-jthumshirn@suse.de> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20180808141700.21333-1-jthumshirn@suse.de> References: <20180808141700.21333-1-jthumshirn@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 195.135.220.15 X-Mailman-Approved-At: Wed, 08 Aug 2018 10:28:23 -0400 Subject: [Qemu-devel] [PATCH 4/4] wdt_z069: Add support for MEN 16z069 Watchdog X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Johannes Thumshirn Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add 16z069 Watchdog over MEN Chameleon BUS emulation. Signed-off-by: Johannes Thumshirn --- hw/watchdog/Makefile.objs | 1 + hw/watchdog/wdt_z069.c | 212 ++++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 213 insertions(+) create mode 100644 hw/watchdog/wdt_z069.c diff --git a/hw/watchdog/Makefile.objs b/hw/watchdog/Makefile.objs index 9589bed63a3d..ada010f1eb69 100644 --- a/hw/watchdog/Makefile.objs +++ b/hw/watchdog/Makefile.objs @@ -3,3 +3,4 @@ common-obj-$(CONFIG_WDT_IB6300ESB) +=3D wdt_i6300esb.o common-obj-$(CONFIG_WDT_IB700) +=3D wdt_ib700.o common-obj-$(CONFIG_WDT_DIAG288) +=3D wdt_diag288.o common-obj-$(CONFIG_ASPEED_SOC) +=3D wdt_aspeed.o +common-obj-$(CONFIG_MCB) +=3D wdt_z069.o diff --git a/hw/watchdog/wdt_z069.c b/hw/watchdog/wdt_z069.c new file mode 100644 index 000000000000..55e7614e83be --- /dev/null +++ b/hw/watchdog/wdt_z069.c @@ -0,0 +1,212 @@ +/* + * QEMU MEN 16z069 Watchdog over MCB emulation + * + * Copyright (C) 2018 Johannes Thumshirn + * + * This code is licensed under the GNU GPL v2 or (at your opinion) any + * later version + */ +#include "qemu/osdep.h" +#include "qemu/timer.h" +#include "sysemu/watchdog.h" +#include "hw/mcb/mcb.h" + +/* #define Z069_DEBUG 1 */ + +#ifdef Z069_DEBUG +#define z069_debug(fmt, ...) \ + fprintf(stderr, "wdt_z069: %s: "fmt, __func__, ##__VA_ARGS__) +#else +#define z069_debug(fmt, ...) +#endif + +#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 { + MCBDevice dev; + 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) +{ + z069_debug("next timeout will fire in +%dms\n", 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 =3D opaque; + uint64_t ret; + + switch (addr) { + case MEN_Z069_WTR: + ret =3D s->wtr; + break; + case MEN_Z069_WVR: + ret =3D s->wvr; + break; + default: + ret =3D 0UL; + break; + } + + z069_debug("returning: 0x%"PRIx64" @ 0x%lx\n", ret, addr); + return ret; +} + +static void men_z069_wdt_write(void *opaque, hwaddr addr, uint64_t v, + unsigned size) +{ + MENZ069State *s =3D opaque; + bool old_ena =3D s->enabled; + uint16_t val =3D v & 0xffff; + uint16_t tout; + + z069_debug("got: 0x%"PRIx64" @ 0x%lx\n", v, addr); + + switch (addr) { + case MEN_Z069_WTR: + s->wtr =3D val; + tout =3D val & MEN_Z069_WTR_WDET_MASK; + s->timeout =3D CLK_500(tout); + s->enabled =3D val & MEN_Z069_WTR_WDEN; + z069_debug("new timeout: %u (0x%x) %u\n", 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 =3D=3D (s->wvr ^ 0xffff)) { + s->wvr =3D val; + z069_debug("watchdog triggered, next timeout will fire in +%dm= s\n", + 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 =3D { + .read =3D men_z069_wdt_read, + .write =3D men_z069_wdt_write, + .endianness =3D DEVICE_LITTLE_ENDIAN, + .valid =3D { + .min_access_size =3D 4, + .max_access_size =3D 4 + }, + .impl =3D { + .min_access_size =3D 4, + .max_access_size =3D 4 + }, +}; + +static void men_z069_timer_expired(void *opaque) +{ + MENZ069State *s =3D opaque; + + watchdog_perform_action(); + timer_del(s->timer); +} + +static void men_z069_wdt_realize(DeviceState *dev, Error **errp) +{ + MCBDevice *mdev =3D MCB_DEVICE(dev); + MENZ069State *s =3D DO_UPCAST(MENZ069State, dev, mdev); + MCBus *bus =3D MCB_BUS(qdev_get_parent_bus(DEVICE(dev))); + + mdev->gdd =3D mcb_new_chameleon_descriptor(bus, 69, mdev->rev, + mdev->var, 0x18); + if (!mdev->gdd) { + return; + } + + s->wvr =3D 0x5555; + s->wtr =3D 0x7fff; + s->timeout =3D CLK_500(s->wtr & MEN_Z069_WTR_WDET_MASK); + s->timer =3D 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, Error **errp) +{ + MCBDevice *mdev =3D MCB_DEVICE(dev); + + g_free(&mdev->gdd); +} + +static const VMStateDescription vmstate_z069_wdt =3D { + .name =3D "z069-wdt", + .version_id =3D 1, + .minimum_version_id =3D 1, + .fields =3D (VMStateField[]) { + VMSTATE_MCB_DEVICE(dev, MENZ069State), + VMSTATE_TIMER_PTR(timer, MENZ069State), + VMSTATE_END_OF_LIST() + } +}; + +static Property men_z069_wdt_properties[] =3D { + 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 =3D DEVICE_CLASS(klass); + MCBDeviceClass *mc =3D MCB_DEVICE_CLASS(klass); + + mc->realize =3D men_z069_wdt_realize; + mc->unrealize =3D men_z069_wdt_unrealize; + + dc->desc =3D "MEN 16z069 Watchdog Timer"; + dc->vmsd =3D &vmstate_z069_wdt; + dc->props =3D men_z069_wdt_properties; +} + +static const TypeInfo men_z069_wdt_info =3D { + .name =3D "z069-wdt", + .parent =3D TYPE_MCB_DEVICE, + .instance_size =3D sizeof(MENZ069State), + .class_init =3D 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); --=20 2.16.4