Re: [Qemu-devel] [PATCH v14 6/8] i.MX: Add the i.MX25 PDK plateform

[Peter Crosthwaite]

"platform"

On Mon, Aug 10, 2015 at 3:02 PM, Jean-Christophe Dubois
<address@hidden> wrote:
> Tested by booting a minimal Linux system on the emulated platform
> Tested by booting the Xvisor hyprvisor on the emulated platform
>

"hypervisor"

> Signed-off-by: Jean-Christophe Dubois <address@hidden>
> ---
>
> Changes since v1:
>     * Added a ds1338 I2C device for qtest purpose.
>
> Changes since v2:
>     * none
>
> Changes since v3:
>     * Rework GPL header
>     * use I2C constructor helper.
>
> Changes since v4:
>     * use sysbus_create_simple() instead of I2C constructor helper
>
> Changes since v5:
>     * Add ds1338 only for qtest mode.
>     * small comment fixes.
>
> Changes since v6:
>     * Allow for more than 4 serial if suppoted by Qemu.
>
> Changes since v7:
>     * Move the SOC part into its own file.
>
> Changes since v8:
>     * rework SDRAM memory initialisation
>
> Changes since v9:
>     * no change
>
> Changes since v10:
>     * rename board from 3DS to PDK
>     * use memory_region_allocate_system_memory()
>     * rework of memory initialization loop.
>
> Changes since v11:
>     * no change
>
> Changes since v12:
>     * no change
>
> Changes since v12:
>     * Call memory_region_allocate_system_memory() only once for the 2 SDRAM
>       controlers
>     * rework memory alias init.
>
>  hw/arm/Makefile.objs |   2 +-
>  hw/arm/imx25_pdk.c   | 165 
> +++++++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 166 insertions(+), 1 deletion(-)
>  create mode 100644 hw/arm/imx25_pdk.c
>
> diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
> index b83aaca..2195b60 100644
> --- a/hw/arm/Makefile.objs
> +++ b/hw/arm/Makefile.objs
> @@ -13,5 +13,5 @@ obj-y += omap1.o omap2.o strongarm.o
>  obj-$(CONFIG_ALLWINNER_A10) += allwinner-a10.o cubieboard.o
>  obj-$(CONFIG_STM32F205_SOC) += stm32f205_soc.o
>  obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-zynqmp.o xlnx-ep108.o
> -obj-$(CONFIG_FSL_IMX25) += fsl-imx25.o
> +obj-$(CONFIG_FSL_IMX25) += fsl-imx25.o imx25_pdk.o
>  obj-$(CONFIG_FSL_IMX31) += fsl-imx31.o kzm.o
> diff --git a/hw/arm/imx25_pdk.c b/hw/arm/imx25_pdk.c
> new file mode 100644
> index 0000000..f5c8f6b
> --- /dev/null
> +++ b/hw/arm/imx25_pdk.c
> @@ -0,0 +1,165 @@
> +/*
> + * Copyright (c) 2013 Jean-Christophe Dubois <address@hidden>
> + *
> + * PDK Board System emulation.
> + *
> + * Based on hw/arm/kzm.c
> + *
> + * Copyright (c) 2008 OKL and 2011 NICTA
> + * Written by Hans at OK-Labs
> + * Updated by Peter Chubb.
> + *
> + *  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.
> + *
> + *  You should have received a copy of the GNU General Public License along
> + *  with this program; if not, see <http://www.gnu.org/licenses/>.
> + */
> +
> +#include "hw/arm/fsl-imx25.h"
> +#include "hw/boards.h"
> +#include "qemu/error-report.h"
> +#include "exec/address-spaces.h"
> +#include "sysemu/qtest.h"
> +#include "hw/i2c/i2c.h"
> +
> +/* Memory map for PDK Emulation Baseboard:
> + * 0x00000000-0x7fffffff See i.MX25 SOC fr support
> + * 0x80000000-0x87ffffff RAM + Alias          EMULATED
> + * 0x90000000-0x9fffffff RAM + Alias          EMULATED
> + * 0xa0000000-0xa7ffffff Flash                IGNORED
> + * 0xa8000000-0xafffffff Flash                IGNORED
> + * 0xb0000000-0xb1ffffff SRAM                 IGNORED
> + * 0xb2000000-0xb3ffffff SRAM                 IGNORED
> + * 0xb4000000-0xb5ffffff CS4                  IGNORED
> + * 0xb6000000-0xb8000fff Reserved             IGNORED
> + * 0xb8001000-0xb8001fff SDRAM CTRL reg       IGNORED
> + * 0xb8002000-0xb8002fff WEIM CTRL reg        IGNORED
> + * 0xb8003000-0xb8003fff M3IF CTRL reg        IGNORED
> + * 0xb8004000-0xb8004fff EMI CTRL reg         IGNORED
> + * 0xb8005000-0xbaffffff Reserved             IGNORED
> + * 0xbb000000-0xbb000fff NAND flash area buf  IGNORED
> + * 0xbb001000-0xbb0011ff NAND flash reserved  IGNORED
> + * 0xbb001200-0xbb001dff Reserved             IGNORED
> + * 0xbb001e00-0xbb001fff NAN flash CTRL reg   IGNORED
> + * 0xbb012000-0xbfffffff Reserved             IGNORED
> + * 0xc0000000-0xffffffff Reserved             IGNORED
> + */
> +
> +typedef struct IMX25Pdk {

IMX25PDK

> +    FslIMX25State soc;
> +    MemoryRegion ram;
> +    MemoryRegion ram_alias;
> +} IMX25Pdk;
> +
> +#define IMX25_PDK_ADDRESS   (FSL_IMX25_SDRAM0_ADDR)
> +

