From: Antony Pavlov <antonynpavlov@gmail.com>
To: Paolo Bonzini <pbonzini@redhat.com>,
Paul Brook <paul@codesourcery.com>,
Peter Crosthwaite <peter.crosthwaite@xilinx.com>,
Peter Maydell <peter.maydell@linaro.org>,
Alex Dumitrache <broscutamaker@gmail.com>,
g3gg0 <georg.hofstetter@lx-networking.de>,
Giovanni Condello <condellog@gmail.com>
Cc: qemu-devel@nongnu.org, Antony Pavlov <antonynpavlov@gmail.com>
Subject: [Qemu-devel] [RFC 3/5] hw/arm/digic: add timer support
Date: Thu, 29 Aug 2013 13:33:51 +0400 [thread overview]
Message-ID: <1377768833-11400-4-git-send-email-antonynpavlov@gmail.com> (raw)
In-Reply-To: <1377768833-11400-1-git-send-email-antonynpavlov@gmail.com>
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
hw/arm/digic.c | 8 +++
hw/timer/Makefile.objs | 1 +
hw/timer/digic-timer.c | 140 +++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 149 insertions(+)
create mode 100644 hw/timer/digic-timer.c
diff --git a/hw/arm/digic.c b/hw/arm/digic.c
index 3259b38..4ddf338 100644
--- a/hw/arm/digic.c
+++ b/hw/arm/digic.c
@@ -27,6 +27,10 @@
#include "hw/sysbus.h"
#include "hw/boards.h"
+#define DIGIC4_TIMER0 0xc0210000
+#define DIGIC4_TIMER1 0xc0210100
+#define DIGIC4_TIMER2 0xc0210200
+
typedef struct {
ARMCPU *cpu;
MemoryRegion ram;
@@ -46,6 +50,10 @@ static DigicState *digic4_create(void)
exit(1);
}
+ sysbus_create_simple("digic-timer", DIGIC4_TIMER0, NULL);
+ sysbus_create_simple("digic-timer", DIGIC4_TIMER1, NULL);
+ sysbus_create_simple("digic-timer", DIGIC4_TIMER2, NULL);
+
return s;
}
diff --git a/hw/timer/Makefile.objs b/hw/timer/Makefile.objs
index eca5905..5479aee 100644
--- a/hw/timer/Makefile.objs
+++ b/hw/timer/Makefile.objs
@@ -25,5 +25,6 @@ obj-$(CONFIG_OMAP) += omap_synctimer.o
obj-$(CONFIG_PXA2XX) += pxa2xx_timer.o
obj-$(CONFIG_SH4) += sh_timer.o
obj-$(CONFIG_TUSB6010) += tusb6010.o
+obj-$(CONFIG_DIGIC) += digic-timer.o
obj-$(CONFIG_MC146818RTC) += mc146818rtc.o
diff --git a/hw/timer/digic-timer.c b/hw/timer/digic-timer.c
new file mode 100644
index 0000000..8c4cad8
--- /dev/null
+++ b/hw/timer/digic-timer.c
@@ -0,0 +1,140 @@
+/*
+ * QEMU model of the Canon Digic timer block.
+ *
+ * Copyright (C) 2013 Antony Pavlov <antonynpavlov@gmail.com>
+ *
+ * This model is based on reverse engineering efforts
+ * made by CHDK (http://chdk.wikia.com) and
+ * Magic Lantern (http://www.magiclantern.fm) projects
+ * contributors.
+ *
+ * See "Timer/Clock Module" docs here:
+ * http://magiclantern.wikia.com/wiki/Register_Map
+ *
+ * The QEMU model of the OSTimer in PKUnity SoC by Guan Xuetao
+ * is used as a template.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "hw/sysbus.h"
+#include "hw/ptimer.h"
+#include "qemu/main-loop.h"
+
+#ifdef DEBUG_DIGIC_TIMER
+#define DPRINTF(fmt, ...) printf("%s: " fmt , __func__, ## __VA_ARGS__)
+#else
+#define DPRINTF(fmt, ...) do {} while (0)
+#endif
+
+#define TYPE_DIGIC_TIMER "digic-timer"
+#define DIGIC_TIMER(obj) OBJECT_CHECK(DigicTimerState, (obj), TYPE_DIGIC_TIMER)
+
+# define DIGIC_TIMER_CONTROL 0x00
+# define DIGIC_TIMER_VALUE 0x0c
+
+typedef struct DigicTimerState {
+ SysBusDevice parent_obj;
+
+ MemoryRegion iomem;
+ QEMUBH *bh;
+ ptimer_state *ptimer;
+} DigicTimerState;
+
+static uint64_t digic_timer_read(void *opaque, hwaddr offset,
+ unsigned size)
+{
+ DigicTimerState *s = opaque;
+ uint32_t ret = 0;
+
+ switch (offset) {
+ case DIGIC_TIMER_VALUE:
+ ret = (uint32_t)ptimer_get_count(s->ptimer);
+ ret = ret & 0xffff;
+ break;
+ default:
+ DPRINTF("Bad offset %x\n", (int)offset);
+ }
+
+ DPRINTF("offset 0x%x, value 0x%x\n", offset, ret);
+ return ret;
+}
+
+static void digic_timer_write(void *opaque, hwaddr offset,
+ uint64_t value, unsigned size)
+{
+ DigicTimerState *s = opaque;
+
+ /* FIXME: just now we ignore timer enable bit */
+ ptimer_set_limit(s->ptimer, 0x0000ffff, 1);
+ ptimer_run(s->ptimer, 1);
+}
+
+static const MemoryRegionOps digic_timer_ops = {
+ .read = digic_timer_read,
+ .write = digic_timer_write,
+ .impl = {
+ .min_access_size = 4,
+ .max_access_size = 4,
+ },
+ .endianness = DEVICE_NATIVE_ENDIAN,
+};
+
+static void digic_timer_tick(void *opaque)
+{
+ DigicTimerState *s = opaque;
+
+ ptimer_run(s->ptimer, 1);
+}
+
+static int digic_timer_init(SysBusDevice *dev)
+{
+ DigicTimerState *s = DIGIC_TIMER(dev);
+
+ s->bh = qemu_bh_new(digic_timer_tick, s);
+ s->ptimer = ptimer_init(s->bh);
+
+ /* FIXME: there is no documentation on Digic timer
+ * frquency setup so let's it always run on 1 MHz
+ * */
+ ptimer_set_freq(s->ptimer, 1 * 1000 * 1000);
+
+ memory_region_init_io(&s->iomem, OBJECT(s), &digic_timer_ops, s,
+ TYPE_DIGIC_TIMER, 0x100);
+ sysbus_init_mmio(dev, &s->iomem);
+
+ return 0;
+}
+
+static void digic_timer_class_init(ObjectClass *klass, void *data)
+{
+ SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass);
+
+ sdc->init = digic_timer_init;
+}
+
+static const TypeInfo digic_timer_info = {
+ .name = TYPE_DIGIC_TIMER,
+ .parent = TYPE_SYS_BUS_DEVICE,
+ .instance_size = sizeof(DigicTimerState),
+ .class_init = digic_timer_class_init,
+};
+
+static void digic_timer_register_type(void)
+{
+ type_register_static(&digic_timer_info);
+}
+
+type_init(digic_timer_register_type)
--
1.8.4.rc3
next prev parent reply other threads:[~2013-08-29 9:36 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-29 9:33 [Qemu-devel] [RFC 0/5] add initial support for Canon DIGIC SoC Antony Pavlov
2013-08-29 9:33 ` [Qemu-devel] [RFC 1/5] target-arm: add ARM946E-S CPU Antony Pavlov
2013-08-29 10:44 ` Peter Maydell
2013-08-29 10:52 ` Antony Pavlov
2013-08-29 18:17 ` Antony Pavlov
2013-08-30 5:09 ` Peter Crosthwaite
2013-08-30 7:29 ` Peter Maydell
2013-08-30 8:06 ` Antony Pavlov
2013-08-29 9:33 ` [Qemu-devel] [RFC 2/5] hw/arm: add very initial support for Canon DIGIC SoC Antony Pavlov
2013-08-29 12:15 ` Andreas Färber
2013-08-29 19:36 ` Antony Pavlov
2013-08-29 20:16 ` Peter Maydell
2013-08-30 5:07 ` Peter Crosthwaite
2013-08-30 8:10 ` Antony Pavlov
2013-08-30 17:53 ` Andreas Färber
2013-08-30 16:27 ` Andreas Färber
2013-08-29 14:29 ` Condello
2013-08-29 16:22 ` Antony Pavlov
2013-08-29 9:33 ` Antony Pavlov [this message]
2013-08-29 9:33 ` [Qemu-devel] [RFC 4/5] hw/arm/digic: add UART support Antony Pavlov
2013-08-30 5:16 ` Peter Crosthwaite
2013-08-30 8:31 ` Antony Pavlov
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=1377768833-11400-4-git-send-email-antonynpavlov@gmail.com \
--to=antonynpavlov@gmail.com \
--cc=broscutamaker@gmail.com \
--cc=condellog@gmail.com \
--cc=georg.hofstetter@lx-networking.de \
--cc=paul@codesourcery.com \
--cc=pbonzini@redhat.com \
--cc=peter.crosthwaite@xilinx.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/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).