Skip to contentSkip to conversation

hw/arm: add Faraday A369 SoC platform support

PATCH Superseded Kuo-Jung Su 1 participant 25 messages Mar 12, 2013

v7 of 9 Superseded Latest is v9 →

lore
Share & tools
lore
#0 lore raw

v7 cover hw/arm: add Faraday A369 SoC platform support

From: Kuo-Jung Su <[email protected]>

These patches introduce Faraday A369 SoC platform support.

Here are some public documents for your reference.

http://www.faraday-tech.com/html/documentation/index.html

The partial version of faraday cpu datasheet with only the CP15 and MPU description are available at my Google Drive:

https://docs.google.com/folder/d/0BwfiewvSmUgAalh5TkxyZWtlWEE/edit?usp=sharing

The pre-built A369 images are also available at my Google Drive:

https://docs.google.com/folder/d/0BwfiewvSmUgAX2pTTmtUMGFCZW8/edit

Here is the image file list:

1. android-4.0.4/zImage: A369 linux-3.0.31
2. android-4.0.4/romfs-4.0.4.tar.bz2: android-4.0.4
3. nand.img.bz2: A369 nand flash image
4. rom.img.bz2: A369 embedded ROM image
5. u-boot: A369 u-boot-2012.10 ELF file
6. zImage: A369 linux-3.4.12 + initramfs
7. README

If you want to re-build the image from scratch, try my Faraday Linux BSP/SDK: falinux.

1. Download the falinux

   $ git clone https://github.com/dantesu1218/falinux.git

2. Download all the required software packages:

   $ cd falinux
   $ make setup

3. Launch the menuconfig of falinux, and enable 'QEMU Support'

   $ make menuconfig

4. Re-build the packages

   $ make

5. Laungh the qemu-1.3.0 with the generated falinux images.

   $ make qemu

Changes for v6 -> v7:

1. hw/arm/ftwdt010:
Replace 'qemu_system_reset_request()' with 'watchdog_perform_action()'.
2. hw/arm/ftrtc011:
Replace 'get_clock_realtime()' with 'qemu_get_clock_ns(rtc_clock)'. Replace 'qemu_new_timer_ms(rt_clock...)' with 'qemu_new_timer_ms(rtc_clock...)' Rename 'ftrtc011_timer_resync' -> 'ftrtc011_timer_rebase'
Add ftrtc011_timer_resche()
Add QTest support
3. hw/arm/faraday_a369_soc:
Remove redundant device reset from a369soc_system_reset(...)
4. include/qemu/bitops.h:
Update bitrev8() to use a kind of divide and conquer algorithm.
5. hw/arm/ftahb020,ftddrii030,ftapbbrg020,faraday_a369_soc:
Drop FARADAY_SOC_GET_CORE(), replaced with device to device QOM link.
6. hw/wm8731,wm8750,marvell_88w8618_audio,spitz,z2:
Add AudioCodecClass for wm87xx audio class abstration.
7. hw/arm/ftnandc021:
Drop nand_init(), replaced with device to device QOM link.
8. hw/arm/ftsdc010:
Bug fixed to write operation: remove sd_data_ready() in write path.
9. hw/arm/ftgmac100,ftmac110,ftwdt010:
rt-clock -> vm_clock
10. hw/nand.c:
Drop [hw/nand.c: correct the sense of the BUSY/READY], since it's already applied. Drop [hw/nand.c: bug fix to erase operation], since Peter has a better solution.

Changes for v5 -> v6:

1. hw/arm/Makefile.objs:
Shift to the next line only after current line length is > 80 characters.
2. hw/arm/faraday.h:
Update debug macro format per discussions at the link bellow:
http://thread.gmane.org/gmane.comp.emulators.qemu/195996/focus=196975
3. hw/arm/faraday.h:

       TYPE_FARADAY_SOC: 'faraday/soc' -> 'faraday.soc'
   4. hw/arm/*.c:
       Replace '%llx' with '%HWADDR_PRIx'
   5. hw/arm/*.h:
       Add '#include "qemu/bitops.h"'
   6. hw/arm/faraday_a369_soc.c:
       Typo fix: salve4 -> slave4, salve6 -> slave6
   7. hw/arm/*.c:
       Drop FROM_SYSBUS().
   8. hw/arm/ftintc020.c:
       Re-write the source file with pl190.c as template.
   9. hw/arm/ftintc020.h:
       Rename the registers to improve readibility.
   10. hw/arm/faraday.h:
       Add dedicated spi flash pointer array (DeviceState *spi_fl[2]).
   11. hw/arm/faraday.h:
       Add 'qemu_irq pic[64]'.
   12. hw/arm/*c:
       Replace the complex conversion in XXX_REG32() with directly array indexing.
   13. hw/arm/*c:
       Update the error message output from 'hw_error(...)' into 'fprintf(stderr, ...)'
   14. hw/arm/faraday_a369.c, hw/arm/faraday_a369_soc.c:
       Move the external AHB device init from faraday_a369_soc.c to faraday_a369.c
   15. include/qemu/bitops.h:
       Move bitrev() from bitrev.[ch] into bitops.h
   16. hw/nand.c:
       Remove the clear/set SR[6] code in read/erase/write, because
       it's not possible to be observed by a guest.
   17. hw/arm/faraday_a369_kpd.c:
       Function prefix: 'ftkbc010' -> 'a369kpd' 
       Name of struct:  'FTKBC010State' -> 'A369KPDState'.
       QOM: 'FTKBC010' -> 'A369KPD'
   18. hw/arm/ftddrii030.c:
       'case REG_MCR ... 0x4c' -> 'case REG_MCR ... (CFG_REGSIZE - 1) * 4'

19. hw/arm/ftahbc020.c:
Add comments to fall-through path. (i.e. /* fall-through - skip slave6 */)
20. hw/arm/faraday_a369.c:
Update spi flash init code to use the new QOM classes of m25p80.

Changes for v3 -> v5:

1. [cpu] Add the unapplied patches for faraday ARMv5TE cores.
2. [nand] Add the unapplied patches for hw/nand.c.
3. [audio] Add the unapplied patches for wm8731.
4. [Global] Replace redundant statement in xxx_update_irq() with

            qemu_set_irq(s->irq, !!(xxxx));
   5. [Global] Introduce 'case xxx ... xxx' statement in switch { }
            to replace the 'if {} else {}' statement.
   6. [Global] Replace complex bitwise operation with functions defined in bitops.h
   7. [Global] Introduce array register caches (i.e. s->regs[]) implementation
            to fttsc010, ftrtc011, ftmac110, ftgmac100, ftddrii030
            faraday_a369_kpd and faraday_a369_soc.
   8. [Global] Add qemu_log_mask(LOG_GUEST_ERROR...) on undefined memory accesses.
   9. [Global] Add missing register access size constraint to
            faraday_a369_kpd, faraday_a369_soc, ftahbc020.c, ftddrii030.c,
            ftintc020.c, ftlcdc200.c, ftpwmtmr010.c, ftspi020.c, fttmr010.c
            and fttsc010.c.

10. [Global] Add more register and bitmask descriptions to all the chips.
11. [Global] Rename all the MemoryRegionOps variables to 'mmio_ops'
12. [Global] Update all non-system header includes from '<>' into '""'
13. [bitrev] Port bitrev.[ch] from linux kernel into QEMU.
14. [ftapbbrg020] Replace cpu_physical_memory_read()/cpu_physical_memory_write() with dma_memory_read()/dma_memory_write()
15. [ftdmac020] Replace cpu_physical_memory_read()/cpu_physical_memory_write() with dma_memory_read()/dma_memory_write()
16. [ftgmac100/ftmac110] Replace cpu_physical_memory_read()/cpu_physical_memory_write() with dma_memory_read()/dma_memory_write()
17. [ftgmac100/ftmac110] Add a 10ms timer for polling the owner bit of descriptors to call qemu_flush_queued_packets() when it's necessary.
18. [ftgmac100/ftmac110] Replace hw_error() with qemu_log_mask(LOG_GUEST_ERROR, ) for programmer errors.
19. [ftgmac100/ftmac110] Update descriptor struct for big endian QEMU host support.
20. [ftgmac100/ftmac110] Typo fix ('FTMAC_H' --> 'HW_ARM_FTMAC110_H') to the header files.
21. [ftmac110] Update mdio phy response emulation from Marvell into Davicom PHY.
22. [ftwdt010/fttsc010] Switch to a slower timer. (i.e. rt_clock)

23. [faraday_a360] Removed. The ftmac110 and fttmr010 has been moved to
A369 as external AHB devices.
24. [faraday_a369] Add register caches for AHB/APB slave devices.
25. [faraday_a369] Remember (arm_boot_info *) when launching in direct boot mode.
26. [faraday_a369] Replace pointer to (mach *) with QOM APIs. (i.e. no more DEFINE_PROP_PTR())
27. [faraday_a369] Add a error message for ROM mode when it failed to load image.
28. [faraday_a369] Add the missing AHB remap process into direct boot mode.
29. [faraday_a369] Bug fix to ROM and RAM memory overlap issue.
30. [faraday_a369] Remove system reset order dependency from ftddrii030 and ftahbc020
31. [faraday_a369] Separate the a369 platform implementation into 2 different parts:

              board=faraday_a369.c, and soc=faraday_a369_soc.c

32. [faraday_a369] Copy all the un-used register values from read hardware into QEMU model.
33. [ftssp010] Add address alignment checker.
34. [ftssp010] Move the audio codec initialization code to faraday_a369.c.
35. [ftspi020] Use a constant (CFG_NR_CSLINES) for the number of cs lines.
36. [ftspi020] Replace 's->datacnt <= 0' with '!s->datacnt', because s->datacnt is unsigned.
37. [ftspi020] Replace 's->datacnt' with 's->cmd[2]'
38. [ftspi020] Remove redundant M25P80s command opcodes from the header file.
39. [ftspi020] Replace 'g_new' with 'g_new0' for cs_lines allocation.
This fix the bug which crash the QEMU when de-activating an unattached spi flash chip select. Thanks to Peter.

Changes for v3:

1. [global] review all commit log make sure it correctly describe the QEMU model.
2. [global] reformat the entire patch series to be compilable on its own. Thanks to Andreas and Igor.
3. [global] move all files from 'hw' into 'hw/arm', and rename a36x.c to faraday_a36x.c
4. [global] update lisence to GPLv2+
5. [global] rename both struct and typedef names to CamelCase.
6. [global] turn printfs into DPRINTF() which is controlled by 'DEBUG_FARADAY'
7. [global] remove disabled code.
8. [global] add header files with descriptive defines to

               ftintc020, ftrtc011, fttmr010 ... etc.
   9. [global] update all header file to have a 'HW_ARM_' prefix 
               to header guards.
  10. [faraday.h] add parameter names to ftmac110_init() and
                  ftgmac100_init()

11. [a360/a369] remove printf("xxx %dMB ram.\n"...);
12. [a360/a369] add 'arm926' as a fail-safe cpu model.
13. [a360/a369] add DEFAULT_MACHINE_OPTIONS.
14. [a360/a369] remove USB-EHCI support, it's now a standalone patch.
15. [a360] replace ftlcdc200 init from sysbus_create_varargs() to sysbus_create_simple().
16. [a360] make PMU a standalone file. (faraday_a360_pmu.c)
17. [a369] make SCU a standalone file. (faraday_a369_pcu.c)
18. [a369] make AHBC a standalone file. (ftahbc020.c)
19. [a369] make DDRC a standalone file. (ftddrii030.c)
20. [a369] rename ftkbc010 to faraday_a369_keypad.c
21. [a369] replace ROM emulation with PFLASH.(rom.c is deleted)
22. [ftsdc010] add sd_data_ready() to data R/W.
23. [ftsdc010] check 'datacnt' at each read/write to make sure buffer would not overflow/underflow and also prevent 'datacnt' from underflow by subtracted by a 4.
24. [ftgmac100] add 802.1Q VLAN tag insertion/removal support.
25. [ftgmac100] replace the dumb timer code with bottom half.
26. [ftgmac100] rename the struct name of descriptors to CamelCase.
27. [ftgmac100] replace 'void *' with 'Ftgmac100RXD *' and 'Ftgmac100TXD *' for descriptor read/write.
28. [ftgmac100] add buffer overflow check in ftgmac100_transmit()
29. [ftgmac100] add buffer alignment check
30. [ftmac110] replace the dumb timer code with bottom half.
31. [ftmac110] rename the struct name of descriptors to CamelCase.
32. [ftmac110] replace 'void *' with 'Ftmac110RXD *' and 'Ftmac110TXD *' for descriptor read/write.
33. [ftmac110] add buffer overflow check in ftmac110_transmit()
34. [ftmac110] add buffer alignment check
35. [ftdmac020] replace the dumb timer code with bottom half.
36. [ftdmac020] replace cpu_physical_memory_map() with cpu_physical_memory_read/write() for both simplicity and security enhancement which caused by the un-checked return mapped length from cpu_physical_memory_map().
37. [ftapbbrg020] replace the dumb timer code with bottom half.
38. [ftapbbrg020] replace cpu_physical_memory_map() with cpu_physical_memory_read/write() for both simplicity and security enhancement which caused by the un-checked return mapped length from cpu_physical_memory_map().
39. [ftrtc011] switch to a slower timer with msec resolution. (i.e. rt_clock)
40. [ftrtc011] re-calculate RTC counters from host timestamp upon register read/write and also vm save/restore.