This name doesn't seem right. It looks to be the load added. Can you
rename to be loader specific? Personally I would just drop this, and
use SDRAM0_ADDR in the boot_info directly as that self documents that
you are trying to use SDRAM-0 for boot which I think is the intention
here.

> +static struct arm_boot_info imx25_pdk_binfo;
> +
> +static void imx25_pdk_init(MachineState *machine)
> +{
> +    IMX25Pdk *s = g_new0(IMX25Pdk, 1);
> +    Error *err = NULL;
> +    unsigned int ram_size;
> +    unsigned int alias_offset;
> +    int i;
> +
> +    object_initialize(&s->soc, sizeof(s->soc), TYPE_FSL_IMX25);
> +    object_property_add_child(OBJECT(machine), "soc", OBJECT(&s->soc),
> +                              &error_abort);
> +
> +    object_property_set_bool(OBJECT(&s->soc), true, "realized", &err);
> +    if (err != NULL) {
> +        error_report("%s", error_get_pretty(err));
> +        exit(1);
> +    }
> +
> +    /* We need to initialize our memory */
> +    if (machine->ram_size > (FSL_IMX25_SDRAM0_SIZE + FSL_IMX25_SDRAM1_SIZE)) 
> {
> +       error_report("WARNING: RAM size " RAM_ADDR_FMT " above max supported, 
> "
> +                     "reduced to %x", machine->ram_size,
> +                     FSL_IMX25_SDRAM0_SIZE + FSL_IMX25_SDRAM1_SIZE);
> +       machine->ram_size = FSL_IMX25_SDRAM0_SIZE + FSL_IMX25_SDRAM1_SIZE;
> +    }
> +
> +    memory_region_allocate_system_memory(&s->ram, NULL, "imx25.ram",
> +                                         machine->ram_size);
> +    memory_region_add_subregion(get_system_memory(), FSL_IMX25_SDRAM0_ADDR,
> +                                &s->ram);
> +
> +    /* initialize the alias memory if any */
> +    for (i=0, ram_size = machine->ram_size, alias_offset = 0;
> +         (i<2) && ram_size; i++) {
> +        unsigned int size;
> +        static const struct {
> +            hwaddr addr;
> +            unsigned int size;
> +        } ram[2] = {
> +            { FSL_IMX25_SDRAM0_ADDR, FSL_IMX25_SDRAM0_SIZE },
> +            { FSL_IMX25_SDRAM1_ADDR, FSL_IMX25_SDRAM1_SIZE },
> +        };
> +
> +        if (ram_size > ram[i].size) {
> +            size = ram[i].size;
> +        } else {
> +            size = ram_size;
> +        }

MIN

Otherwise:

Reviewed-by: Peter Crosthwaite <address@hidden>

Thanks,

Regards,
Peter

> +
> +        ram_size -= size;
> +
> +        if (size < ram[i].size) {
> +            memory_region_init_alias(&s->ram_alias, NULL, "ram.alias",
> +                                     &s->ram, alias_offset, ram[i].size - 
> size);
> +            memory_region_add_subregion(get_system_memory(),
> +                                        ram[i].addr + size, &s->ram_alias);
> +        }
> +
> +        alias_offset += ram[i].size;
> +    }
> +
> +    imx25_pdk_binfo.ram_size = machine->ram_size;
> +    imx25_pdk_binfo.kernel_filename = machine->kernel_filename;
> +    imx25_pdk_binfo.kernel_cmdline = machine->kernel_cmdline;
> +    imx25_pdk_binfo.initrd_filename = machine->initrd_filename;
> +    imx25_pdk_binfo.loader_start = IMX25_PDK_ADDRESS;
> +    imx25_pdk_binfo.board_id = 1771,
> +    imx25_pdk_binfo.nb_cpus = 1;
> +
> +    /*
> +     * We test explicitly for qtest here as it is not done (yet?) in
> +     * arm_load_kernel(). Without this the "make check" command would
> +     * fail.
> +     */
> +    if (!qtest_enabled()) {
> +        arm_load_kernel(&s->soc.cpu, &imx25_pdk_binfo);
> +    } else {
> +        /*
> +         * This I2C device doesn't exist on the real board.
> +         * We add it here (only on qtest usage) to be able to do a bit
> +         * of simple qtest. See "make check" for details.
> +         */
> +        i2c_create_slave((I2CBus *)qdev_get_child_bus(DEVICE(&s->soc.i2c[0]),
> +                                                      "i2c"),
> +                         "ds1338", 0x68);
> +    }
> +}
> +
> +static QEMUMachine imx25_pdk_machine = {
> +    .name = "imx25_pdk",
> +    .desc = "ARM i.MX25 PDK board (ARM926)",
> +    .init = imx25_pdk_init,
> +};
> +
> +static void imx25_pdk_machine_init(void)
> +{
> +    qemu_register_machine(&imx25_pdk_machine);
> +}
> +
> +machine_init(imx25_pdk_machine_init)
> --
> 2.1.4
>
>