add initial support for Canon DIGIC SoC
v6 cover add initial support for Canon DIGIC SoC
[PATCH v6 RESEND 1/5] hw/arm: add very initial support for Canon [PATCH v6 RESEND 2/5] hw/arm/digic: prepare DIGIC-based boards [PATCH v6 RESEND 3/5] hw/arm/digic: add timer support [PATCH v6 RESEND 4/5] hw/arm/digic: add UART support [PATCH v6 RESEND 5/5] hw/arm/digic: add NOR ROM support
Changes since v5:
1. rebase over latest master
2. digic_timer: add a reset function
3. digic_timer: add a VMStateDescription
4. digic_timer: fix whitespaces
5. digic_boards: fix whitespaces
6. move misplaced DIGIC_ROM* definitions
to the "hw/arm/digic: add NOR ROM support" patch
Changes since v4:
1. digic.h: parent_obj: change type Object -> DeviceState
2. digic-uart: drop reg array
3. digic_boards: fix K8P3215UQB comment
4. Makefile: place digic stuff in own line
5. drop cpu-qom.h inclusion
6. digic.h: add private/public labels
7. digic.h: fix guard macro
8. move base address macros to digic.c
9. fix header comments
Changes since v3:
1. fix typos and formatting
2. digic-timer: drop DPRINTF
3. digic-timer: fix DIGIC4_TIMER_BASE() macro
4. digic.c: fix max timer device string
Changes since v2:
1. rebase over latest master;
* pass available size to object_initialize().
2. digic-uart: qemu_log: use LOG_UNIMP instead LOG_GUEST_ERROR;
3. digic-boards: update rom image load code: introduce digic_load_rom().
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 Fa:rber, Peter Maydell and Peter Crosthwaite);
2. fix digic-uart (many thanks to Peter Crosthwaite
for his comments); 3. digic-boards: digic4_add_k8p3215uqb_rom(): update rom image load code: use the '-bios' option.
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
PATCH RESEND v6 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 | 1 + hw/arm/digic.c | 65 +++++++++++++++++++++++++++++++++++++++++ include/hw/arm/digic.h | 35 ++++++++++++++++++++++ 4 files changed, 102 insertions(+) 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_XILINX_SPIPS=y CONFIG_ARM11SCU=y CONFIG_A9SCU=y +CONFIG_DIGIC=y CONFIG_MARVELL_88W8618=y CONFIG_OMAP=y CONFIG_TSC210X=y
hw/arm/Makefile.objs +1 -0
@@ -4,4 +4,5 @@ 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-$(CONFIG_DIGIC) += digic.o obj-y += omap1.o omap2.o strongarm.o
hw/arm/digic.c new file +65 -0
65 lines not on this page · raw message
include/hw/arm/digic.h new file +35 -0
@@ -0,0 +1,35 @@ +/* +* Misc Canon DIGIC declarations. +* +* Copyright (C) 2013 Antony Pavlov <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program 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 General Public License for more details. +* +*/ + +#ifndef HW_ARM_DIGIC_H +#define HW_ARM_DIGIC_H + +#include "cpu.h" + +#define TYPE_DIGIC "digic" + +#define DIGIC (obj) OBJECT_CHECK(DigicState, (obj), TYPE_DIGIC) + +typedef struct DigicState { +/*< private >*/ +DeviceState parent_obj; +/*< public >*/ + +ARMCPU cpu; +}DigicState ; + +#endif /* HW_ARM_DIGIC_H */
Signature · 1 line
1.8.4.4
Re: [Qemu-devel] [PATCH v6 RESEND 1/5] hw/arm: add very initial support for Canon DIGIC SoC
Quoted 10 lines · Antony Pavlov
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.
Quoted 2 lines
Signed-off-by Antony Pavlov <[email protected]>Reviewed-by Andreas Färber <[email protected]>
thanks
-- PMM
PATCH RESEND v6 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 | 1 + hw/arm/digic_boards.c | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+) create mode 100644 hw/arm/digic_boards.c
hw/arm/Makefile.objs +1 -0
@@ -1,4 +1,5 @@ obj-y += boot.o collie.o exynos4_boards.o gumstix.o highbank.o +obj-$(CONFIG_DIGIC) += digic_boards.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 +88 -0
88 lines not on this page · raw message
Signature · 1 line
1.8.4.4
PATCH RESEND v6 3/5 hw/arm/digic: add timer support
In reply to Antony Pavlov--- hw/arm/digic.c | 28 ++++++++++ hw/timer/Makefile.objs | 1 + hw/timer/digic-timer.c | 140 +++++++++++++++++++++++++++++++++++++++++++++++++ hw/timer/digic-timer.h | 36 +++++++++++++ include/hw/arm/digic.h | 6 +++ 5 files changed, 211 insertions(+) create mode 100644 hw/timer/digic-timer.c create mode 100644 hw/timer/digic-timer.h
hw/arm/digic.c +28 -0
@@ -22,24 +22,52 @@#include "hw/arm/digic.h" +#define DIGIC4_TIMER_BASE (n) (0xc0210000 + (n) * 0x100) +static void digic_init (Object *obj) {DigicState *s =DIGIC (obj); +DeviceState *dev; +int i;object_initialize (&s->cpu,sizeof (s->cpu),"arm946-" TYPE_ARM_CPU );object_property_add_child (obj,"cpu" ,OBJECT (&s->cpu),NULL ); + +for (i =0 ; i <DIGIC4_NB_TIMERS ; i++) { +#define DIGIC_TIMER_NAME_MLEN 11 +char name[DIGIC_TIMER_NAME_MLEN ]; + +object_initialize (&s->timer[i],sizeof (s->timer[i]),TYPE_DIGIC_TIMER ); + dev =DEVICE (&s->timer[i]); +qdev_set_parent_bus (dev,sysbus_get_default ()); +snprintf (name,DIGIC_TIMER_NAME_MLEN ,"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 +140 -0
140 lines not on this page · raw message
hw/timer/digic-timer.h new file +36 -0
@@ -0,0 +1,36 @@ +/* +* Canon DIGIC timer block declarations. +* +* Copyright (C) 2013 Antony Pavlov <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program 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 General Public License for more details. +* +*/ + +#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 +6 -0
@@ -20,16 +20,22 @@#include "cpu.h" +#include "hw/timer/digic-timer.h" +#define TYPE_DIGIC "digic"#define DIGIC (obj) OBJECT_CHECK(DigicState, (obj), TYPE_DIGIC) +#define DIGIC4_NB_TIMERS 3 +typedef struct DigicState {/*< private >*/ DeviceState parent_obj;/*< public >*/ ARMCPU cpu; + +DigicTimerState timer[DIGIC4_NB_TIMERS ]; }DigicState ;#endif /* HW_ARM_DIGIC_H */
Signature · 1 line
1.8.4.4
Re: [Qemu-devel] [PATCH v6 RESEND 3/5] hw/arm/digic: add timer support
Quoted 1 line · Antony Pavlov
Signed-off-by Antony Pavlov <[email protected]>
-- PMM
PATCH RESEND v6 4/5 hw/arm/digic: add UART support
In reply to Antony Pavlov--- hw/arm/digic.c | 16 ++++ hw/char/Makefile.objs | 1 + hw/char/digic-uart.c | 195 +++++++++++++++++++++++++++++++++++++++++++++++++ hw/char/digic-uart.h | 45 ++++++++++++ include/hw/arm/digic.h | 2 + 5 files changed, 259 insertions(+) create mode 100644 hw/char/digic-uart.c create mode 100644 hw/char/digic-uart.h
hw/arm/digic.c +16 -0
@@ -24,6 +24,8 @@#define DIGIC4_TIMER_BASE (n) (0xc0210000 + (n) * 0x100) +#define DIGIC_UART_BASE 0xc0800000 +static void digic_init (Object *obj) {DigicState *s =DIGIC (obj);
@@ -43,6 +45,11 @@ static void digic_init(Object *obj)snprintf (name,DIGIC_TIMER_NAME_MLEN ,"timer[%d]" , i);object_property_add_child (obj, name,OBJECT (&s->timer[i]),NULL ); } + +object_initialize (&s->uart,sizeof (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)
@@ -68,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 +195 -0
195 lines not on this page · raw message
hw/char/digic-uart.h new file +45 -0
45 lines not on this page · raw message
include/hw/arm/digic.h +2 -0
@@ -21,6 +21,7 @@#include "cpu.h" #include "hw/timer/digic-timer.h" +#include "hw/char/digic-uart.h" #define TYPE_DIGIC "digic"
@@ -36,6 +37,7 @@ typedef struct DigicState {ARMCPU cpu;DigicTimerState timer[DIGIC4_NB_TIMERS ]; + DigicUartState uart; } DigicState;#endif /* HW_ARM_DIGIC_H */
Signature · 1 line
1.8.4.4
PATCH RESEND v6 5/5 hw/arm/digic: add NOR ROM support
In reply to Antony Pavlov--- hw/arm/digic_boards.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+)
hw/arm/digic_boards.c +71 -0
@@ -26,6 +26,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;
@@ -34,6 +41,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 ;
@@ -60,11 +71,71 @@ 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 digic_load_rom (DigicBoardState *s,hwaddr addr, +hwaddr max_size,const char *def_filename) +{ + +target_long rom_size; +const char *filename; + +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, max_size); +if (rom_size <0 || rom_size > max_size) { +fprintf (stderr,"Couldn't load rom image '%s'\n" , filename); +exit (1 ); + } + } +} + +/* +* Samsung K8P3215UQB +* 64M Bit (4Mx16) Page Mode / Multi-Bank NOR Flash Memory +*/ +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) + +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 ); + +digic_load_rom (s, addr,FLASH_K8P3215UQB_SIZE , def_filename); +} +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.4
Re: [Qemu-devel] [PATCH v6 RESEND 5/5] hw/arm/digic: add NOR ROM support
Quoted 4 lines · Antony Pavlov
Signed-off-by Antony Pavlov <[email protected]>--- hw/arm/digic_boards.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+)
thanks
-- PMM
Quoted 5 lines · Antony Pavlov
[PATCH v6 RESEND 1/5] hw/arm: add very initial support for Canon [PATCH v6 RESEND 2/5] hw/arm/digic: prepare DIGIC-based boards [PATCH v6 RESEND 3/5] hw/arm/digic: add timer support [PATCH v6 RESEND 4/5] hw/arm/digic: add UART support [PATCH v6 RESEND 5/5] hw/arm/digic: add NOR ROM support
OK, I think we're nearly there: the only remaining code issue I think is the boot address / setting the CPU hivecs property.
When you send the next version of this series, can you add a patch which adds you to MAINTAINERS in the "ARM Machines" section, please? (that subsection is alphabetically sorted so 'Canon DIGIC' would come at the top). Then people know to email you when they have bugs/fixes to the code.
thanks
-- PMM