Changes for v2:

1. coding style fixes (verified with checkpatch.pl)
2. add Faraday A360 support
3. add Faraday USB 2.0 EHCI support
4. merge a369_scu.c into a369.c
5. introduce QOM coding style
6. remove lowercase Macros: min(), max()
7. name all struct as CamelCase style
8. move function prototypes from .c to faraday.h
9. use switch instead of if statement in a369_ahbc_write
10. remove debug prints
11. update all uarts in A36x to DEVICE_LITTLE_ENDIAN.
12. move the variable definitions to the start of the function, instead of inside a do { } while(0)
13. remove disabled and commented out code.
14. use hw_error() and exit() upon pflash register failed.
15. add const prior to TypeInfo (i.e. static *const* TypeInfo ftrtc011_info)
16. add le32_to_cpu/cpu_to_le32 to the descriptor processing in

      FTGMAC100/FTMAC110.

17. update the GPL license to GPL v2 (except for FTLCDC200, it's based on pl110.c which is LGPL.)
18. add const to src_* in the DMA controllers (FTAPBBRG020/FTDMAC020)

Kuo-Jung Su (24):
target-arm: add Faraday ARMv5TE processors support hw/arm: add Faraday a369 SoC platform support hw/arm: add FTINTC020 interrupt controller support hw/arm: add FTAHBC020 AHB controller support hw/arm: add FTDDRII030 DDRII controller support hw/arm: add FTPWMTMR010 timer support
hw/arm: add FTWDT010 watchdog timer support hw/arm: add FTRTC011 RTC timer support
tests: add QTest for FTRTC011
hw/arm: add FTDMAC020 AHB DMA support
hw/arm: add FTAPBBRG020 APB DMA support
hw/arm: add FTNANDC021 nand flash controller support hw/arm: add FTI2C010 I2C controller support
hw: Add AudioCodecClass for wm87xx audio class abstration.
hw: add WM8731 audio codec support
hw/arm: add FTSSP010 multi-function controller support qemu/bitops.h: add the bit ordering reversal functions hw/arm: add FTGMAC100 1Gbps ethernet support hw/arm: add FTLCDC200 LCD controller support hw/arm: add FTTSC010 touchscreen controller support hw/arm: add FTSDC010 MMC/SD controller support hw/arm: add FTMAC110 10/100Mbps ethernet support hw/arm: add FTTMR010 timer support
hw/arm: add FTSPI020 SPI flash controller support

 default-configs/arm-softmmu.mak |    1 +
 hw/Makefile.objs                |    2 +
 hw/arm/Makefile.objs            |   21 ++
 hw/arm/faraday.h                |   68 ++++
 hw/arm/faraday_a369.c           |  174 ++++++++++
 hw/arm/faraday_a369_kpd.c       |  235 +++++++++++++
 hw/arm/faraday_a369_scu.c       |  186 +++++++++++
 hw/arm/faraday_a369_soc.c       |  345 +++++++++++++++++++
 hw/arm/ftahbc020.c              |  209 ++++++++++++
 hw/arm/ftapbbrg020.c            |  475 ++++++++++++++++++++++++++
 hw/arm/ftapbbrg020.h            |   44 +++
 hw/arm/ftddrii030.c             |  190 +++++++++++
 hw/arm/ftdmac020.c              |  599 +++++++++++++++++++++++++++++++++
 hw/arm/ftdmac020.h              |  107 ++++++
 hw/arm/ftgmac100.c              |  696 +++++++++++++++++++++++++++++++++++++++
 hw/arm/ftgmac100.h              |  239 ++++++++++++++
 hw/arm/fti2c010.c               |  216 ++++++++++++
 hw/arm/fti2c010.h               |   71 ++++
 hw/arm/ftintc020.c              |  306 +++++++++++++++++
 hw/arm/ftintc020.h              |   57 ++++
 hw/arm/ftkbc010.h               |   44 +++
 hw/arm/ftlcdc200.c              |  513 +++++++++++++++++++++++++++++
 hw/arm/ftlcdc200.h              |  112 +++++++
 hw/arm/ftlcdc200_template.h     |  439 ++++++++++++++++++++++++
 hw/arm/ftmac110.c               |  649 ++++++++++++++++++++++++++++++++++++
 hw/arm/ftmac110.h               |  168 ++++++++++
 hw/arm/ftnandc021.c             |  523 +++++++++++++++++++++++++++++
 hw/arm/ftnandc021.h             |   84 +++++
 hw/arm/ftpwmtmr010.c            |  264 +++++++++++++++
 hw/arm/ftpwmtmr010.h            |   31 ++
 hw/arm/ftrtc011.c               |  392 ++++++++++++++++++++++
 hw/arm/ftrtc011.h               |   53 +++
 hw/arm/ftsdc010.c               |  358 ++++++++++++++++++++
 hw/arm/ftsdc010.h               |   90 +++++
 hw/arm/ftspi020.c               |  340 +++++++++++++++++++
 hw/arm/ftspi020.h               |   81 +++++
 hw/arm/ftssp010.c               |  501 ++++++++++++++++++++++++++++
 hw/arm/ftssp010.h               |   98 ++++++
 hw/arm/fttmr010.c               |  451 +++++++++++++++++++++++++
 hw/arm/fttmr010.h               |   41 +++
 hw/arm/fttsc010.c               |  264 +++++++++++++++
 hw/arm/fttsc010.h               |   39 +++
 hw/arm/ftwdt010.c               |  213 ++++++++++++
 hw/arm/ftwdt010.h               |   35 ++
 hw/arm/spitz.c                  |    9 +-
 hw/arm/z2.c                     |    9 +-
 hw/audio_codec.c                |   81 +++++
 hw/audio_codec.h                |   56 ++++
 hw/i2c.h                        |    9 -
 hw/marvell_88w8618_audio.c      |   23 +-
 hw/wm8731.c                     |  505 ++++++++++++++++++++++++++++
 hw/wm8750.c                     |   91 ++---
 include/qemu/bitops.h           |   59 +++-
 target-arm/cpu.c                |   52 +++
 target-arm/cpu.h                |    6 +-
 target-arm/helper.c             |   84 +++++
 target-arm/machine.c            |    4 +
 tests/Makefile                  |    3 +
 tests/ftrtc011-test.c           |  410 +++++++++++++++++++++++
 59 files changed, 11355 insertions(+), 70 deletions(-)
 create mode 100644 hw/arm/faraday.h
 create mode 100644 hw/arm/faraday_a369.c
 create mode 100644 hw/arm/faraday_a369_kpd.c
 create mode 100644 hw/arm/faraday_a369_scu.c
 create mode 100644 hw/arm/faraday_a369_soc.c
 create mode 100644 hw/arm/ftahbc020.c
 create mode 100644 hw/arm/ftapbbrg020.c
 create mode 100644 hw/arm/ftapbbrg020.h
 create mode 100644 hw/arm/ftddrii030.c
 create mode 100644 hw/arm/ftdmac020.c
 create mode 100644 hw/arm/ftdmac020.h
 create mode 100644 hw/arm/ftgmac100.c
 create mode 100644 hw/arm/ftgmac100.h
 create mode 100644 hw/arm/fti2c010.c
 create mode 100644 hw/arm/fti2c010.h
 create mode 100644 hw/arm/ftintc020.c
 create mode 100644 hw/arm/ftintc020.h
 create mode 100644 hw/arm/ftkbc010.h
 create mode 100644 hw/arm/ftlcdc200.c
 create mode 100644 hw/arm/ftlcdc200.h
 create mode 100644 hw/arm/ftlcdc200_template.h
 create mode 100644 hw/arm/ftmac110.c
 create mode 100644 hw/arm/ftmac110.h
 create mode 100644 hw/arm/ftnandc021.c
 create mode 100644 hw/arm/ftnandc021.h
 create mode 100644 hw/arm/ftpwmtmr010.c
 create mode 100644 hw/arm/ftpwmtmr010.h
 create mode 100644 hw/arm/ftrtc011.c
 create mode 100644 hw/arm/ftrtc011.h
 create mode 100644 hw/arm/ftsdc010.c
 create mode 100644 hw/arm/ftsdc010.h
 create mode 100644 hw/arm/ftspi020.c
 create mode 100644 hw/arm/ftspi020.h
 create mode 100644 hw/arm/ftssp010.c
 create mode 100644 hw/arm/ftssp010.h
 create mode 100644 hw/arm/fttmr010.c
 create mode 100644 hw/arm/fttmr010.h
 create mode 100644 hw/arm/fttsc010.c
 create mode 100644 hw/arm/fttsc010.h
 create mode 100644 hw/arm/ftwdt010.c
 create mode 100644 hw/arm/ftwdt010.h
 create mode 100644 hw/audio_codec.c
 create mode 100644 hw/audio_codec.h
 create mode 100644 hw/wm8731.c
 create mode 100644 tests/ftrtc011-test.c
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH v7 1/24 target-arm: add Faraday ARMv5TE processors support

From: Kuo-Jung Su <[email protected]>

This patch includes the single core support to FA606TE, FA626TE, FA616TE and FA726TE with CP15 Faraday extensions (AUX and I/D-Scratchpad).

---
 target-arm/cpu.c     |   52 +++++++++++++++++++++++++++++++
 target-arm/cpu.h     |    6 +++-
 target-arm/helper.c  |   84 ++++++++++++++++++++++++++++++++++++++++++++++++++
 target-arm/machine.c |    4 +++
 4 files changed, 145 insertions(+), 1 deletion(-)
target-arm/cpu.c +52 -0
index 5dfcb74..99b7244 100644
@@ -244,6 +244,54 @@ static void arm926_initfn(Object *obj)
     cpu->reset_sctlr = 0x00090078;
 }
 
