All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: qemu-arm@nongnu.org
Cc: "Andrey Smirnov" <andrew.smirnov@gmail.com>,
	"Peter Maydell" <peter.maydell@linaro.org>,
	"Jason Wang" <jasowang@redhat.com>,
	"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
	qemu-devel@nongnu.org, yurovsky@gmail.com
Subject: [Qemu-devel] [PATCH v3 14/30] i.MX: Add code to emulate i.MX2 watchdog IP block
Date: Mon,  6 Nov 2017 07:47:57 -0800	[thread overview]
Message-ID: <20171106154813.19936-15-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20171106154813.19936-1-andrew.smirnov@gmail.com>

Add enough code to emulate i.MX2 watchdog IP block so it would be
possible to reboot the machine running Linux Guest.

Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Jason Wang <jasowang@redhat.com>
Cc: Philippe Mathieu-Daudé <f4bug@amsat.org>
Cc: qemu-devel@nongnu.org
Cc: qemu-arm@nongnu.org
Cc: yurovsky@gmail.com
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
 hw/misc/Makefile.objs      |  1 +
 hw/misc/imx2_wdt.c         | 88 ++++++++++++++++++++++++++++++++++++++++++++++
 include/hw/misc/imx2_wdt.h | 34 ++++++++++++++++++
 3 files changed, 123 insertions(+)
 create mode 100644 hw/misc/imx2_wdt.c
 create mode 100644 include/hw/misc/imx2_wdt.h

diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs
index ac1be05a03..c393a93456 100644
--- a/hw/misc/Makefile.objs
+++ b/hw/misc/Makefile.objs
@@ -35,6 +35,7 @@ obj-$(CONFIG_IMX) += imx25_ccm.o
 obj-$(CONFIG_IMX) += imx6_ccm.o
 obj-$(CONFIG_IMX) += imx6_src.o
 obj-$(CONFIG_IMX) += imx7_ccm.o
+obj-$(CONFIG_IMX) += imx2_wdt.o
 obj-$(CONFIG_MILKYMIST) += milkymist-hpdmc.o
 obj-$(CONFIG_MILKYMIST) += milkymist-pfpu.o
 obj-$(CONFIG_MAINSTONE) += mst_fpga.o
diff --git a/hw/misc/imx2_wdt.c b/hw/misc/imx2_wdt.c
new file mode 100644
index 0000000000..3a1c33aa51
--- /dev/null
+++ b/hw/misc/imx2_wdt.c
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2017, Impinj, Inc.
+ *
+ * i.MX2 Watchdog IP block
+ *
+ * Author: Andrey Smirnov <andrew.smirnov@gmail.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
+#include "qemu/osdep.h"
+#include "sysemu/watchdog.h"
+
+#include "hw/misc/imx2_wdt.h"
+
+#define IMX2_WDT_WCR_WDA    BIT(5)      /* -> External Reset WDOG_B */
+#define IMX2_WDT_WCR_SRS    BIT(4)      /* -> Software Reset Signal */
+
+static uint64_t imx2_wdt_read(void *opaque, hwaddr addr,
+                              unsigned int size)
+{
+    return 0;
+}
+
+static void imx2_wdt_write(void *opaque, hwaddr addr,
+                           uint64_t value, unsigned int size)
+{
+    if (addr == IMX2_WDT_WCR &&
+        (value & (IMX2_WDT_WCR_WDA | IMX2_WDT_WCR_SRS))) {
+        watchdog_perform_action();
+    }
+}
+
+static const MemoryRegionOps imx2_wdt_ops = {
+    .read  = imx2_wdt_read,
+    .write = imx2_wdt_write,
+    .endianness = DEVICE_NATIVE_ENDIAN,
+    .impl = {
+        /*
+         * Our device would not work correctly if the guest was doing
+         * unaligned access. This might not be a limitation on the
+         * real device but in practice there is no reason for a guest
+         * to access this device unaligned.
+         */
+        .min_access_size = 4,
+        .max_access_size = 4,
+        .unaligned = false,
+    },
+};
+
+static void imx2_wdt_realize(DeviceState *dev, Error **errp)
+{
+    IMX2WdtState *s = IMX2_WDT(dev);
+
+    memory_region_init_io(&s->mmio, OBJECT(dev),
+                          &imx2_wdt_ops, s,
+                          TYPE_IMX2_WDT".mmio",
+                          IMX2_WDT_REG_NUM * sizeof(uint16_t));
+    sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->mmio);
+}
+
+static void imx2_wdt_class_init(ObjectClass *klass, void *data)
+{
+    DeviceClass *dc = DEVICE_CLASS(klass);
+
+    dc->realize = imx2_wdt_realize;
+    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
+}
+
+static const TypeInfo imx2_wdt_info = {
+    .name          = TYPE_IMX2_WDT,
+    .parent        = TYPE_SYS_BUS_DEVICE,
+    .instance_size = sizeof(IMX2WdtState),
+    .class_init    = imx2_wdt_class_init,
+};
+
+static WatchdogTimerModel model = {
+    .wdt_name = "imx2-watchdog",
+    .wdt_description = "i.MX2 Watchdog",
+};
+
+static void imx2_wdt_register_type(void)
+{
+    watchdog_add_model(&model);
+    type_register_static(&imx2_wdt_info);
+}
+type_init(imx2_wdt_register_type)
diff --git a/include/hw/misc/imx2_wdt.h b/include/hw/misc/imx2_wdt.h
new file mode 100644
index 0000000000..e67ac6939d
--- /dev/null
+++ b/include/hw/misc/imx2_wdt.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2017, Impinj, Inc.
+ *
+ * i.MX2 Watchdog IP block
+ *
+ * Author: Andrey Smirnov <andrew.smirnov@gmail.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
+#ifndef IMX2_WDT_H
+#define IMX2_WDT_H
+
+#include "qemu/bitops.h"
+#include "hw/sysbus.h"
+
+#define TYPE_IMX2_WDT "imx2.wdt"
+#define IMX2_WDT(obj) OBJECT_CHECK(IMX2WdtState, (obj), TYPE_IMX2_WDT)
+
+enum IMX2WdtRegisters {
+    IMX2_WDT_WCR     = 0x0000,
+    IMX2_WDT_REG_NUM = 0x0008 / sizeof(uint16_t) + 1,
+};
+
+
+typedef struct IMX2WdtState {
+    /* <private> */
+    SysBusDevice parent_obj;
+
+    MemoryRegion mmio;
+} IMX2WdtState;
+
+#endif /* IMX7_SNVS_H */
-- 
2.13.6

  parent reply	other threads:[~2017-11-06 15:48 UTC|newest]

