| Message ID | CAGHo3xBVZa1ANFwj19fFz1xqs=Sh=4LTE1cJZjsQrUeSSpyE1A@mail.gmail.com |
|---|---|
| State | New |
| Headers | show |
On 5 November 2013 14:44, Jan Petrouš <jan.petrous@tieto.com> wrote: > Hehe, duno, but when I started learning QEMU the Integrator devboard > looked for me the nice start-up point = very simple to understand > and only very basic, but still core, device list. QEMU's integrator model is really very minimally maintained. A lot of its code is still using out of date ways of doing things and hasn't been updated in years; my only test case for it is an ancient 2.6.17 kernel. vexpress is rather more maintained and I do at least occasionally test with new kernels. > And when I moved > from precompiled kernels (downloaded from internet) to my own > ones I found the issue with default kernel configuration. And because > it can help to not fool somebody later I decided to release patch :) I'm entirely happy to accept and review integrator patches though. > Here is my next version: > > Linux kernel from version 3.4 requires CM_REFCNT register for sched timer > for Integrator/CP board (integrator_defconfig). > > See > http://infocenter.arm.com/help/topic/com.arm.doc.dui0138e/ch04s06s11.html > > Signed-off-by: Jan Petrous <jan.petrous@tieto.com> Thanks. This version Reviewed-by: Peter Maydell <peter.maydell@linaro.org> and I've applied it to my target-arm tree. May get into 1.7 but possibly not til 1.8. PS: doesn't matter for this one but for future patches, version-2 patches are better sent as separate top level emails with a "[PATCH v2]" subject line tag; peoples' patch workflow generally assumes that. -- PMM
peter.maydell@linaro.org writes: > On 5 November 2013 14:44, Jan Petrouš <jan.petrous@tieto.com> wrote: >> Hehe, duno, but when I started learning QEMU the Integrator devboard >> looked for me the nice start-up point = very simple to understand >> and only very basic, but still core, device list. > > QEMU's integrator model is really very minimally maintained. > A lot of its code is still using out of date ways of doing > things and hasn't been updated in years; my only test case > for it is an ancient 2.6.17 kernel. vexpress is rather > more maintained and I do at least occasionally test with > new kernels. <snip> I suspect it would be worth updating the QEMU wiki pages and building a simple vexpress image (or showing simple steps for the Linaro vexpress builds). I suspect Jan's choice was also influenced as mine by the fact it's the test ARM image mentioned on the wiki page. Of course the first time I ran it I found it had regressed also ;-)
On 5 November 2013 16:18, Alex Bennée <alex.bennee@linaro.org> wrote: > I suspect it would be worth updating the QEMU wiki pages and building a > simple vexpress image (or showing simple steps for the Linaro vexpress > builds). It's painful because of GPL issues if you just provide the binary... -- PMM
From ff26b99b586f5633fc7b876f75e5a5271e141563 Mon Sep 17 00:00:00 2001 From: Jan Petrous <jan.petrous@tieto.com> Date: Tue, 5 Nov 2013 12:13:57 +0100 Subject: [PATCH] integrator/cp: add support for REFCNT register Linux kernel from version 3.4 requires CM_REFCNT register for sched timer for Integrator/CP board (integrator_defconfig). See http://infocenter.arm.com/help/topic/com.arm.doc.dui0138e/ch04s06s11.html Signed-off-by: Jan Petrous <jan.petrous@tieto.com> --- hw/arm/integratorcp.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c index c44b2a4..a759689 100644 --- a/hw/arm/integratorcp.c +++ b/hw/arm/integratorcp.c @@ -36,6 +36,7 @@ typedef struct IntegratorCMState { uint32_t cm_init; uint32_t cm_flags; uint32_t cm_nvflags; + uint32_t cm_refcnt_offset; uint32_t int_level; uint32_t irq_enabled; uint32_t fiq_enabled; @@ -82,9 +83,13 @@ static uint64_t integratorcm_read(void *opaque, hwaddr offset, return s->cm_sdram; case 9: /* CM_INIT */ return s->cm_init; - case 10: /* CM_REFCT */ - /* ??? High frequency timer. */ - hw_error("integratorcm_read: CM_REFCT"); + case 10: /* CM_REFCNT */ + /* This register, CM_REFCNT, provides a 32-bit count value. + * The count increments at the fixed reference clock frequency of 24MHz + * and can be used as a real-time counter. + */ + return (uint32_t)muldiv64(qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL), 24, + 1000) - s->cm_refcnt_offset; case 12: /* CM_FLAGS */ return s->cm_flags; case 14: /* CM_NVFLAGS */ @@ -257,6 +262,8 @@ static int integratorcm_init(SysBusDevice *dev) } memcpy(integrator_spd + 73, "QEMU-MEMORY", 11); s->cm_init = 0x00000112; + s->cm_refcnt_offset = muldiv64(qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL), 24, + 1000); memory_region_init_ram(&s->flash, OBJECT(s), "integrator.flash", 0x100000); vmstate_register_ram_global(&s->flash); -- 1.7.11.3