+static void fa606te_initfn(Object *obj)
+{
+    ARMCPU *cpu = ARM_CPU(obj);
+    set_feature(&cpu->env, ARM_FEATURE_V5);
+    set_feature(&cpu->env, ARM_FEATURE_DUMMY_C15_REGS);
+    set_feature(&cpu->env, ARM_FEATURE_MPU_FARADAY);
+    cpu->midr = 0x66056061; /* CR0-0 Identification Code Register (ID) */
+    cpu->ctr = 0x00000000;  /* CR0-1 Cache Type Register (CTR) */
+    cpu->reset_sctlr = 0x00000078;  /* CR1-0 Configuration Register (CFG) */
+}
+
+static void fa616te_initfn(Object *obj)
+{
+    ARMCPU *cpu = ARM_CPU(obj);
+    set_feature(&cpu->env, ARM_FEATURE_V5);
+    set_feature(&cpu->env, ARM_FEATURE_DUMMY_C15_REGS);
+    set_feature(&cpu->env, ARM_FEATURE_CACHE_TEST_CLEAN);
+    set_feature(&cpu->env, ARM_FEATURE_TCM_FARADAY);
+    cpu->midr = 0x66056161; /* CR0-0 Identification Code Register (ID) */
+    cpu->ctr = 0x1d152152;  /* CR0-1 Cache Type Register (CTR) */
+    cpu->reset_sctlr = 0x00050078;  /* CR1-0 Configuration Register (CFG) */
+}
+
+static void fa626te_initfn(Object *obj)
+{
+    ARMCPU *cpu = ARM_CPU(obj);
+    set_feature(&cpu->env, ARM_FEATURE_V5);
+    set_feature(&cpu->env, ARM_FEATURE_DUMMY_C15_REGS);
+    set_feature(&cpu->env, ARM_FEATURE_CACHE_TEST_CLEAN);
+    set_feature(&cpu->env, ARM_FEATURE_TCM_FARADAY);
+    set_feature(&cpu->env, ARM_FEATURE_AUXCR);
+    cpu->midr = 0x66056261; /* CR0-0 Identification Code Register (ID) */
+    cpu->ctr = 0x0f192192;  /* CR0-1 Cache Type Register (CTR) */
+    cpu->reset_sctlr = 0x00000078;  /* CR1-0 Configuration Register (CFG) */
+}
+
+static void fa726te_initfn(Object *obj)
+{
+    ARMCPU *cpu = ARM_CPU(obj);
+    set_feature(&cpu->env, ARM_FEATURE_V5);
+    set_feature(&cpu->env, ARM_FEATURE_DUMMY_C15_REGS);
+    set_feature(&cpu->env, ARM_FEATURE_CACHE_TEST_CLEAN);
+    set_feature(&cpu->env, ARM_FEATURE_TCM_FARADAY);
+    cpu->midr = 0x66057261; /* CR0-0 Identification Code Register (ID) */
+    cpu->ctr = 0x1d192192;  /* CR0-1 Cache Type Register (CTR) */
+    cpu->reset_sctlr = 0x00050078;  /* CR1-0 Configuration Register (CFG) */
+}
+
 static void arm946_initfn(Object *obj)
 {
     ARMCPU *cpu = ARM_CPU(obj);
@@ -756,6 +804,10 @@ typedef struct ARMCPUInfo {
 
 static const ARMCPUInfo arm_cpus[] = {
     { .name = "arm926",      .initfn = arm926_initfn },
+    { .name = "fa606te",     .initfn = fa606te_initfn },
+    { .name = "fa616te",     .initfn = fa616te_initfn },
+    { .name = "fa626te",     .initfn = fa626te_initfn },
+    { .name = "fa726te",     .initfn = fa726te_initfn },
     { .name = "arm946",      .initfn = arm946_initfn },
     { .name = "arm1026",     .initfn = arm1026_initfn },
     /* What QEMU calls "arm1136-r2" is actually the 1136 r0p2, i.e. an
target-arm/cpu.h +5 -1
index c28a0d9..e4c43ef 100644
@@ -152,6 +152,8 @@ typedef struct CPUARMState {
         uint32_t c15_diagnostic; /* diagnostic register */
         uint32_t c15_power_diagnostic;
         uint32_t c15_power_control; /* power control */
+        uint32_t c15_tcm_data;      /* Data TCM region register */
+        uint32_t c15_tcm_inst;      /* Instruction TCM region register */
     } cp15;
 
     struct {
@@ -393,6 +395,8 @@ enum arm_features {
     ARM_FEATURE_MPIDR, /* has cp15 MPIDR */
     ARM_FEATURE_PXN, /* has Privileged Execute Never bit */
     ARM_FEATURE_LPAE, /* has Large Physical Address Extension */
+    ARM_FEATURE_TCM_FARADAY, /* Faraday Scratchpad(TCM) */
+    ARM_FEATURE_MPU_FARADAY, /* Faraday MPU */
 };
 
 static inline int arm_feature(CPUARMState *env, int feature)
@@ -641,7 +645,7 @@ static inline CPUARMState *cpu_init(const char *cpu_model)
 #define cpu_signal_handler cpu_arm_signal_handler
 #define cpu_list arm_cpu_list
 
-#define CPU_SAVE_VERSION 9
+#define CPU_SAVE_VERSION 10
 
 /* MMU modes definitions */
 #define MMU_MODE0_SUFFIX _kernel
target-arm/helper.c +84 -0

96 lines not on this page · raw message

target-arm/machine.c +4 -0
index 68dca7f..ed63614 100644
@@ -62,6 +62,8 @@ void cpu_save(QEMUFile *f, void *opaque)
     qemu_put_be32(f, env->cp15.c15_power_control);
     qemu_put_be32(f, env->cp15.c15_diagnostic);
     qemu_put_be32(f, env->cp15.c15_power_diagnostic);
+    qemu_put_be32(f, env->cp15.c15_tcm_data);
+    qemu_put_be32(f, env->cp15.c15_tcm_inst);
 
     qemu_put_be64(f, env->features);
 
@@ -182,6 +184,8 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id)
     env->cp15.c15_power_control = qemu_get_be32(f);
     env->cp15.c15_diagnostic = qemu_get_be32(f);
     env->cp15.c15_power_diagnostic = qemu_get_be32(f);
+    env->cp15.c15_tcm_data = qemu_get_be32(f);
+    env->cp15.c15_tcm_inst = qemu_get_be32(f);
 
     env->features = qemu_get_be64(f);
 
Signature · 1 line
1.7.9.5
#2 lore raw

PATCH v7 2/24 hw/arm: add Faraday a369 SoC platform support

In reply to Kuo-Jung Su

From: Kuo-Jung Su <[email protected]>

The Faraday A369 EVB is a Faraday SoC platform evalution board used for Faraday IP functional verification based on the well-known ARM AMBA 2.0 architecture.

---
 hw/arm/Makefile.objs      |    3 +
 hw/arm/faraday.h          |   59 ++++++++++++
 hw/arm/faraday_a369.c     |   98 +++++++++++++++++++
 hw/arm/faraday_a369_kpd.c |  235 +++++++++++++++++++++++++++++++++++++++++++++
 hw/arm/faraday_a369_scu.c |  186 +++++++++++++++++++++++++++++++++++
 hw/arm/faraday_a369_soc.c |  193 +++++++++++++++++++++++++++++++++++++
 hw/arm/ftkbc010.h         |   44 +++++++++
 7 files changed, 818 insertions(+)
 create mode 100644 hw/arm/faraday.h
 create mode 100644 hw/arm/faraday_a369.c
 create mode 100644 hw/arm/faraday_a369_kpd.c
 create mode 100644 hw/arm/faraday_a369_scu.c
 create mode 100644 hw/arm/faraday_a369_soc.c
 create mode 100644 hw/arm/ftkbc010.h
hw/arm/Makefile.objs +3 -0
index f5f7d0e..104e0e7 100644
@@ -34,3 +34,6 @@ 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 += omap1.o omap2.o
+
+obj-y += faraday_a369.o faraday_a369_soc.o faraday_a369_scu.o \
+            faraday_a369_kpd.o
hw/arm/faraday.h new file +59 -0

59 lines not on this page · raw message

hw/arm/faraday_a369.c new file +98 -0

98 lines not on this page · raw message

hw/arm/faraday_a369_kpd.c new file +235 -0

235 lines not on this page · raw message

hw/arm/faraday_a369_scu.c new file +186 -0

186 lines not on this page · raw message

hw/arm/faraday_a369_soc.c new file +193 -0

193 lines not on this page · raw message

hw/arm/ftkbc010.h new file +44 -0

44 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#3 lore raw

PATCH v7 3/24 hw/arm: add FTINTC020 interrupt controller support

In reply to Kuo-Jung Su

From: Kuo-Jung Su <[email protected]>

The FTINTC020 interrupt controller supports both FIQ and IRQ signals to the microprocessor.
It can handle up to 64 configurable IRQ sources and 64 FIQ sources. The output signals to the microprocessor can be configured as level-high/low active or edge-rising/falling triggered.

---
 hw/arm/Makefile.objs      |    1 +
 hw/arm/faraday_a369_soc.c |   11 ++
 hw/arm/ftintc020.c        |  306 +++++++++++++++++++++++++++++++++++++++++++++
 hw/arm/ftintc020.h        |   57 +++++++++
 4 files changed, 375 insertions(+)
 create mode 100644 hw/arm/ftintc020.c
 create mode 100644 hw/arm/ftintc020.h
hw/arm/Makefile.objs +1 -0
index 104e0e7..536d6cf 100644
@@ -37,3 +37,4 @@ obj-y += omap1.o omap2.o
 
 obj-y += faraday_a369.o faraday_a369_soc.o faraday_a369_scu.o \
             faraday_a369_kpd.o
+obj-y += ftintc020.o
hw/arm/faraday_a369_soc.c +11 -0
index c0309e3..d3187b2 100644
@@ -72,6 +72,8 @@ a369soc_device_init(FaradaySoCState *s)
 {
     DriveInfo *dinfo;
     DeviceState *ds;
+    qemu_irq *cpu_pic;
+    int i;
 
     s->as = get_system_memory();
     s->ram = g_new(MemoryRegion, 1);
@@ -111,6 +113,15 @@ a369soc_device_init(FaradaySoCState *s)
         exit(1);
     }
 
+    /* Interrupt Controller */
+    cpu_pic = arm_pic_init_cpu(s->cpu);
+    ds = sysbus_create_varargs("ftintc020", 0x90100000,
+                               cpu_pic[ARM_PIC_CPU_IRQ],
+                               cpu_pic[ARM_PIC_CPU_FIQ], NULL);
+    for (i = 0; i < ARRAY_SIZE(s->pic); ++i) {
+        s->pic[i] = qdev_get_gpio_in(ds, i);
+    }
+
     /* Serial (FTUART010 which is 16550A compatible) */
     if (serial_hds[0]) {
         serial_mm_init(s->as,
hw/arm/ftintc020.c new file +306 -0

306 lines not on this page · raw message

hw/arm/ftintc020.h new file +57 -0

57 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#4 lore raw

PATCH v7 4/24 hw/arm: add FTAHBC020 AHB controller support

In reply to Kuo-Jung Su

From: Kuo-Jung Su <[email protected]>

It's used to perform AHB remap and QEMU RAM initialization when the SDRAM is initialized before AHB remap process activated.

---
 hw/arm/Makefile.objs      |    1 +
 hw/arm/faraday_a369_soc.c |   10 +++
 hw/arm/ftahbc020.c        |  209 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 220 insertions(+)
 create mode 100644 hw/arm/ftahbc020.c
hw/arm/Makefile.objs +1 -0
index 536d6cf..af36b01 100644
@@ -38,3 +38,4 @@ obj-y += omap1.o omap2.o
 obj-y += faraday_a369.o faraday_a369_soc.o faraday_a369_scu.o \
             faraday_a369_kpd.o
 obj-y += ftintc020.o
+obj-y += ftahbc020.o
hw/arm/faraday_a369_soc.c +10 -0
index d3187b2..6de2f4f 100644
@@ -70,6 +70,7 @@ static void a369soc_reset(DeviceState *ds)
 static void
 a369soc_device_init(FaradaySoCState *s)
 {
+    Error *local_errp = NULL;
     DriveInfo *dinfo;
     DeviceState *ds;
     qemu_irq *cpu_pic;
@@ -148,6 +149,15 @@ a369soc_device_init(FaradaySoCState *s)
 
     /* ftkbc010 */
     ds = sysbus_create_simple("a369.kpd", 0x92f00000, s->pic[21]);
+
+    /* ftahbc020 */
+    ds = sysbus_create_simple("ftahbc020", 0x94000000, NULL);
+    s->ahbc = ds;
+    object_property_set_link(OBJECT(ds), OBJECT(s), "soc", &local_errp);
+    if (local_errp) {
+        fprintf(stderr, "a369soc: Unable to set soc link for FTAHBC020\n");
+        exit(1);
+    }
 }
 
 static int a369soc_init(SysBusDevice *dev)
hw/arm/ftahbc020.c new file +209 -0

209 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#5 lore raw

PATCH v7 5/24 hw/arm: add FTDDRII030 DDRII controller support

In reply to Kuo-Jung Su

From: Kuo-Jung Su <[email protected]>

The FTDDRII030 is a DDRII SDRAM controller which is responsible for SDRAM initialization.
In QEMU we emulate only the SDRAM enable function.

---
 hw/arm/Makefile.objs      |    1 +
 hw/arm/faraday_a369_soc.c |    9 +++
 hw/arm/ftddrii030.c       |  190 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 200 insertions(+)
 create mode 100644 hw/arm/ftddrii030.c
hw/arm/Makefile.objs +1 -0
index af36b01..0bbf838 100644
@@ -39,3 +39,4 @@ obj-y += faraday_a369.o faraday_a369_soc.o faraday_a369_scu.o \
             faraday_a369_kpd.o
 obj-y += ftintc020.o
 obj-y += ftahbc020.o
+obj-y += ftddrii030.o
hw/arm/faraday_a369_soc.c +9 -0
index 6de2f4f..46600d7 100644
@@ -158,6 +158,15 @@ a369soc_device_init(FaradaySoCState *s)
         fprintf(stderr, "a369soc: Unable to set soc link for FTAHBC020\n");
         exit(1);
     }
+
+    /* ftddrii030 */
+    ds = sysbus_create_simple("ftddrii030", 0x93100000, NULL);
+    s->ddrc = ds;
+    object_property_set_link(OBJECT(ds), OBJECT(s), "soc", &local_errp);
+    if (local_errp) {
+        fprintf(stderr, "a369soc: Unable to set soc link for FTDDRII030\n");
+        exit(1);
+    }
 }
 
 static int a369soc_init(SysBusDevice *dev)
hw/arm/ftddrii030.c new file +190 -0

190 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#6 lore raw

PATCH v7 6/24 hw/arm: add FTPWMTMR010 timer support

In reply to Kuo-Jung Su

From: Kuo-Jung Su <[email protected]>

The FTPWMTMR010 is an APB device which provides up to 8 independent timers.

---
 hw/arm/Makefile.objs      |    1 +
 hw/arm/faraday_a369_soc.c |   10 ++
 hw/arm/ftpwmtmr010.c      |  264 +++++++++++++++++++++++++++++++++++++++++++++
 hw/arm/ftpwmtmr010.h      |   31 ++++++
 4 files changed, 306 insertions(+)
 create mode 100644 hw/arm/ftpwmtmr010.c
 create mode 100644 hw/arm/ftpwmtmr010.h
hw/arm/Makefile.objs +1 -0
index 0bbf838..bc18e22 100644
@@ -40,3 +40,4 @@ obj-y += faraday_a369.o faraday_a369_soc.o faraday_a369_scu.o \
 obj-y += ftintc020.o
 obj-y += ftahbc020.o
 obj-y += ftddrii030.o
+obj-y += ftpwmtmr010.o
hw/arm/faraday_a369_soc.c +10 -0
index 46600d7..4ded777 100644
@@ -167,6 +167,16 @@ a369soc_device_init(FaradaySoCState *s)
         fprintf(stderr, "a369soc: Unable to set soc link for FTDDRII030\n");
         exit(1);
     }
+
+    /* Timer */
+    ds = qdev_create(NULL, "ftpwmtmr010");
+    qdev_prop_set_uint32(ds, "freq", 66 * 1000000);
+    qdev_init_nofail(ds);
+    sysbus_mmio_map(SYS_BUS_DEVICE(ds), 0, 0x92300000);
+    sysbus_connect_irq(SYS_BUS_DEVICE(ds), 0, s->pic[8]);
+    sysbus_connect_irq(SYS_BUS_DEVICE(ds), 1, s->pic[9]);
+    sysbus_connect_irq(SYS_BUS_DEVICE(ds), 2, s->pic[10]);
+    sysbus_connect_irq(SYS_BUS_DEVICE(ds), 3, s->pic[11]);
 }
 
 static int a369soc_init(SysBusDevice *dev)
