Re: [Qemu-devel] [PATCH v7 5/6] hw/arm/digic: add NOR ROM support

[Peter Crosthwaite]

On Fri, Dec 13, 2013 at 8:23 AM, Antony Pavlov <address@hidden> wrote:
> Signed-off-by: Antony Pavlov <address@hidden>
> ---
>  hw/arm/digic_boards.c | 70 
> +++++++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 70 insertions(+)
>
> diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c
> index 20c8054..ad62c7e 100644
> --- a/hw/arm/digic_boards.c
> +++ b/hw/arm/digic_boards.c
> @@ -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;
>  } DigicBoard;
>
>  static void digic4_board_setup_ram(DigicBoardState *s, hwaddr ram_size)
> @@ -58,10 +69,69 @@ 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);
> +    }
> +}
> +
> +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);

Should this be error_report()?

Regards,
Peter

> +            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",
>  };
>
>  static void canon_a1100_init(QEMUMachineInitArgs *args)
> --
> 1.8.5
>
>