hw/arm: add initial support for Canon DIGIC SoC
v2 cover hw/arm: add initial support for Canon DIGIC SoC
[RFC v2 1/5] hw/arm: add very initial support for Canon DIGIC SoC [RFC v2 2/5] hw/arm/digic: prepare DIGIC-based boards support [RFC v2 3/5] hw/arm/digic: add timer support
[RFC v2 4/5] hw/arm/digic: add UART support
[RFC v2 5/5] hw/arm/digic: add NOR ROM support
Changes since v1:
0. drop the "add ARM946E-S CPU" patch;
1. convert to QOM, split DIGIC SoC code and board code (thanks to Andreas Färber, Peter Maydell and Peter Crosthwaite);
2. fix uart (many thanks to Peter Crosthwaite for his comments);
3. digic4_add_k8p3215uqb_rom(): update rom image load code;
DIGIC is Canon Inc.'s name for a family of SoC
for digital cameras and camcorders.
See http://en.wikipedia.org/wiki/DIGIC for details.
There is no publicly available specification for DIGIC chips. All information about DIGIC chip internals is based on reverse engineering efforts made by CHDK (http://chdk.wikia.com) and Magic Lantern (http://www.magiclantern.fm) projects contributors.
Also this patch series adds initial support for Canon PowerShot A1100 IS compact camera (it is my only camera with connected UART interface). As the DIGIC-based cameras differences mostly are unsignificant (e.g. RAM-size, ROM type and size, GPIO usage) the other compact and DSLR cameras support can be easely added.
This DIGIC support patch series is inspired
by EOS QEMU from Magic Lantern project.
The main differences:
* EOS QEMU uses home-brew all-in-one monolith design; this patch series uses conventional qemu object-centric design;
* EOS QEMU tries provide simplest emulation for most controllers inside SoC to run Magic Lantern firmware; this patch series provide more complete support
only for core devices to run barebox bootloader.
** EOS QEMU does not support timer counting
(this patch series emulate 1 MHz counting);
** EOS QEMU support DIGIC UART only for output character to stderr; (this patch series emulate introduces full blown UART interface);
** EOS QEMU has incomplete ROM support;
(this patch series uses conventional qemu pflash).
This initial DIGIC support can't be used to run the original camera firmware, but it can successfully run experimental version of barebox bootloader (see http://www.barebox.org).
The last sources of barebox for PowerShot A1100 can be obtained here:
https://github.com/frantony/barebox/tree/next.digic.20130829
The precompiled ROM image usable with qemu can be
obtained here:
https://github.com/frantony/barebox/blob/next.digic.20130829/canon-a1100-rom1.bin
This ROM image (after "dancing bit" encoding) can be run on real Canon A1100 camera.
The short build instruction for __previous__ DIGIC barebox version (it can be used with more recent sources too) can be obtained here:
http://lists.infradead.org/pipermail/barebox/2013-August/016007.html
RFC v2 1/5 hw/arm: add very initial support for Canon DIGIC SoC
DIGIC is Canon Inc.'s name for a family of SoC
for digital cameras and camcorders.
There is no publicly available specification for DIGIC chips. All information about DIGIC chip internals is based on reverse engineering efforts made by CHDK (http://chdk.wikia.com) and Magic Lantern (http://www.magiclantern.fm) projects contributors.
--- default-configs/arm-softmmu.mak | 1 + hw/arm/Makefile.objs | 2 +- hw/arm/digic.c | 70 +++++++++++++++++++++++++++++++++++++++++ include/hw/arm/digic.h | 23 ++++++++++++++ 4 files changed, 95 insertions(+), 1 deletion(-) create mode 100644 hw/arm/digic.c create mode 100644 include/hw/arm/digic.h
default-configs/arm-softmmu.mak +1 -0
@@ -63,6 +63,7 @@ CONFIG_FRAMEBUFFER=y CONFIG_XILINX_SPIPS=y CONFIG_A9SCU=y +CONFIG_DIGIC=y CONFIG_MARVELL_88W8618=y CONFIG_OMAP=y CONFIG_TSC210X=y
hw/arm/Makefile.objs +1 -1
@@ -3,5 +3,5 @@ obj-y += integratorcp.o kzm.o mainstone.o musicpal.o nseries.o obj-y += omap_sx1.o palm.o realview.o spitz.o stellaris.o obj-y += tosa.o versatilepb.o vexpress.o xilinx_zynq.o z2.o -obj-y += armv7m.o exynos4210.o pxa2xx.o pxa2xx_gpio.o pxa2xx_pic.o +obj-y += armv7m.o digic.o exynos4210.o pxa2xx.o pxa2xx_gpio.o pxa2xx_pic.o obj-y += omap1.o omap2.o strongarm.o
hw/arm/digic.c new file +70 -0
70 lines not on this page · raw message
include/hw/arm/digic.h new file +23 -0
@@ -0,0 +1,23 @@ +/* +* Misc DIGIC declarations +* +* Copyright (C) 2013 Antony Pavlov <[email protected]> +* +*/ + +#ifndef __DIGIC_H__ +#define __DIGIC_H__ + +#include "cpu-qom.h" + +#define TYPE_DIGIC "digic" + +#define DIGIC (obj) OBJECT_CHECK(DigicState, (obj), TYPE_DIGIC) + +typedef struct DigicState { +Object parent_obj; + +ARMCPU cpu; +}DigicState ; + +#endif /* __DIGIC_H__ */
Signature · 1 line
1.8.4.rc3
RFC v2 2/5 hw/arm/digic: prepare DIGIC-based boards support
In reply to Antony PavlovAlso this patch adds initial support for Canon
PowerShot A1100 IS compact camera.
--- hw/arm/Makefile.objs | 2 +- hw/arm/digic_boards.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 hw/arm/digic_boards.c
hw/arm/Makefile.objs +1 -1
@@ -1,4 +1,4 @@ -obj-y += boot.o collie.o exynos4_boards.o gumstix.o highbank.o +obj-y += boot.o collie.o digic_boards.o exynos4_boards.o gumstix.o highbank.o obj-y += integratorcp.o kzm.o mainstone.o musicpal.o nseries.o obj-y += omap_sx1.o palm.o realview.o spitz.o stellaris.o obj-y += tosa.o versatilepb.o vexpress.o xilinx_zynq.o z2.o
hw/arm/digic_boards.c new file +63 -0
63 lines not on this page · raw message
Signature · 1 line
1.8.4.rc3
RFC v2 3/5 hw/arm/digic: add timer support
In reply to Antony Pavlov--- hw/arm/digic.c | 25 ++++++++++ hw/timer/Makefile.objs | 1 + hw/timer/digic-timer.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++++ hw/timer/digic-timer.h | 19 ++++++++ include/hw/arm/digic.h | 7 +++ 5 files changed, 174 insertions(+) create mode 100644 hw/timer/digic-timer.c create mode 100644 hw/timer/digic-timer.h
hw/arm/digic.c +25 -0
@@ -30,21 +30,46 @@static void digic_init (Object *obj) {DigicState *s =DIGIC (obj); +DeviceState *dev; +int i;object_initialize (&s->cpu,"arm946-" TYPE_ARM_CPU );object_property_add_child (obj,"cpu" ,OBJECT (&s->cpu),NULL ); + +for (i =0 ; i <DIGIC4_NB_TIMERS ; i++) { +char name[9 ]; + +object_initialize (&s->timer[i],TYPE_DIGIC_TIMER ); + dev =DEVICE (&s->timer[i]); +qdev_set_parent_bus (dev,sysbus_get_default ()); +snprintf (name,9 ,"timer[%d]" , i); +object_property_add_child (obj, name,OBJECT (&s->timer[i]),NULL ); + } }static void digic_realize (DeviceState *dev,Error **errp) {DigicState *s =DIGIC (dev);Error *err =NULL ; +SysBusDevice *sbd; +int i;object_property_set_bool (OBJECT (&s->cpu), true,"realized" , &err);if (err !=NULL ) {error_propagate (errp, err);return ; } + +for (i =0 ; i <DIGIC4_NB_TIMERS ; i++) { +object_property_set_bool (OBJECT (&s->timer[i]), true,"realized" , &err); +if (err !=NULL ) { +error_propagate (errp, err); +return ; + } + + sbd =SYS_BUS_DEVICE (&s->timer[i]); +sysbus_mmio_map (sbd,0 ,DIGIC4_TIMER_BASE (i)); + } }static void digic_class_init (ObjectClass *oc,void *data)
hw/timer/Makefile.objs +1 -0
@@ -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
hw/timer/digic-timer.c new file +122 -0
122 lines not on this page · raw message
hw/timer/digic-timer.h new file +19 -0
@@ -0,0 +1,19 @@ +#ifndef HW_TIMER_DIGIC_TIMER_H +#define HW_TIMER_DIGIC_TIMER_H + +#include "hw/sysbus.h" +#include "qemu/typedefs.h" +#include "hw/ptimer.h" + +#define TYPE_DIGIC_TIMER "digic-timer" +#define DIGIC_TIMER (obj) OBJECT_CHECK(DigicTimerState, (obj), TYPE_DIGIC_TIMER) + +typedef struct DigicTimerState { +SysBusDevice parent_obj; + +MemoryRegion iomem; +QEMUBH *bh; +ptimer_state *ptimer; +}DigicTimerState ; + +#endif /* HW_TIMER_DIGIC_TIMER_H */
include/hw/arm/digic.h +7 -0
@@ -10,6 +10,11 @@#include "cpu-qom.h" +#include "hw/timer/digic-timer.h" + +#define DIGIC4_NB_TIMERS 3 +#define DIGIC4_TIMER_BASE (n) (0xc0210000 + n * 0x100) +#define TYPE_DIGIC "digic"#define DIGIC (obj) OBJECT_CHECK(DigicState, (obj), TYPE_DIGIC)
@@ -18,6 +23,8 @@ typedef struct DigicState {Object parent_obj;ARMCPU cpu; + + DigicTimerState timer[DIGIC4_NB_TIMERS]; } DigicState;#endif /* __DIGIC_H__ */
Signature · 1 line
1.8.4.rc3
RFC v2 4/5 hw/arm/digic: add UART support
In reply to Antony Pavlov--- hw/arm/digic.c | 14 ++++ hw/char/Makefile.objs | 1 + hw/char/digic-uart.c | 197 +++++++++++++++++++++++++++++++++++++++++++++++++ hw/char/digic-uart.h | 27 +++++++ include/hw/arm/digic.h | 4 + 5 files changed, 243 insertions(+) create mode 100644 hw/char/digic-uart.c create mode 100644 hw/char/digic-uart.h
hw/arm/digic.c +14 -0
@@ -45,6 +45,11 @@ static void digic_init(Object *obj)snprintf (name,9 ,"timer[%d]" , i);object_property_add_child (obj, name,OBJECT (&s->timer[i]),NULL ); } + +object_initialize (&s->uart,TYPE_DIGIC_UART ); + dev =DEVICE (&s->uart); +qdev_set_parent_bus (dev,sysbus_get_default ()); +object_property_add_child (obj,"uart" ,OBJECT (&s->uart),NULL ); }static void digic_realize (DeviceState *dev,Error **errp)
@@ -70,6 +75,15 @@ static void digic_realize(DeviceState *dev, Error **errp) sbd =SYS_BUS_DEVICE (&s->timer[i]);sysbus_mmio_map (sbd,0 ,DIGIC4_TIMER_BASE (i)); } + +object_property_set_bool (OBJECT (&s->uart), true,"realized" , &err); +if (err !=NULL ) { +error_propagate (errp, err); +return ; + } + + sbd =SYS_BUS_DEVICE (&s->uart); +sysbus_mmio_map (sbd,0 ,DIGIC_UART_BASE ); }static void digic_class_init (ObjectClass *oc,void *data)
hw/char/Makefile.objs +1 -0
@@ -14,6 +14,7 @@ obj-$(CONFIG_COLDFIRE) += mcf_uart.o obj-$(CONFIG_OMAP) += omap_uart.o obj-$(CONFIG_SH4) += sh_serial.o obj-$(CONFIG_PSERIES) += spapr_vty.o +obj-$(CONFIG_DIGIC) += digic-uart.o common-obj-$(CONFIG_ETRAXFS) += etraxfs_ser.o common-obj-$(CONFIG_ISA_DEBUG) += debugcon.o
hw/char/digic-uart.c new file +197 -0
197 lines not on this page · raw message
hw/char/digic-uart.h new file +27 -0
@@ -0,0 +1,27 @@ +#ifndef HW_CHAR_DIGIC_UART_H +#define HW_CHAR_DIGIC_UART_H + +#include "hw/sysbus.h" +#include "qemu/typedefs.h" + +#define TYPE_DIGIC_UART "digic-uart" +#define DIGIC_UART (obj) \ + OBJECT_CHECK(DigicUartState, (obj), TYPE_DIGIC_UART) + +enum { +R_TX =0x00 , +R_RX , +R_ST = (0x14 >>2 ), +R_MAX +}; + +typedef struct DigicUartState { +SysBusDevice parent_obj; + +MemoryRegion regs_region; +CharDriverState *chr; + +uint32_t regs[R_MAX ]; +}DigicUartState ; + +#endif /* HW_CHAR_DIGIC_UART_H */
include/hw/arm/digic.h +4 -0
@@ -11,10 +11,13 @@#include "cpu-qom.h" #include "hw/timer/digic-timer.h" +#include "hw/char/digic-uart.h" #define DIGIC4_NB_TIMERS 3#define DIGIC4_TIMER_BASE (n) (0xc0210000 + n * 0x100) +#define DIGIC_UART_BASE 0xc0800000 +#define TYPE_DIGIC "digic"#define DIGIC (obj) OBJECT_CHECK(DigicState, (obj), TYPE_DIGIC)
@@ -25,6 +28,7 @@ typedef struct DigicState {ARMCPU cpu;DigicTimerState timer[DIGIC4_NB_TIMERS ]; + DigicUartState uart; } DigicState;#endif /* __DIGIC_H__ */
Signature · 1 line
1.8.4.rc3
Re: [Qemu-devel] [RFC v2 4/5] hw/arm/digic: add UART support
Hi Antony,
Quoted 108 lines · Antony Pavlov
Signed-off-by Antony Pavlov <[email protected]>--- hw/arm/digic.c | 14 ++++ hw/char/Makefile.objs | 1 + hw/char/digic-uart.c | 197 +++++++++++++++++++++++++++++++++++++++++++++++++ hw/char/digic-uart.h | 27 +++++++ include/hw/arm/digic.h | 4 + 5 files changed, 243 insertions(+) create mode 100644 hw/char/digic-uart.c create mode 100644 hw/char/digic-uart.hhw/arm/digic.c +14
-0@@ -45,6 +45,11 @@ static void digic_init(Object *obj)snprintf (name,9 ,"timer[%d]" , i);object_property_add_child (obj, name,OBJECT (&s->timer[i]),NULL ); } + +object_initialize (&s->uart,TYPE_DIGIC_UART ); + dev =DEVICE (&s->uart); +qdev_set_parent_bus (dev,sysbus_get_default ()); +object_property_add_child (obj,"uart" ,OBJECT (&s->uart),NULL ); }static void digic_realize (DeviceState *dev,Error **errp)@@ -70,6 +75,15 @@ static void digic_realize(DeviceState *dev, Error **errp) sbd =SYS_BUS_DEVICE (&s->timer[i]);sysbus_mmio_map (sbd,0 ,DIGIC4_TIMER_BASE (i)); } + +object_property_set_bool (OBJECT (&s->uart), true,"realized" , &err); +if (err !=NULL ) { +error_propagate (errp, err); +return ; + } + + sbd =SYS_BUS_DEVICE (&s->uart); +sysbus_mmio_map (sbd,0 ,DIGIC_UART_BASE ); }static void digic_class_init (ObjectClass *oc,void *data)hw/char/Makefile.objs +1
-0@@ -14,6 +14,7 @@ obj-$(CONFIG_COLDFIRE) += mcf_uart.o obj-$(CONFIG_OMAP) += omap_uart.o obj-$(CONFIG_SH4) += sh_serial.o obj-$(CONFIG_PSERIES) += spapr_vty.o +obj-$(CONFIG_DIGIC) += digic-uart.o common-obj-$(CONFIG_ETRAXFS) += etraxfs_ser.o common-obj-$(CONFIG_ISA_DEBUG) += debugcon.ohw/char/digic-uart.c new file +47
-0@@ -0,0 +1,197 @@ +/* +* QEMU model of the Canon Digic UART block. +* +* Copyright (C) 2013 Antony Pavlov <[email protected]> +* +* 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 "Serial terminal" docs here: +* http://magiclantern.wikia.com/wiki/Register_Map#Misc_Registers +* +* The QEMU model of the Milkymist UART block by Michael Walle +* 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/hw.h" +#include "hw/sysbus.h" +#include "sysemu/char.h" + +#include "hw/char/digic-uart.h" + +enum { +ST_RX_RDY = (1 <<0 ), +ST_TX_RDY = (1 <<1 ), +}; + +static uint64_t digic_uart_read (void *opaque,hwaddr addr, +unsigned size) +{ +DigicUartState *s = opaque; +
hw/char/digic-uart.c line 57
Quoted 10 lines
hw/char/digic-uart.c new file +10
-0+ addr >>=2 ; + +switch (addr) { +case R_RX : + s->regs[R_ST ] &= ~(ST_RX_RDY ); +break ; + +case R_ST : +break ; +
So I've been thinking about this some more, and I think you mentioned this is due to the fact that this functionality is unimplemented right? There is qemu_log(LOG_UNIMP for this very reason as well. Due to the very nature of what you are trying to do with this series, it may be a case of you have quite extensive use of both GUEST_ERROR and UNIMP:
switch (addr) {
case (FOO) :
/* do some side effects */
break;
case (BAR):
case (BAZ):
qemu_log(LOG_GUEST_ERROR, "bad address %x", addr);
break;
default:
qemu_log(LOG_UNIMP, "unknown address %x", addr);
}Be specific on the cases you know about as guest errors and assume an unimp for a default. Use of the ... syntax in switch case may help for large ranges of unknown registers.
hw/char/digic-uart.c line 61
Quoted 4 lines
hw/char/digic-uart.c new file +4
-0+default : +qemu_log_mask (LOG_GUEST_ERROR , +"digic_uart: read access to unknown register 0x" + TARGET_FMT_plx, addr <<2 );
return 0 here the guard against OOB array access,
Quoted 18 lines
hw/char/digic-uart.c new file +18
-0+ } + +return s->regs[addr]; +} + +static void digic_uart_write (void *opaque,hwaddr addr,uint64_t value, +unsigned size) +{ +DigicUartState *s = opaque; +unsigned char ch = value; + + addr >>=2 ; + +switch (addr) { +case R_TX : +if (s->chr) { +qemu_chr_fe_write_all (s->chr, &ch,1 ); + }
hw/char/digic-uart.c line 89
Quoted 10 lines
hw/char/digic-uart.c new file +10
-0+break ; + +case R_ST : +/* +* Ignore write to R_ST. +* +* The point is that this register is actively used +* during receiving and transmitting symbols, +* but we don't know the function of most of bits. +*
This does sound a lot like a qemu_log(LOG_UNIMP
Regards,
Peter
Quoted 6 lines
hw/char/digic-uart.c new file +6
-0+* Ignoring writes to R_ST is only a simplification +* of the model. It has no perceptible side effects +* for existing guests. +*/ +break ; +
RFC v2 5/5 hw/arm/digic: add NOR ROM support
In reply to Antony Pavlov--- hw/arm/digic_boards.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+)
hw/arm/digic_boards.c +67 -0
@@ -1,6 +1,13 @@#include "hw/boards.h" #include "exec/address-spaces.h" #include "hw/arm/digic.h" +#include "hw/block/flash.h" +#include "hw/loader.h" +#include "sysemu/sysemu.h" + +#define DIGIC4_ROM0_BASE 0xf0000000 +#define DIGIC4_ROM1_BASE 0xf8000000 +# define DIGIC4_ROM_MAX_SIZE 0x08000000 typedef struct DigicBoardState { DigicState *digic;
@@ -9,6 +16,10 @@ typedef struct DigicBoardState {typedef struct DigicBoard {hwaddr ram_size; +void (*add_rom0)(DigicBoardState *,hwaddr ,const char *); +const char *rom0_def_filename; +void (*add_rom1)(DigicBoardState *,hwaddr ,const char *); +const char *rom1_def_filename;hwaddr start_addr; }DigicBoard ;
@@ -35,11 +46,67 @@ static void digic4_board_init(DigicBoard *board)digic4_board_setup_ram (s, board->ram_size); +if (board->add_rom0) { + board->add_rom0 (s,DIGIC4_ROM0_BASE , board->rom0_def_filename); + } + +if (board->add_rom1) { + board->add_rom1 (s,DIGIC4_ROM1_BASE , board->rom1_def_filename); + } + s->digic->cpu.env.regs[15 ] = board->start_addr; } +static void digic4_add_k8p3215uqb_rom (DigicBoardState *s,hwaddr addr, +const char *def_filename) +{ +#define FLASH_K8P3215UQB_SIZE (4 * 1024 * 1024) +#define FLASH_K8P3215UQB_SECTOR_SIZE (64 * 1024) + +target_long rom_size; +const char *filename; + +/* +* Samsung K8P3215UQB: +* * AMD command set; +* * multiple sector size: some sectors are 8K the other ones are 64K. +* Alas! The pflash_cfi02_register() function creates a flash +* device with unified sector size. +*/ +pflash_cfi02_register (addr,NULL ,"pflash" ,FLASH_K8P3215UQB_SIZE , +NULL ,FLASH_K8P3215UQB_SECTOR_SIZE , +FLASH_K8P3215UQB_SIZE /FLASH_K8P3215UQB_SECTOR_SIZE , +DIGIC4_ROM_MAX_SIZE /FLASH_K8P3215UQB_SIZE , +4 , +0x00EC ,0x007E ,0x0003 ,0x0001 , +0x0555 ,0x2aa ,0 ); + +if (bios_name) { + filename = bios_name; + }else { + filename = def_filename; + } + +if (filename) { +char *fn =qemu_find_file (QEMU_FILE_TYPE_BIOS , filename); + +if (!fn) { +fprintf (stderr,"Couldn't find rom image '%s'.\n" , filename); +exit (1 ); + } + + rom_size =load_image_targphys (fn, addr,FLASH_K8P3215UQB_SIZE ); +if (rom_size <0 || rom_size >FLASH_K8P3215UQB_SIZE ) { +fprintf (stderr,"Couldn't load rom image '%s'\n" , filename); +exit (1 ); + } + } +} +static DigicBoard digic4_board_canon_a1100 = { .ram_size =64 *1024 *1024 , + .add_rom1 = digic4_add_k8p3215uqb_rom, + .rom1_def_filename ="canon-a1100-rom1.bin" ,/* CHDK recommends this address for ROM disassembly */ .start_addr =0xffc00000 , };
Signature · 1 line
1.8.4.rc3