hw/arm/ftpwmtmr010.c new file +264 -0

264 lines not on this page · raw message

hw/arm/ftpwmtmr010.h new file +31 -0
new file mode 100644
index 0000000..a435a70
@@ -0,0 +1,31 @@
+/*
+ * Faraday FTPWMTMR010 Timer.
+ *
+ * Copyright (c) 2012 Faraday Technology
+ * Written by Dante Su <[email protected]>
+ *
+ * This code is licensed under GNU GPL v2+.
+ */
+
+#ifndef HW_ARM_FTPWMTMR010_H
+#define HW_ARM_FTPWMTMR010_H
+
+#include "qemu/bitops.h"
+
+#define REG_SR              0x00    /* status register */
+#define REG_REVR            0x90    /* revision register */
+
+#define REG_TIMER_BASE(id)  (0x00 + ((id) << 4))
+#define REG_TIMER_CTRL      0x00
+#define REG_TIMER_CNTB      0x04
+#define REG_TIMER_CMPB      0x08
+#define REG_TIMER_CNTO      0x0C
+
+#define TIMER_CTRL_EXTCK        BIT(0)  /* external clock */
+#define TIMER_CTRL_START        BIT(1)
+#define TIMER_CTRL_UPDATE       BIT(2)
+#define TIMER_CTRL_AUTORELOAD   BIT(4)
+#define TIMER_CTRL_INTR         BIT(5)  /* interrupt enabled */
+#define TIMER_CTRL_INTR_EDGE    BIT(6)  /* interrupt type: 1=edge 0=level */
+
+#endif
Signature · 1 line
1.7.9.5
#7 lore raw

PATCH v7 7/24 hw/arm: add FTWDT010 watchdog timer support

In reply to Kuo-Jung Su

From: Kuo-Jung Su <[email protected]>

The FTWDT010 is used to prevent system from infinite loop while software gets trapped in the deadlock.

Under the normal operation, users should restart FTWDT010 at the regular intervals before counter counts down to 0.

If the counter does reach 0, FTWDT010 will try to reset the system by generating one or a combination of signals, system reset, system interrupt, and external interrupt.

---
 hw/arm/Makefile.objs      |    1 +
 hw/arm/faraday_a369_soc.c |   14 +++
 hw/arm/ftwdt010.c         |  213 +++++++++++++++++++++++++++++++++++++++++++++
 hw/arm/ftwdt010.h         |   35 ++++++++
 4 files changed, 263 insertions(+)
 create mode 100644 hw/arm/ftwdt010.c
 create mode 100644 hw/arm/ftwdt010.h
hw/arm/Makefile.objs +1 -0
index bc18e22..bd330f2 100644
@@ -41,3 +41,4 @@ obj-y += ftintc020.o
 obj-y += ftahbc020.o
 obj-y += ftddrii030.o
 obj-y += ftpwmtmr010.o
+obj-y += ftwdt010.o
hw/arm/faraday_a369_soc.c +14 -0
index 4ded777..35549d8 100644
@@ -68,6 +68,16 @@ static void a369soc_reset(DeviceState *ds)
 }
 
 static void
+a369soc_system_reset(void *opaque)
+{
+    FaradaySoCState *s = FARADAY_SOC(opaque);
+
+    if (s->cpu) {
+        cpu_reset(CPU(s->cpu));
+    }
+}
+
+static void
 a369soc_device_init(FaradaySoCState *s)
 {
     Error *local_errp = NULL;
@@ -177,6 +187,10 @@ a369soc_device_init(FaradaySoCState *s)
     sysbus_connect_irq(SYS_BUS_DEVICE(ds), 1, s->pic[9]);
     sysbus_connect_irq(SYS_BUS_DEVICE(ds), 2, s->pic[10]);
     sysbus_connect_irq(SYS_BUS_DEVICE(ds), 3, s->pic[11]);
+
+    /* ftwdt010 */
+    sysbus_create_simple("ftwdt010", 0x92200000, s->pic[46]);
+    qemu_register_reset(a369soc_system_reset, s);
 }
 
 static int a369soc_init(SysBusDevice *dev)
hw/arm/ftwdt010.c new file +213 -0

213 lines not on this page · raw message

hw/arm/ftwdt010.h new file +35 -0
new file mode 100644
index 0000000..46c0871
@@ -0,0 +1,35 @@
+/*
+ * QEMU model of the FTWDT010 WatchDog Timer
+ *
+ * Copyright (C) 2012 Faraday Technology
+ * Written by Dante Su <[email protected]>
+ *
+ * This file is licensed under GNU GPL v2+.
+ */
+
+#ifndef HW_ARM_FTWDT010_H
+#define HW_ARM_FTWDT010_H
+
+#include "qemu/bitops.h"
+
+/* Hardware registers */
+#define REG_COUNTER     0x00    /* counter register */
+#define REG_LOAD        0x04    /* (re)load register */
+#define REG_RESTART     0x08    /* restart register */
+#define REG_CR          0x0C    /* control register */
+#define REG_SR          0x10    /* status register */
+#define REG_SCR         0x14    /* status clear register */
+#define REG_INTR_LEN    0x18    /* interrupt length register */
+#define REG_REVR        0x1C    /* revision register */
+
+#define CR_CLKS         BIT(4)  /* clock source */
+#define CR_ESIG         BIT(3)  /* external signal enabled */
+#define CR_INTR         BIT(2)  /* system reset interrupt enabled */
+#define CR_SRST         BIT(1)  /* system reset enabled */
+#define CR_EN           BIT(0)  /* chip enabled */
+
+#define SR_SRST         BIT(1)  /* system reset */
+
+#define WDT_MAGIC       0x5ab9  /* magic for watchdog restart */
+
+#endif
Signature · 1 line
1.7.9.5
#8 lore raw

PATCH v7 8/24 hw/arm: add FTRTC011 RTC timer support

In reply to Kuo-Jung Su

From: Kuo-Jung Su <[email protected]>

It provides separate second, minute, hour, and day counters. The second counter is toggled each second, the minute counter is toggled each minute, the hour counter is toggled each hour, and the day counter is toggled each day.

The FTRTC011 provides a programmable auto-alarm function. When the second auto-alarm function is turned on, the RTC will automatically trigger an interrupt each second. The automatic minute and hour alarms can be turned on as well.

---
 hw/arm/Makefile.objs      |    1 +
 hw/arm/faraday_a369_soc.c |   18 +++
 hw/arm/ftrtc011.c         |  392 +++++++++++++++++++++++++++++++++++++++++++++
 hw/arm/ftrtc011.h         |   53 ++++++
 4 files changed, 464 insertions(+)
 create mode 100644 hw/arm/ftrtc011.c
 create mode 100644 hw/arm/ftrtc011.h
hw/arm/Makefile.objs +1 -0
index bd330f2..b01da9d 100644
@@ -42,3 +42,4 @@ obj-y += ftahbc020.o
 obj-y += ftddrii030.o
 obj-y += ftpwmtmr010.o
 obj-y += ftwdt010.o
+obj-y += ftrtc011.o
hw/arm/faraday_a369_soc.c +18 -0
index 35549d8..0c15e7d 100644
@@ -191,6 +191,24 @@ a369soc_device_init(FaradaySoCState *s)
     /* ftwdt010 */
     sysbus_create_simple("ftwdt010", 0x92200000, s->pic[46]);
     qemu_register_reset(a369soc_system_reset, s);
+
+    /* ftrtc011 */
+    ds = qdev_create(NULL, "ftrtc011");
+    /* Setup QOM path for QTest */
+    object_property_add_child(OBJECT(s),
+                              "ftrtc011",
+                              OBJECT(ds),
+                              NULL);
+    qdev_init_nofail(ds);
+    sysbus_mmio_map(SYS_BUS_DEVICE(ds), 0, 0x92100000);
+    /* Alarm (Edge) */
+    sysbus_connect_irq(SYS_BUS_DEVICE(ds), 1, s->pic[42]);
+    /* Second (Edge) */
+    sysbus_connect_irq(SYS_BUS_DEVICE(ds), 2, s->pic[43]);
+    /* Minute (Edge) */
+    sysbus_connect_irq(SYS_BUS_DEVICE(ds), 3, s->pic[44]);
+    /* Hour (Edge) */
+    sysbus_connect_irq(SYS_BUS_DEVICE(ds), 4, s->pic[45]);
 }
 
 static int a369soc_init(SysBusDevice *dev)
hw/arm/ftrtc011.c new file +392 -0

392 lines not on this page · raw message

hw/arm/ftrtc011.h new file +53 -0