Thread overview: 58+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-06 15:47 [Qemu-devel] [PATCH v3 00/30] Initial i.MX7 support Andrey Smirnov
2017-11-06 15:47 ` [Qemu-devel] [PATCH v3 01/30] imx_fec: Do not link to netdev Andrey Smirnov
2017-11-06 15:47 ` [Qemu-devel] [PATCH v3 02/30] imx_fec: Refactor imx_eth_enable_rx() Andrey Smirnov
2017-11-06 15:47 ` [Qemu-devel] [PATCH v3 03/30] imx_fec: Change queue flushing heuristics Andrey Smirnov
2017-11-21 17:27   ` Peter Maydell
2017-11-22 20:22     ` Andrey Smirnov
2017-11-06 15:47 ` [Qemu-devel] [PATCH v3 04/30] imx_fec: Use ENET_FTRL to determine truncation length Andrey Smirnov
2017-11-21 17:31   ` Peter Maydell
2017-11-22 20:22     ` Andrey Smirnov
2017-11-23  9:50       ` Peter Maydell
2017-11-06 15:47 ` [Qemu-devel] [PATCH v3 05/30] imx_fec: Use MIN instead of explicit ternary operator Andrey Smirnov
2017-11-06 15:47 ` [Qemu-devel] [PATCH v3 06/30] imx_fec: Emulate SHIFT16 in ENETx_RACC Andrey Smirnov
2017-11-06 15:47 ` [Qemu-devel] [PATCH v3 07/30] imx_fec: Add support for multiple Tx DMA rings Andrey Smirnov
2017-11-21 17:44   ` Peter Maydell
2017-11-22 20:25     ` Andrey Smirnov
2017-11-06 15:47 ` [Qemu-devel] [PATCH v3 08/30] imx_fec: Use correct length for packet size Andrey Smirnov
2017-11-06 15:47 ` [Qemu-devel] [PATCH v3 09/30] imx_fec: Fix a typo in imx_enet_receive() Andrey Smirnov
2017-11-21 17:44   ` Peter Maydell
2017-11-06 15:47 ` [Qemu-devel] [PATCH v3 10/30] imx_fec: Reserve full 4K page for the register file Andrey Smirnov
2017-11-21 17:48   ` Peter Maydell
2017-11-22 20:34     ` Andrey Smirnov
2017-11-06 15:47 ` [Qemu-devel] [PATCH v3 11/30] sdhci: Add i.MX specific subtype of SDHCI Andrey Smirnov
2017-11-21 18:02   ` Peter Maydell
2017-11-22 20:43     ` Andrey Smirnov
2017-11-23  9:52       ` Peter Maydell
2017-11-06 15:47 ` [Qemu-devel] [PATCH v3 12/30] sdhci: Implement write method of ACMD12ERRSTS register Andrey Smirnov
2017-11-21 18:04   ` Peter Maydell
2017-11-22 20:50     ` Andrey Smirnov
2017-11-06 15:47 ` [Qemu-devel] [PATCH v3 13/30] i.MX: Add code to emulate i.MX7 CCM, PMU and ANALOG IP blocks Andrey Smirnov
2017-11-21 18:08   ` Peter Maydell
2017-11-22 21:06     ` Andrey Smirnov
2017-11-06 15:47 ` Andrey Smirnov [this message]
2017-11-21 18:10   ` [Qemu-devel] [PATCH v3 14/30] i.MX: Add code to emulate i.MX2 watchdog IP block Peter Maydell
2017-11-22 21:07     ` Andrey Smirnov
2017-11-06 15:47 ` [Qemu-devel] [PATCH v3 15/30] i.MX: Add code to emulate i.MX7 SNVS IP-block Andrey Smirnov
2017-11-21 18:15   ` Peter Maydell
2017-11-06 15:47 ` [Qemu-devel] [PATCH v3 16/30] i.MX: Add code to emulate GPCv2 IP block Andrey Smirnov
2017-11-21 18:18   ` Peter Maydell
2017-11-06 15:48 ` [Qemu-devel] [PATCH v3 17/30] i.MX: Add code to emulate i.MX7 IOMUXC " Andrey Smirnov
2017-11-06 15:48 ` [Qemu-devel] [PATCH v3 19/30] i.MX: Add code to emulate SDMA " Andrey Smirnov
2017-11-21 18:20   ` Peter Maydell
2017-11-22 21:08     ` Andrey Smirnov
2017-11-06 15:48 ` [Qemu-devel] [PATCH v3 20/30] i.MX: Add code to emulate FlexCAN " Andrey Smirnov
2017-11-06 15:48 ` [Qemu-devel] [PATCH v3 21/30] i.MX: Add implementation of i.MX7 GPR " Andrey Smirnov
2017-11-06 15:48 ` [Qemu-devel] [PATCH v3 22/30] pci: Add support for Designware " Andrey Smirnov
2017-11-06 15:48 ` [Qemu-devel] [PATCH v3 23/30] i.MX: Add code to emulate i.MX7 USBMISC " Andrey Smirnov
2017-11-06 15:48 ` [Qemu-devel] [PATCH v3 24/30] i.MX: Add code to emulate i.MX7 ADC " Andrey Smirnov
2017-11-06 15:48 ` [Qemu-devel] [PATCH v3 25/30] i.MX: Add code to emulate i.MX7 SRC IP-block Andrey Smirnov
2017-11-06 15:48 ` [Qemu-devel] [PATCH v3 26/30] usb: Add basic code to emulate Chipidea USB IP Andrey Smirnov
2017-11-06 15:48 ` [Qemu-devel] [PATCH v3 27/30] ARM: Add basic code to emulate A7MPCore DAP block Andrey Smirnov
2017-11-06 15:48 ` [Qemu-devel] [PATCH v3 28/30] i.MX: Add code to emulate i.MX LCD block Andrey Smirnov
2017-11-06 15:48 ` [Qemu-devel] [PATCH v3 29/30] i.MX: Add i.MX7 SOC implementation Andrey Smirnov
2017-11-22 15:34   ` Igor Mammedov
2017-11-22 21:08     ` Andrey Smirnov
     [not found] ` <20171106154813.19936-31-andrew.smirnov@gmail.com>
2017-11-21 18:22   ` [Qemu-devel] [PATCH v3 30/30] Implement support for i.MX7 Sabre board Peter Maydell
2017-11-22 19:24     ` Andrey Smirnov
2017-11-21 18:34 ` [Qemu-devel] [PATCH v3 00/30] Initial i.MX7 support Peter Maydell
2017-11-22 20:19   ` Andrey Smirnov

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=20171106154813.19936-15-andrew.smirnov@gmail.com \
    --to=andrew.smirnov@gmail.com \
    --cc=f4bug@amsat.org \
    --cc=jasowang@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=yurovsky@gmail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.