53 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#9 lore raw

PATCH v7 9/24 tests: add QTest for FTRTC011

In reply to Kuo-Jung Su

From: Kuo-Jung Su <[email protected]>

The FTRTC011 QEMU model is implemented without calender functions. It acts in counter mode only, all the time & timezone conversion relies on the c runtime library. (i.e. mktime(), localtime() ...etc)

---
 tests/Makefile        |    3 +
 tests/ftrtc011-test.c |  410 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 413 insertions(+)
 create mode 100644 tests/ftrtc011-test.c
tests/Makefile +3 -0
index 567e36e..5d0776e 100644
@@ -75,6 +75,8 @@ gcov-files-sparc-y += hw/m48t59.c
 gcov-files-sparc64-y += hw/m48t59.c
 check-qtest-arm-y = tests/tmp105-test$(EXESUF)
 gcov-files-arm-y += hw/tmp105.c
+check-qtest-arm-y = tests/ftrtc011-test$(EXESUF)
+gcov-files-arm-y += hw/arm/ftrtc011.c
 
 GENERATED_HEADERS += tests/test-qapi-types.h tests/test-qapi-visit.h tests/test-qmp-commands.h
 
@@ -133,6 +135,7 @@ tests/m48t59-test$(EXESUF): tests/m48t59-test.o
 tests/fdc-test$(EXESUF): tests/fdc-test.o
 tests/hd-geo-test$(EXESUF): tests/hd-geo-test.o
 tests/tmp105-test$(EXESUF): tests/tmp105-test.o
+tests/ftrtc011-test$(EXESUF): tests/ftrtc011-test.o
 
 # QTest rules
 
tests/ftrtc011-test.c new file +410 -0

410 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#10 lore raw

PATCH v7 10/24 hw/arm: add FTDMAC020 AHB DMA support

In reply to Kuo-Jung Su

From: Kuo-Jung Su <[email protected]>

The Faraday FTDMAC020 provides eight configurable channels for the memory-to-memory, memory-to-peripheral, peripheral-to-peripheral, and peripheral-to-memory transfers.

Each DMA channel supports chain transfer and can be programmed to one of the 16 handshaking channels in the hardware handshake mode.

The main function of the hardware handshake mode is to provide an indication of the device status. Users can also disable the hardware handshake mode by programming the register when a DMA transfer is not necessary of referring to the handshaking channels.

---
 hw/arm/Makefile.objs      |    1 +
 hw/arm/faraday_a369_soc.c |   14 ++
 hw/arm/ftdmac020.c        |  599 +++++++++++++++++++++++++++++++++++++++++++++
 hw/arm/ftdmac020.h        |  107 ++++++++
 4 files changed, 721 insertions(+)
 create mode 100644 hw/arm/ftdmac020.c
 create mode 100644 hw/arm/ftdmac020.h
hw/arm/Makefile.objs +1 -0
index b01da9d..7a6e94a 100644
@@ -43,3 +43,4 @@ obj-y += ftddrii030.o
 obj-y += ftpwmtmr010.o
 obj-y += ftwdt010.o
 obj-y += ftrtc011.o
+obj-y += ftdmac020.o
hw/arm/faraday_a369_soc.c +14 -0
index 0c15e7d..b0d0ff6 100644
@@ -209,6 +209,20 @@ a369soc_device_init(FaradaySoCState *s)
     sysbus_connect_irq(SYS_BUS_DEVICE(ds), 3, s->pic[44]);
     /* Hour (Edge) */
     sysbus_connect_irq(SYS_BUS_DEVICE(ds), 4, s->pic[45]);
+
+    /* ftdmac020 */
+    s->hdma[0] = sysbus_create_varargs("ftdmac020",
+                                       0x90300000,
+                                       s->pic[0],  /* ALL (NC in A369) */
+                                       s->pic[15], /* TC */
+                                       s->pic[16], /* ERR */
+                                       NULL);
+    s->hdma[1] = sysbus_create_varargs("ftdmac020",
+                                       0x96100000,
+                                       s->pic[0],  /* ALL (NC in A369) */
+                                       s->pic[17], /* TC */
+                                       s->pic[18], /* ERR */
+                                       NULL);
 }
 
 static int a369soc_init(SysBusDevice *dev)
hw/arm/ftdmac020.c new file +599 -0

599 lines not on this page · raw message

hw/arm/ftdmac020.h new file +107 -0

107 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#11 lore raw

PATCH v7 11/24 hw/arm: add FTAPBBRG020 APB DMA support

In reply to Kuo-Jung Su

From: Kuo-Jung Su <[email protected]>

The FTAPBBRG020 supports the DMA functions for the AHB-to-AHB, AHB-to-APB, APB-to-AHB, and APB-to-APB transactions.

The DMA engine can support up to 4 DMA channels (A, B, C, and D) and 15 handshaking channels. A DMA channel granted by the arbiter block is the only channel starts transfers. Each DMA channel can be programmed to one of the 15 handshaking channels in the hardware handshake mode to act as the source device or act as the destination device.

The main function of the hardware handshake mode is to provide an indication of the device status. Users can also disable the hardware handshake mode by programming the register when a DMA transfer is not necessary of referring to the handshaking channels.

---
 hw/arm/Makefile.objs      |    1 +
 hw/arm/faraday_a369_soc.c |    9 +
 hw/arm/ftapbbrg020.c      |  475 +++++++++++++++++++++++++++++++++++++++++++++
 hw/arm/ftapbbrg020.h      |   44 +++++
 4 files changed, 529 insertions(+)
 create mode 100644 hw/arm/ftapbbrg020.c
 create mode 100644 hw/arm/ftapbbrg020.h
hw/arm/Makefile.objs +1 -0
index 7a6e94a..cc5e343 100644
@@ -44,3 +44,4 @@ obj-y += ftpwmtmr010.o
 obj-y += ftwdt010.o
 obj-y += ftrtc011.o
 obj-y += ftdmac020.o
+obj-y += ftapbbrg020.o
hw/arm/faraday_a369_soc.c +9 -0
index b0d0ff6..ab13f70 100644
@@ -223,6 +223,15 @@ a369soc_device_init(FaradaySoCState *s)
                                        s->pic[17], /* TC */
                                        s->pic[18], /* ERR */
                                        NULL);
+
+    /* ftapbbrg020 */
+    ds = sysbus_create_simple("ftapbbrg020", 0x90f00000, s->pic[14]);
+    s->pdma[0] = ds;
+    object_property_set_link(OBJECT(ds), OBJECT(s), "soc", &local_errp);
+    if (local_errp) {
+        fprintf(stderr, "a369soc: Unable to set soc link for FTAPBBRG020\n");
+        exit(1);
+    }
 }
 
 static int a369soc_init(SysBusDevice *dev)
hw/arm/ftapbbrg020.c new file +475 -0

475 lines not on this page · raw message

hw/arm/ftapbbrg020.h new file +44 -0

44 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#12 lore raw

PATCH v7 12/24 hw/arm: add FTNANDC021 nand flash controller support

In reply to Kuo-Jung Su

From: Kuo-Jung Su <[email protected]>

The FTNANDC021 is an integrated NAND flash controller which re-pack the NAND flash command set with a shorter built-in opcode. It also provides a register base interface for user to easily access the underlying NAND flash chips, and also supports HW ECC.

However the optional hardware ECC function is not implemented.

---
 hw/arm/Makefile.objs      |    1 +
 hw/arm/faraday_a369.c     |   14 ++
 hw/arm/faraday_a369_soc.c |    9 +
 hw/arm/ftnandc021.c       |  523 +++++++++++++++++++++++++++++++++++++++++++++
 hw/arm/ftnandc021.h       |   84 ++++++++
 5 files changed, 631 insertions(+)
 create mode 100644 hw/arm/ftnandc021.c
 create mode 100644 hw/arm/ftnandc021.h
hw/arm/Makefile.objs +1 -0
index cc5e343..2622f3f 100644
@@ -45,3 +45,4 @@ obj-y += ftwdt010.o
 obj-y += ftrtc011.o
 obj-y += ftdmac020.o
 obj-y += ftapbbrg020.o
+obj-y += ftnandc021.o
hw/arm/faraday_a369.c +14 -0
index 8f8ea4f..a13e946 100644
@@ -25,6 +25,8 @@ a369_board_init(QEMUMachineInitArgs *args)
 {
     DeviceState *ds;
     FaradaySoCState *s;
+    DriveInfo *dinfo;
+    Error *local_errp = NULL;
 
     if (!args->cpu_model) {
         args->cpu_model = "fa626te";
@@ -46,6 +48,18 @@ a369_board_init(QEMUMachineInitArgs *args)
 
     s = FARADAY_SOC(ds);
 
+    /* Attach the nand flash to ftnandc021 */
+    dinfo = drive_get_next(IF_MTD);
+    ds = nand_init(dinfo ? dinfo->bdrv : NULL, NAND_MFR_SAMSUNG, 0xda);
+    object_property_set_link(OBJECT(s->nandc[0]),
+                             OBJECT(ds),
+                             "flash",
+                             &local_errp);
+    if (local_errp) {
+        fprintf(stderr, "a369: Unable to set flash link for FTNANDC021\n");
+        exit(1);
+    }
+
     /* System start-up */
 
     if (args->kernel_filename) {
hw/arm/faraday_a369_soc.c +9 -0
index ab13f70..a211c90 100644
@@ -84,6 +84,7 @@ a369soc_device_init(FaradaySoCState *s)
     DriveInfo *dinfo;
     DeviceState *ds;
     qemu_irq *cpu_pic;
+    qemu_irq ack, req;
     int i;
 
     s->as = get_system_memory();
@@ -232,6 +233,14 @@ a369soc_device_init(FaradaySoCState *s)
         fprintf(stderr, "a369soc: Unable to set soc link for FTAPBBRG020\n");
         exit(1);
     }
+
+    /* ftnandc021 */
+    ds = sysbus_create_simple("ftnandc021", 0x90200000, s->pic[30]);
+    s->nandc[0] = ds;
+    ack = qdev_get_gpio_in(ds, 0);
+    req = qdev_get_gpio_in(s->hdma[0], 15);
+    qdev_connect_gpio_out(s->hdma[0], 15, ack);
+    qdev_connect_gpio_out(ds, 0, req);
 }
 
 static int a369soc_init(SysBusDevice *dev)
hw/arm/ftnandc021.c new file +523 -0

523 lines not on this page · raw message

hw/arm/ftnandc021.h new file +84 -0

84 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#13 lore raw

PATCH v7 13/24 hw/arm: add FTI2C010 I2C controller support

In reply to Kuo-Jung Su

From: Kuo-Jung Su <[email protected]>

The FTI2C010 is a simple I2C master controller.

---
 hw/arm/Makefile.objs      |    1 +
 hw/arm/faraday_a369_soc.c |    6 ++
 hw/arm/fti2c010.c         |  216 +++++++++++++++++++++++++++++++++++++++++++++
 hw/arm/fti2c010.h         |   71 +++++++++++++++
 4 files changed, 294 insertions(+)
 create mode 100644 hw/arm/fti2c010.c
 create mode 100644 hw/arm/fti2c010.h
hw/arm/Makefile.objs +1 -0
index 2622f3f..63ba519 100644
@@ -46,3 +46,4 @@ obj-y += ftrtc011.o
 obj-y += ftdmac020.o
 obj-y += ftapbbrg020.o
 obj-y += ftnandc021.o
+obj-y += fti2c010.o
hw/arm/faraday_a369_soc.c +6 -0
index a211c90..07fe41d 100644
@@ -241,6 +241,12 @@ a369soc_device_init(FaradaySoCState *s)
     req = qdev_get_gpio_in(s->hdma[0], 15);
     qdev_connect_gpio_out(s->hdma[0], 15, ack);
     qdev_connect_gpio_out(ds, 0, req);
+
+    /* fti2c010 */
+    ds = sysbus_create_simple("fti2c010", 0x92900000, s->pic[51]);
+    s->i2c[0] = ds;
+    ds = sysbus_create_simple("fti2c010", 0x92A00000, s->pic[52]);
+    s->i2c[1] = ds;
 }
 
 static int a369soc_init(SysBusDevice *dev)
hw/arm/fti2c010.c new file +216 -0

216 lines not on this page · raw message

hw/arm/fti2c010.h new file +71 -0

71 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#14 lore raw

PATCH v7 14/24 hw: add AudioCodecClass for wm87xx audio class abstration.

In reply to Kuo-Jung Su

From: Kuo-Jung Su <[email protected]>

---
 hw/Makefile.objs           |    1 +
 hw/arm/spitz.c             |    9 +++--
 hw/arm/z2.c                |    9 +++--
 hw/audio_codec.c           |   81 +++++++++++++++++++++++++++++++++++++++
 hw/audio_codec.h           |   56 +++++++++++++++++++++++++++
 hw/i2c.h                   |    9 -----
 hw/marvell_88w8618_audio.c |   23 +++++++----
 hw/wm8750.c                |   91 ++++++++++++++++++++++----------------------
 8 files changed, 211 insertions(+), 68 deletions(-)
 create mode 100644 hw/audio_codec.c
 create mode 100644 hw/audio_codec.h
hw/Makefile.objs +1 -0
index eb7eb31..aafcac5 100644
@@ -167,6 +167,7 @@ common-obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/
 common-obj-y += usb/
 common-obj-$(CONFIG_PTIMER) += ptimer.o
 common-obj-$(CONFIG_MAX7310) += max7310.o
+common-obj-y += audio_codec.o
 common-obj-$(CONFIG_WM8750) += wm8750.o
 common-obj-$(CONFIG_TWL92230) += twl92230.o
 common-obj-$(CONFIG_TSC2005) += tsc2005.o
hw/arm/spitz.c +6 -3
index f5832be..618968b 100644
@@ -24,6 +24,7 @@
 #include "ui/console.h"
 #include "block/block.h"
 #include "audio/audio.h"
+#include "hw/audio_codec.h"
 #include "hw/boards.h"
 #include "sysemu/blockdev.h"
 #include "hw/sysbus.h"
@@ -739,9 +740,11 @@ static void spitz_i2c_setup(PXA2xxState *cpu)
                     qemu_allocate_irqs(spitz_wm8750_addr, wm, 1)[0]);
     /* .. and to the sound interface.  */
     cpu->i2s->opaque = wm;
-    cpu->i2s->codec_out = wm8750_dac_dat;
-    cpu->i2s->codec_in = wm8750_adc_dat;
-    wm8750_data_req_set(wm, cpu->i2s->data_req, cpu->i2s);
+    cpu->i2s->codec_out = audio_codec_dac_dat;
+    cpu->i2s->codec_in = audio_codec_adc_dat;
+    audio_codec_data_req_set(DEVICE(wm),
+                             cpu->i2s->data_req,
+                             cpu->i2s);
 }
 
 static void spitz_akita_i2c_setup(PXA2xxState *cpu)
hw/arm/z2.c +6 -3
index cbb6d80..bc11309 100644
@@ -23,6 +23,7 @@
 #include "sysemu/blockdev.h"
 #include "ui/console.h"
 #include "audio/audio.h"
+#include "hw/audio_codec.h"
 #include "exec/address-spaces.h"
 
 #ifdef DEBUG_Z2
@@ -353,9 +354,11 @@ static void z2_init(QEMUMachineInitArgs *args)
     i2c_create_slave(bus, "aer915", 0x55);
     wm = i2c_create_slave(bus, "wm8750", 0x1b);
     mpu->i2s->opaque = wm;
-    mpu->i2s->codec_out = wm8750_dac_dat;
-    mpu->i2s->codec_in = wm8750_adc_dat;
-    wm8750_data_req_set(wm, mpu->i2s->data_req, mpu->i2s);
+    mpu->i2s->codec_out = audio_codec_dac_dat;
+    mpu->i2s->codec_in = audio_codec_adc_dat;
+    audio_codec_data_req_set(DEVICE(wm),
+                             mpu->i2s->data_req,
+                             mpu->i2s);
 
     qdev_connect_gpio_out(mpu->gpio, Z2_GPIO_LCD_CS,
         qemu_allocate_irqs(z2_lcd_cs, z2_lcd, 1)[0]);
hw/audio_codec.c new file +81 -0

81 lines not on this page · raw message

hw/audio_codec.h new file +56 -0

56 lines not on this page · raw message

hw/i2c.h +0 -9
index 461392f..39566b5 100644
@@ -63,15 +63,6 @@ int i2c_recv(i2c_bus *bus);
 
 DeviceState *i2c_create_slave(i2c_bus *bus, const char *name, uint8_t addr);
 
-/* wm8750.c */
-void wm8750_data_req_set(DeviceState *dev,
-                void (*data_req)(void *, int, int), void *opaque);
-void wm8750_dac_dat(void *opaque, uint32_t sample);
-uint32_t wm8750_adc_dat(void *opaque);
-void *wm8750_dac_buffer(void *opaque, int samples);
-void wm8750_dac_commit(void *opaque);
-void wm8750_set_bclk_in(void *opaque, int new_hz);
-
 /* lm832x.c */
 void lm832x_key_event(DeviceState *dev, int key, int state);
 
hw/marvell_88w8618_audio.c +15 -8
index e042046..85986e1 100644
@@ -14,6 +14,7 @@
 #include "hw/i2c.h"
 #include "hw/sysbus.h"
 #include "audio/audio.h"
+#include "audio_codec.h"
 
 #define MP_AUDIO_SIZE           0x00001000
 
@@ -82,32 +83,36 @@ static void mv88w8618_audio_callback(void *opaque, int free_out, int free_in)
     mem_buffer = buf;
     if (s->playback_mode & MP_AUDIO_16BIT_SAMPLE) {
         if (s->playback_mode & MP_AUDIO_MONO) {
-            codec_buffer = wm8750_dac_buffer(s->wm, block_size >> 1);
+            codec_buffer = audio_codec_dac_buffer(AUDIO_CODEC(s->wm),
+                                                  block_size >> 1);
             for (pos = 0; pos < block_size; pos += 2) {
                 *codec_buffer++ = *(int16_t *)mem_buffer;
                 *codec_buffer++ = *(int16_t *)mem_buffer;
                 mem_buffer += 2;
             }
         } else {
-            memcpy(wm8750_dac_buffer(s->wm, block_size >> 2),
-                   (uint32_t *)mem_buffer, block_size);
+            memcpy(audio_codec_dac_buffer(AUDIO_CODEC(s->wm),
+                                          block_size >> 2),
+                   (uint32_t *)mem_buffer,
+                   block_size);
         }
     } else {
         if (s->playback_mode & MP_AUDIO_MONO) {
-            codec_buffer = wm8750_dac_buffer(s->wm, block_size);
+            codec_buffer = audio_codec_dac_buffer(s->wm, block_size);
             for (pos = 0; pos < block_size; pos++) {
                 *codec_buffer++ = cpu_to_le16(256 * *mem_buffer);
                 *codec_buffer++ = cpu_to_le16(256 * *mem_buffer++);
             }
         } else {
-            codec_buffer = wm8750_dac_buffer(s->wm, block_size >> 1);
+            codec_buffer = audio_codec_dac_buffer(AUDIO_CODEC(s->wm),
+                                                  block_size >> 1);
             for (pos = 0; pos < block_size; pos += 2) {
                 *codec_buffer++ = cpu_to_le16(256 * *mem_buffer++);
                 *codec_buffer++ = cpu_to_le16(256 * *mem_buffer++);
             }
         }
     }
-    wm8750_dac_commit(s->wm);
+    audio_codec_dac_commit(AUDIO_CODEC(s->wm));
 
     s->last_free = free_out - block_size;
 
@@ -135,7 +140,7 @@ static void mv88w8618_audio_clock_update(mv88w8618_audio_state *s)
     }
     rate /= ((s->clock_div >> 8) & 0xff) + 1;
 
-    wm8750_set_bclk_in(s->wm, rate);
+    audio_codec_set_bclk_in(AUDIO_CODEC(s->wm), rate);
 }
 
 static uint64_t mv88w8618_audio_read(void *opaque, hwaddr offset,
@@ -244,7 +249,9 @@ static int mv88w8618_audio_init(SysBusDevice *dev)
 
     sysbus_init_irq(dev, &s->irq);
 
-    wm8750_data_req_set(s->wm, mv88w8618_audio_callback, s);
+    audio_codec_data_req_set(DEVICE(s->wm),
+                             mv88w8618_audio_callback,
+                             s);
 
     memory_region_init_io(&s->iomem, &mv88w8618_audio_ops, s,
                           "audio", MP_AUDIO_SIZE);
hw/wm8750.c +46 -45

246 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#15 lore raw

PATCH v7 15/24 hw: add WM8731 audio codec support

In reply to Kuo-Jung Su

From: Kuo-Jung Su <[email protected]>

Wolfson WM8731 is a simple audio codec for embedded systems. It has 2 input and 1 output ports:

** Input **
1. Linue-In
2. Microphone

** Output **
1. Headphone out

BTW it's based on hw/wm8750.c with 16-bit I2S support by default.

---
 default-configs/arm-softmmu.mak |    1 +
 hw/Makefile.objs                |    1 +
 hw/wm8731.c                     |  505 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 507 insertions(+)
 create mode 100644 hw/wm8731.c
default-configs/arm-softmmu.mak +1 -0
index 68b2045..131f85b 100644
@@ -11,6 +11,7 @@ CONFIG_SERIAL=y
 CONFIG_PTIMER=y
 CONFIG_SD=y
 CONFIG_MAX7310=y
+CONFIG_WM8731=y
 CONFIG_WM8750=y
 CONFIG_TWL92230=y
 CONFIG_TSC2005=y
hw/Makefile.objs +1 -0
index aafcac5..6fdaf41 100644
@@ -168,6 +168,7 @@ common-obj-y += usb/
 common-obj-$(CONFIG_PTIMER) += ptimer.o
 common-obj-$(CONFIG_MAX7310) += max7310.o
 common-obj-y += audio_codec.o
+common-obj-$(CONFIG_WM8731) += wm8731.o
 common-obj-$(CONFIG_WM8750) += wm8750.o
 common-obj-$(CONFIG_TWL92230) += twl92230.o
 common-obj-$(CONFIG_TSC2005) += tsc2005.o
hw/wm8731.c new file +505 -0

505 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#16 lore raw

PATCH v7 16/24 hw/arm: add FTSSP010 multi-function controller support

In reply to Kuo-Jung Su

From: Kuo-Jung Su <[email protected]>

The FTSSP010 is a multi-function synchronous serial port interface controller which supports SSP, SPI, I2S, AC97 and SPDIF.

Only I2S and SPI protocol have been implemented in this patch.

---
 hw/arm/Makefile.objs      |    1 +
 hw/arm/faraday.h          |    3 +
 hw/arm/faraday_a369.c     |   31 +++
 hw/arm/faraday_a369_soc.c |   17 ++
 hw/arm/ftssp010.c         |  501 +++++++++++++++++++++++++++++++++++++++++++++
 hw/arm/ftssp010.h         |   98 +++++++++
 6 files changed, 651 insertions(+)
 create mode 100644 hw/arm/ftssp010.c
 create mode 100644 hw/arm/ftssp010.h
hw/arm/Makefile.objs +1 -0
index 63ba519..9cb135a 100644
@@ -47,3 +47,4 @@ obj-y += ftdmac020.o
 obj-y += ftapbbrg020.o
 obj-y += ftnandc021.o
 obj-y += fti2c010.o
+obj-y += ftssp010.o
hw/arm/faraday.h +3 -0
index 86cc1ff..6ca88e4 100644
@@ -56,4 +56,7 @@ typedef struct FaradaySoCState {
 #define FARADAY_SOC(obj) \
     OBJECT_CHECK(FaradaySoCState, obj, TYPE_FARADAY_SOC)
 
+/* ftssp010.c */
+void ftssp010_i2s_data_req(void *opaque, int tx, int rx);
+
 #endif
hw/arm/faraday_a369.c +31 -0
index a13e946..ef84a8f 100644
@@ -11,6 +11,7 @@
 #include "hw/arm-misc.h"
 #include "hw/devices.h"
 #include "hw/i2c.h"
+#include "hw/audio_codec.h"
 #include "hw/boards.h"
 #include "hw/ssi.h"
 #include "net/net.h"
@@ -23,6 +24,7 @@
 static void
 a369_board_init(QEMUMachineInitArgs *args)
 {
+    int i, nr_flash;
     DeviceState *ds;
     FaradaySoCState *s;
     DriveInfo *dinfo;
@@ -60,6 +62,35 @@ a369_board_init(QEMUMachineInitArgs *args)
         exit(1);
     }
 
+    /* Attach the spi flash to ftssp010.0 */
+    nr_flash = 1;
+    for (i = 0; i < nr_flash; i++) {
+        SSIBus *ssi = (SSIBus *)qdev_get_child_bus(s->spi[0], "spi");
+        DeviceState *fl = ssi_create_slave_no_init(ssi, "w25q64");
+        qemu_irq cs_line;
+
+        qdev_init_nofail(fl);
+        cs_line = qdev_get_gpio_in(fl, 0);
+        sysbus_connect_irq(SYS_BUS_DEVICE(s->spi[0]), i + 1, cs_line);
+    }
+
+    /* Attach the wm8731 to fti2c010.0 & ftssp010.0 */
+    for (i = 0; i < 1; ++i) {
+        i2c_bus *i2c = (i2c_bus *)qdev_get_child_bus(s->i2c[0], "i2c");
+        ds = i2c_create_slave(i2c, "wm8731", 0x1B);
+        object_property_set_link(OBJECT(s->i2s[0]),
+                                 OBJECT(ds),
+                                 "codec",
+                                 &local_errp);
+        if (local_errp) {
+            fprintf(stderr, "a369: Unable to set codec link for FTSSP010\n");
+            exit(1);
+        }
+        audio_codec_data_req_set(ds,
+                                 ftssp010_i2s_data_req,
+                                 s->i2s[0]);
+    }
+
     /* System start-up */
 
     if (args->kernel_filename) {
hw/arm/faraday_a369_soc.c +17 -0
index 07fe41d..16fa1e3 100644
@@ -247,6 +247,23 @@ a369soc_device_init(FaradaySoCState *s)
     s->i2c[0] = ds;
     ds = sysbus_create_simple("fti2c010", 0x92A00000, s->pic[52]);
     s->i2c[1] = ds;
+
+    /* ftssp010 */
+    ds = sysbus_create_simple("ftssp010", 0x92700000, s->pic[49]);
+    s->spi[0] = ds;
+    s->i2s[0] = ds;
+
+    /* ftssp010 - DMA (Tx) */
+    ack = qdev_get_gpio_in(ds, 0);
+    req = qdev_get_gpio_in(s->pdma[0], 7);
+    qdev_connect_gpio_out(s->pdma[0], 7, ack);
+    qdev_connect_gpio_out(ds, 0, req);
+
+    /* ftssp010 - DMA (Rx) */
+    ack = qdev_get_gpio_in(ds, 1);
+    req = qdev_get_gpio_in(s->pdma[0], 8);
+    qdev_connect_gpio_out(s->pdma[0], 8, ack);
+    qdev_connect_gpio_out(ds, 1, req);
 }
 
 static int a369soc_init(SysBusDevice *dev)
hw/arm/ftssp010.c new file +501 -0

501 lines not on this page · raw message

hw/arm/ftssp010.h new file +98 -0

98 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#17 lore raw

PATCH v7 17/24 qemu/bitops.h: add the bit ordering reversal functions

In reply to Kuo-Jung Su

From: Kuo-Jung Su <[email protected]>

---
 include/qemu/bitops.h |   59 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 58 insertions(+), 1 deletion(-)
include/qemu/bitops.h +58 -1
index affcc96..64cbb04 100644
@@ -3,7 +3,8 @@
  *
  * Copyright (C) 2010 Corentin Chary <[email protected]>
  *
- * Mostly inspired by (stolen from) linux/bitmap.h and linux/bitops.h
+ * Mostly inspired by (stolen from) linux/bitmap.h, linux/bitops.h
+ * and linux/bitrev.h
  *
  * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
  * See the COPYING.LIB file in the top-level directory.
@@ -273,4 +274,60 @@ static inline uint64_t deposit64(uint64_t value, int start, int length,
     return (value & ~mask) | ((fieldval << start) & mask);
 }
 
+/**
+ * bitrev8:
+ * @value: the value to reverse bit ordering from
+ *
+ * Reverse the 8 bit input @value
+ *
+ * Returns: the input @value with reversed bit ordering
+ */
+static inline uint8_t bitrev8(uint8_t value)
+{
+    value = (value & 0xF0) >> 4 | (value & 0x0F) << 4;
+    value = (value & 0xCC) >> 2 | (value & 0x33) << 2;
+    value = (value & 0xAA) >> 1 | (value & 0x55) << 1;
+    return value;
+}
+
+/**
+ * bitrev16:
+ * @value: the value to reverse bit ordering from
+ *
+ * Reverse the 16 bit input @value
+ *
+ * Returns: the input @value with reversed bit ordering
+ */
+static inline uint16_t bitrev16(uint16_t value)
+{
+    return (bitrev8(value & 0xff) << 8) | bitrev8(value >> 8);
+}
+
+/**
+ * bitrev32:
+ * @value: the value to reverse bit ordering from
+ *
+ * Reverse the 32 bit input @value
+ *
+ * Returns: the input @value with reversed bit ordering
+ */
+static inline uint32_t bitrev32(uint32_t value)
+{
+    return (bitrev16(value & 0xffff) << 16) | bitrev16(value >> 16);
+}
+
+/**
+ * bitrev64:
+ * @value: the value to reverse bit ordering from
+ *
+ * Reverse the 64 bit input @value
+ *
+ * Returns: the input @value with reversed bit ordering
+ */
+static inline uint64_t bitrev64(uint64_t value)
+{
+    return ((uint64_t)bitrev32(value & 0xffffffffULL) << 32)
+        | (uint64_t)bitrev32(value >> 32);
+}
+
 #endif
Signature · 1 line
1.7.9.5
#18 lore raw

PATCH v7 18/24 hw/arm: add FTGMAC100 1Gbps ethernet support

In reply to Kuo-Jung Su

From: Kuo-Jung Su <[email protected]>

The FTGMAC100 Ethernet controller has a DMA engine which handles all data transfers between the system memory and on-chip memories. Its DMA engine supports both 16-bits and 32-bits alignment, and thus make it possible to support zero-copy transfer at both Linux and WINCE.

It also has 802.1Q VLAN tagging support for both insertion and removal.

---
 hw/arm/Makefile.objs      |    1 +
 hw/arm/faraday.h          |    3 +
 hw/arm/faraday_a369_soc.c |    5 +
 hw/arm/ftgmac100.c        |  696 +++++++++++++++++++++++++++++++++++++++++++++
 hw/arm/ftgmac100.h        |  239 ++++++++++++++++
 5 files changed, 944 insertions(+)
 create mode 100644 hw/arm/ftgmac100.c
 create mode 100644 hw/arm/ftgmac100.h
hw/arm/Makefile.objs +1 -0
index 9cb135a..a6a9a0f 100644
@@ -48,3 +48,4 @@ obj-y += ftapbbrg020.o
 obj-y += ftnandc021.o
 obj-y += fti2c010.o
 obj-y += ftssp010.o
+obj-y += ftgmac100.o
hw/arm/faraday.h +3 -0
index 6ca88e4..158fffc 100644
@@ -59,4 +59,7 @@ typedef struct FaradaySoCState {
 /* ftssp010.c */
 void ftssp010_i2s_data_req(void *opaque, int tx, int rx);
 
+/* ftgmac100.c */
+void ftgmac100_init(NICInfo *nd, uint32_t base, qemu_irq irq);
+
 #endif
hw/arm/faraday_a369_soc.c +5 -0
index 16fa1e3..ea97e19 100644
@@ -264,6 +264,11 @@ a369soc_device_init(FaradaySoCState *s)
     req = qdev_get_gpio_in(s->pdma[0], 8);
     qdev_connect_gpio_out(s->pdma[0], 8, ack);
     qdev_connect_gpio_out(ds, 1, req);
+
+    /* ftgmac100 */
+    if (nb_nics > 0) {
+        ftgmac100_init(&nd_table[0], 0x90c00000, s->pic[32]);
+    }
 }
 
 static int a369soc_init(SysBusDevice *dev)
hw/arm/ftgmac100.c new file +696 -0

696 lines not on this page · raw message

hw/arm/ftgmac100.h new file +239 -0

239 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#19 lore raw

PATCH v7 19/24 hw/arm: add FTLCDC200 LCD controller support

In reply to Kuo-Jung Su

From: Kuo-Jung Su <[email protected]>

The FTLCDC200 Color LCD controller performs translation of pixel-coded data into the required formats and timings to drive a variety of single/dual mono and color LCDs.

Depending on the LCD type and mode, the unpacked data can represent:
1. an actual true display gray or color value
2. an address to a 256 x 16 bit wide palette RAM gray or color value.

The FTLCDC200 generates 4 individual interrupts for:
1. DMA FIFO underflow
2. base address update
3. vertical status
4. bus error.

There is also a single combined interrupt that is raised when any of the individual interrupts become active.

---
 hw/arm/Makefile.objs        |    1 +
 hw/arm/faraday_a369_soc.c   |   10 +
 hw/arm/ftlcdc200.c          |  513 +++++++++++++++++++++++++++++++++++++++++++
 hw/arm/ftlcdc200.h          |  112 ++++++++++
 hw/arm/ftlcdc200_template.h |  439 ++++++++++++++++++++++++++++++++++++
 5 files changed, 1075 insertions(+)
 create mode 100644 hw/arm/ftlcdc200.c
 create mode 100644 hw/arm/ftlcdc200.h
 create mode 100644 hw/arm/ftlcdc200_template.h
hw/arm/Makefile.objs +1 -0
index a6a9a0f..6f3bf2d 100644
@@ -49,3 +49,4 @@ obj-y += ftnandc021.o
 obj-y += fti2c010.o
 obj-y += ftssp010.o
 obj-y += ftgmac100.o
+obj-y += ftlcdc200.o
hw/arm/faraday_a369_soc.c +10 -0
index ea97e19..da89dfa 100644
@@ -269,6 +269,16 @@ a369soc_device_init(FaradaySoCState *s)
     if (nb_nics > 0) {
         ftgmac100_init(&nd_table[0], 0x90c00000, s->pic[32]);
     }
+
+    /* ftlcdc200 */
+    sysbus_create_varargs("ftlcdc200",
+                          0x94a00000,
+                          s->pic[0],  /* ALL (NC in A369) */
+                          s->pic[25], /* VSTATUS */
+                          s->pic[24], /* Base Address Update */
+                          s->pic[23], /* FIFO Under-Run */
+                          s->pic[22], /* AHB Bus Error */
+                          NULL);
 }
 
 static int a369soc_init(SysBusDevice *dev)
hw/arm/ftlcdc200.c new file +513 -0

513 lines not on this page · raw message

hw/arm/ftlcdc200.h new file +112 -0

112 lines not on this page · raw message

hw/arm/ftlcdc200_template.h new file +439 -0

439 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#20 lore raw

PATCH v7 20/24 hw/arm: add FTTSC010 touchscreen controller support

In reply to Kuo-Jung Su

From: Kuo-Jung Su <[email protected]>

The FTTSC010 provides two operation modes to sample the analog input voltage.

1. The manual operation mode needs to program and control the panel drivers by software step-by-step for the x-y position measurement.

2. The auto-scan mode provides a periodic sampling method to convert the analog input.

This patch only implements the auto-scan mode.

---
 hw/arm/Makefile.objs      |    1 +
 hw/arm/faraday_a369_soc.c |    3 +
 hw/arm/fttsc010.c         |  264 +++++++++++++++++++++++++++++++++++++++++++++
 hw/arm/fttsc010.h         |   39 +++++++
 4 files changed, 307 insertions(+)
 create mode 100644 hw/arm/fttsc010.c
 create mode 100644 hw/arm/fttsc010.h
hw/arm/Makefile.objs +1 -0
index 6f3bf2d..9fdefc8 100644
@@ -50,3 +50,4 @@ obj-y += fti2c010.o
 obj-y += ftssp010.o
 obj-y += ftgmac100.o
 obj-y += ftlcdc200.o
+obj-y += fttsc010.o
hw/arm/faraday_a369_soc.c +3 -0
index da89dfa..386a1a8 100644
@@ -279,6 +279,9 @@ a369soc_device_init(FaradaySoCState *s)
                           s->pic[23], /* FIFO Under-Run */
                           s->pic[22], /* AHB Bus Error */
                           NULL);
+
+    /* fttsc010 */
+    sysbus_create_simple("fttsc010", 0x92400000, s->pic[19]);
 }
 
 static int a369soc_init(SysBusDevice *dev)
hw/arm/fttsc010.c new file +264 -0

264 lines not on this page · raw message

hw/arm/fttsc010.h new file +39 -0
new file mode 100644
index 0000000..b600645
@@ -0,0 +1,39 @@
+/*
+ * Faraday FTTSC010 touchscreen driver
+ *
+ * Copyright (C) 2012 Faraday Technology
+ * Written by Dante Su <[email protected]>
+ *
+ * This file is licensed under GNU GPL v2+.
+ */
+
+#ifndef HW_ARM_FTTSC010_H
+#define HW_ARM_FTTSC010_H
+
+#include "qemu/bitops.h"
+
+#define REG_CR      0x00  /* Control Register */
+#define REG_ISR     0x04  /* Interrupt Status Register */
+#define REG_IMR     0x08  /* Interrupt Mask Register */
+#define REG_REVR    0x0C  /* Revision Register */
+#define REG_CSR     0x30  /* Clock & Sample Rate Register */
+#define REG_PFR     0x34  /* Panel Function Register */
+#define REG_DCR     0x38  /* Delay Control Register */
+#define REG_XYR     0x3C  /* Touchscreen X,Y-Axis Register */
+#define REG_ZR      0x4C  /* Touchscreen Z-Axis (Pressure) Register */
+
+#define CR_AS       BIT(31) /* Auto-scan enable */
+#define CR_RD1      BIT(30) /* Single read enabled */
+#define CR_CHDLY(x) BIT(16 + (x % 7)) /* ADC channel x delay enabled */
+#define CR_APWRDN   BIT(9)  /* ADC auto power down mode */
+#define CR_PWRDN    BIT(8)  /* ADC and IPGA power down */
+#define CR_ICS(x)   ((x) & 0xf) /* ADC analog input channel select */
+
+#define CSR_SDIV(x) (((x) & 0xff) << 8) /* ADC sample clock divider */
+#define CSR_MDIV(x) (((x) & 0xff) << 0) /* ADC main clock divider */
+
+#define DCR_DLY(x)  ((x) & 0xffff)      /* ADC conversion delay */
+
+#define ISR_AS      BIT(10) /* Auto-scan cpmplete */
+
+#endif
Signature · 1 line
1.7.9.5
#21 lore raw

PATCH v7 21/24 hw/arm: add FTSDC010 MMC/SD controller support

In reply to Kuo-Jung Su

From: Kuo-Jung Su <[email protected]>

The FTSDC010 is a simple MMC/SD host controller and many of its registers are similar to Arm PrimeCell PL181.

---
 hw/arm/Makefile.objs      |    1 +
 hw/arm/faraday_a369_soc.c |    7 +
 hw/arm/ftsdc010.c         |  358 +++++++++++++++++++++++++++++++++++++++++++++
 hw/arm/ftsdc010.h         |   90 ++++++++++++
 4 files changed, 456 insertions(+)
 create mode 100644 hw/arm/ftsdc010.c
 create mode 100644 hw/arm/ftsdc010.h
hw/arm/Makefile.objs +1 -0
index 9fdefc8..0920270 100644
@@ -51,3 +51,4 @@ obj-y += ftssp010.o
 obj-y += ftgmac100.o
 obj-y += ftlcdc200.o
 obj-y += fttsc010.o
+obj-y += ftsdc010.o
hw/arm/faraday_a369_soc.c +7 -0
index 386a1a8..1240ff1 100644
@@ -282,6 +282,13 @@ a369soc_device_init(FaradaySoCState *s)
 
     /* fttsc010 */
     sysbus_create_simple("fttsc010", 0x92400000, s->pic[19]);
+
+    /* ftsdc010 */
+    ds = sysbus_create_simple("ftsdc010", 0x90600000, s->pic[39]);
+    ack = qdev_get_gpio_in(ds, 0);
+    req = qdev_get_gpio_in(s->hdma[0], 13);
+    qdev_connect_gpio_out(s->hdma[0], 13, ack);
+    qdev_connect_gpio_out(ds, 0, req);
 }
 
 static int a369soc_init(SysBusDevice *dev)
hw/arm/ftsdc010.c new file +358 -0

358 lines not on this page · raw message

hw/arm/ftsdc010.h new file +90 -0

90 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#22 lore raw

PATCH v7 22/24 hw/arm: add FTMAC110 10/100Mbps ethernet support

In reply to Kuo-Jung Su

From: Kuo-Jung Su <[email protected]>

The FTMAC110 is an Ethernet controller that provides AHB master capability and is in full compliance with the IEEE 802.3 10/100 Mbps specifications. Its DMA controller handles all data transfers between system memory and on-chip memories.

It supports half-word data transfer for Linux. However it has a weird DMA alignment issue:

(1) Tx DMA Buffer Address:
1 bytes aligned: Invalid
2 bytes aligned: O.K
4 bytes aligned: O.K

(2) Rx DMA Buffer Address:
1 bytes aligned: Invalid
2 bytes aligned: O.K
4 bytes aligned: Invalid (It means 0x0, 0x4, 0x8, 0xC are invalid)

---
 hw/arm/Makefile.objs  |    1 +
 hw/arm/faraday.h      |    3 +
 hw/arm/faraday_a369.c |    7 +
 hw/arm/ftmac110.c     |  649 +++++++++++++++++++++++++++++++++++++++++++++++++
 hw/arm/ftmac110.h     |  168 +++++++++++++
 5 files changed, 828 insertions(+)
 create mode 100644 hw/arm/ftmac110.c
 create mode 100644 hw/arm/ftmac110.h
hw/arm/Makefile.objs +1 -0
index 0920270..985cb0b 100644
@@ -52,3 +52,4 @@ obj-y += ftgmac100.o
 obj-y += ftlcdc200.o
 obj-y += fttsc010.o
 obj-y += ftsdc010.o
+obj-y += ftmac110.o
hw/arm/faraday.h +3 -0
index 158fffc..85db025 100644
@@ -62,4 +62,7 @@ void ftssp010_i2s_data_req(void *opaque, int tx, int rx);
 /* ftgmac100.c */
 void ftgmac100_init(NICInfo *nd, uint32_t base, qemu_irq irq);
 
+/* ftmac110.c */
+void ftmac110_init(NICInfo *nd, uint32_t base, qemu_irq irq);
+
 #endif
hw/arm/faraday_a369.c +7 -0
index ef84a8f..05f4066 100644
@@ -91,6 +91,13 @@ a369_board_init(QEMUMachineInitArgs *args)
                                  s->i2s[0]);
     }
 
+    /* External AHB devices */
+
+    /* Ethernet: FTMAC110 */
+    if (nb_nics > 1) {
+        ftmac110_init(&nd_table[1], 0xC0100000, s->pic[5]);
+    }
+
     /* System start-up */
 
     if (args->kernel_filename) {
hw/arm/ftmac110.c new file +649 -0

649 lines not on this page · raw message

hw/arm/ftmac110.h new file +168 -0

168 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#23 lore raw

PATCH v7 23/24 hw/arm: add FTTMR010 timer support

In reply to Kuo-Jung Su

From: Kuo-Jung Su <[email protected]>

The FTTMR010 provides three independent sets of sub-timers. Two match registers are provided for each sub-timer, whenever the value of the match registers equals any one value of the sub-timers, the timer interrupt will be immediately triggered. And it would also issue an interrupt when an overflow occurs.

---
 hw/arm/Makefile.objs  |    1 +
 hw/arm/faraday_a369.c |    8 +
 hw/arm/fttmr010.c     |  451 +++++++++++++++++++++++++++++++++++++++++++++++++
 hw/arm/fttmr010.h     |   41 +++++
 4 files changed, 501 insertions(+)
 create mode 100644 hw/arm/fttmr010.c
 create mode 100644 hw/arm/fttmr010.h
hw/arm/Makefile.objs +1 -0
index 985cb0b..d0ce0e2 100644
@@ -53,3 +53,4 @@ obj-y += ftlcdc200.o
 obj-y += fttsc010.o
 obj-y += ftsdc010.o
 obj-y += ftmac110.o
+obj-y += fttmr010.o
hw/arm/faraday_a369.c +8 -0
index 05f4066..751a5e4 100644
@@ -98,6 +98,14 @@ a369_board_init(QEMUMachineInitArgs *args)
         ftmac110_init(&nd_table[1], 0xC0100000, s->pic[5]);
     }
 
+    /* Timer: FTTMR010 */
+    ds = qdev_create(NULL, "fttmr010");
+    qdev_prop_set_uint32(ds, "freq", 33 * 1000000);
+    qdev_init_nofail(ds);
+    sysbus_mmio_map(SYS_BUS_DEVICE(ds), 0, 0xC0200000);
+    sysbus_connect_irq(SYS_BUS_DEVICE(ds), 1, s->pic[6]);
+    sysbus_connect_irq(SYS_BUS_DEVICE(ds), 2, s->pic[7]);
+
     /* System start-up */
 
     if (args->kernel_filename) {
hw/arm/fttmr010.c new file +451 -0

451 lines not on this page · raw message

hw/arm/fttmr010.h new file +41 -0

41 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#24 lore raw

PATCH v7 24/24 hw/arm: add FTSPI020 SPI flash controller support

In reply to Kuo-Jung Su

From: Kuo-Jung Su <[email protected]>

The FTSPI020 is an integrated SPI Flash controller which supports up to 4 flash chips.

---
 hw/arm/Makefile.objs  |    1 +
 hw/arm/faraday_a369.c |   16 +++
 hw/arm/ftspi020.c     |  340 +++++++++++++++++++++++++++++++++++++++++++++++++
 hw/arm/ftspi020.h     |   81 ++++++++++++
 4 files changed, 438 insertions(+)
 create mode 100644 hw/arm/ftspi020.c
 create mode 100644 hw/arm/ftspi020.h
hw/arm/Makefile.objs +1 -0
index d0ce0e2..996c606 100644
@@ -54,3 +54,4 @@ obj-y += fttsc010.o
 obj-y += ftsdc010.o
 obj-y += ftmac110.o
 obj-y += fttmr010.o
+obj-y += ftspi020.o
hw/arm/faraday_a369.c +16 -0
index 751a5e4..52e8e84 100644
@@ -106,6 +106,22 @@ a369_board_init(QEMUMachineInitArgs *args)
     sysbus_connect_irq(SYS_BUS_DEVICE(ds), 1, s->pic[6]);
     sysbus_connect_irq(SYS_BUS_DEVICE(ds), 2, s->pic[7]);
 
+    /* SPI: FTSPI020 */
+    ds = sysbus_create_simple("ftspi020", 0xC0000000, s->pic[4]);
+    s->spi_fl[0] = ds;
+
+    /* Attach the spi flash to ftspi020.0 */
+    nr_flash = 1;
+    for (i = 0; i < nr_flash; i++) {
+        SSIBus *ssi = (SSIBus *)qdev_get_child_bus(s->spi_fl[0], "spi");
+        DeviceState *fl = ssi_create_slave_no_init(ssi, "w25q64");
+        qemu_irq cs_line;
+
+        qdev_init_nofail(fl);
+        cs_line = qdev_get_gpio_in(fl, 0);
+        sysbus_connect_irq(SYS_BUS_DEVICE(s->spi_fl[0]), i + 1, cs_line);
+    }
+
     /* System start-up */
 
     if (args->kernel_filename) {
hw/arm/ftspi020.c new file +340 -0

340 lines not on this page · raw message

hw/arm/ftspi020.h new file +81 -0

81 lines not on this page · raw message

Signature · 1 line
1.7.9.5