[Qemu-devel] Re: [PATCH 4/4] powerpc: Add a virtex5 ml507 refdesign board

[Alexander Graf <agraf@suse.de>]

Edgar E. Iglesias wrote:
> Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
> ---
>  Makefile.target                    |    8 +
>  default-configs/ppc-softmmu.mak    |    2 +
>  default-configs/ppc64-softmmu.mak  |    2 +
>  default-configs/ppcemb-softmmu.mak |    2 +
>  hw/virtex_ml507.c                  |  283 ++++++++++++++++++++++++++++++++++++
>  5 files changed, 297 insertions(+), 0 deletions(-)
>  create mode 100644 hw/virtex_ml507.c
>
> diff --git a/Makefile.target b/Makefile.target
> index a4e80b1..91d0381 100644
> --- a/Makefile.target
> +++ b/Makefile.target
> @@ -217,9 +217,17 @@ obj-ppc-y += ppc4xx_devs.o ppc4xx_pci.o ppc405_uc.o ppc405_boards.o
>  obj-ppc-y += ppc440.o ppc440_bamboo.o
>  # PowerPC E500 boards
>  obj-ppc-y += ppce500_mpc8544ds.o
> +# PowerPC 440 Xilinx ML507 reference board.
> +obj-ppc-y += virtex_ml507.o
>  obj-ppc-$(CONFIG_KVM) += kvm_ppc.o
>  obj-ppc-$(CONFIG_FDT) += device_tree.o
>  
> +# Xilinx PPC peripherals
> +obj-ppc-y += xilinx_intc.o
> +obj-ppc-y += xilinx_timer.o
> +obj-ppc-y += xilinx_uartlite.o
> +obj-ppc-y += xilinx_ethlite.o
> +
>  obj-mips-y = mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o
>  obj-mips-y += mips_addr.o mips_timer.o mips_int.o
>  obj-mips-y += vga.o i8259.o
> diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
> index c026bbb..940f4bf 100644
> --- a/default-configs/ppc-softmmu.mak
> +++ b/default-configs/ppc-softmmu.mak
> @@ -32,4 +32,6 @@ CONFIG_IDE_MACIO=y
>  CONFIG_NE2000_ISA=y
>  CONFIG_SOUND=y
>  CONFIG_VIRTIO_PCI=y
> +CONFIG_PFLASH_CFI01=y
>  CONFIG_PFLASH_CFI02=y
> +CONFIG_PTIMER=y
> diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak
> index 0101a28..e1bc6b8 100644
> --- a/default-configs/ppc64-softmmu.mak
> +++ b/default-configs/ppc64-softmmu.mak
> @@ -32,4 +32,6 @@ CONFIG_IDE_MACIO=y
>  CONFIG_NE2000_ISA=y
>  CONFIG_SOUND=y
>  CONFIG_VIRTIO_PCI=y
> +CONFIG_PFLASH_CFI01=y
>  CONFIG_PFLASH_CFI02=y
> +CONFIG_PTIMER=y
> diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-softmmu.mak
> index 8ba9ac1..8f1cc09 100644
> --- a/default-configs/ppcemb-softmmu.mak
> +++ b/default-configs/ppcemb-softmmu.mak
> @@ -32,4 +32,6 @@ CONFIG_IDE_MACIO=y
>  CONFIG_NE2000_ISA=y
>  CONFIG_SOUND=y
>  CONFIG_VIRTIO_PCI=y
> +CONFIG_PFLASH_CFI01=y
>  CONFIG_PFLASH_CFI02=y
> +CONFIG_PTIMER=y
> diff --git a/hw/virtex_ml507.c b/hw/virtex_ml507.c
> new file mode 100644
> index 0000000..bc53cf4
> --- /dev/null
> +++ b/hw/virtex_ml507.c
> @@ -0,0 +1,283 @@
> +/*
> + * Model of Xilinx Virtex5 ML507 PPC-440 refdesign.
> + *
> + * Copyright (c) 2010 Edgar E. Iglesias.
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a copy
> + * of this software and associated documentation files (the "Software"), to deal
> + * in the Software without restriction, including without limitation the rights
> + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
> + * copies of the Software, and to permit persons to whom the Software is
> + * furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice shall be included in
> + * all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
> + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
> + * THE SOFTWARE.
> + */
> +
> +#include "sysbus.h"
> +#include "hw.h"
> +#include "pc.h"
> +#include "net.h"
> +#include "flash.h"
> +#include "sysemu.h"
> +#include "devices.h"
> +#include "boards.h"
> +#include "device_tree.h"
> +#include "loader.h"
> +#include "elf.h"
> +#include "qemu-log.h"
> +
> +#include "ppc.h"
> +#include "ppc4xx.h"
> +#include "ppc440.h"
> +#include "ppc405.h"
> +
> +#include "blockdev.h"
> +#include "xilinx.h"
> +
> +#define EPAPR_MAGIC    (0x45504150)
> +#define FLASH_SIZE     (16 * 1024 * 1024)
> +
> +static struct
> +{
> +    uint32_t bootstrap_pc;
> +    uint32_t cmdline;
> +    uint32_t fdt;
> +    uint32_t ima_size;
> +    void *vfdt;
> +} boot_info;
>   

Hrm. Any way you could make this be not a global? Maybe add CPUState *
in there and pass it as opaque to the reset function instead of env.

> +
> +/* Create reset TLB entries for BookE, spanning the 32bit addr space.  */
> +static void mmubooke_create_initial_mapping(CPUState *env,
> +                                     target_ulong va,
> +                                     target_phys_addr_t pa)
> +{
> +    ppcemb_tlb_t *tlb = &env->tlb[0].tlbe;
> +
> +    tlb->attr = 0;
> +    tlb->prot = PAGE_VALID | ((PAGE_READ | PAGE_WRITE | PAGE_EXEC) << 4);
> +    tlb->size = 1 << 31; /* up to 0x80000000  */
> +    tlb->EPN = va & TARGET_PAGE_MASK;
> +    tlb->RPN = pa & TARGET_PAGE_MASK;
> +    tlb->PID = 0;
> +
> +    tlb = &env->tlb[1].tlbe;
> +    tlb->attr = 0;
> +    tlb->prot = PAGE_VALID | ((PAGE_READ | PAGE_WRITE | PAGE_EXEC) << 4);
> +    tlb->size = 1 << 31; /* up to 0xffffffff  */
> +    tlb->EPN = 0x80000000 & TARGET_PAGE_MASK;
> +    tlb->RPN = 0x80000000 & TARGET_PAGE_MASK;
> +    tlb->PID = 0;
>   

I don't really like the idea of having knowledge of the tlb in the
machine init, but I suppose that's the closest it gets to how it's
modeled in real hardware, right? I fancy there's some init protocol
booting the CPU which defines those entries?

> +}
> +
> +static CPUState *ppc440_init_xilinx(ram_addr_t *ram_size,
> +                                    int do_init,
> +                                    const char *cpu_model,
> +                                    clk_setup_t *cpu_clk, clk_setup_t *tb_clk,
> +                                    uint32_t sysclk)
> +{
> +    CPUState *env;
> +    qemu_irq *pic;
> +    qemu_irq *irqs;
> +
> +    env = cpu_init(cpu_model);
> +    if (!env) {
> +        fprintf(stderr, "Unable to initialize CPU!\n");
> +        exit(1);
> +    }
> +
> +    cpu_clk->cb = NULL; /* We don't care about CPU clock frequency changes */
> +    cpu_clk->opaque = env;
> +    /* Set time-base frequency to sysclk */
> +    tb_clk->cb = ppc_emb_timers_init(env, sysclk);
> +    tb_clk->opaque = env;
> +
> +    ppc_emb_timers_set_decr_excp(env, PPC_INTERRUPT_DECR);
> +
> +    ppc_dcr_init(env, NULL, NULL);
> +
> +    /* interrupt controller */
> +    irqs = qemu_mallocz(sizeof(qemu_irq) * PPCUIC_OUTPUT_NB);
> +    irqs[PPCUIC_OUTPUT_INT] = ((qemu_irq *)env->irq_inputs)[PPC40x_INPUT_INT];
> +    irqs[PPCUIC_OUTPUT_CINT] = ((qemu_irq *)env->irq_inputs)[PPC40x_INPUT_CINT];
> +    pic = ppcuic_init(env, irqs, 0x0C0, 0, 1);
> +    return env;
> +}
> +
> +static void main_cpu_reset(void *opaque)
> +{
> +    CPUState *env = opaque;
> +    cpu_reset(env);
> +    /* Linux Kernel Parameters (passing device tree):
> +       *   r3: pointer to the fdt
> +       *   r4: 0
> +       *   r5: 0
> +       *   r6: epapr magic
> +       *   r7: size of IMA in bytes
> +       *   r8: 0
> +       *   r9: 0
> +    */
> +    env->gpr[1] = (16<<20) - 8;
> +    /* Provide a device-tree.  */
> +    env->gpr[3] = boot_info.fdt;
> +    env->nip = boot_info.bootstrap_pc;
> +
> +    /* Create a mapping for the kernel.  */
> +    mmubooke_create_initial_mapping(env, 0, 0);
> +    env->gpr[6] = tswap32(EPAPR_MAGIC);
> +    env->gpr[7] = boot_info.ima_size;
> +}
> +
> +#define BINARY_DEVICE_TREE_FILE "virtex-ml507.dtb"
> +static int xilinx_load_device_tree(target_phys_addr_t addr,
> +                                      uint32_t ramsize,
> +                                      target_phys_addr_t initrd_base,
> +                                      target_phys_addr_t initrd_size,
> +                                      const char *kernel_cmdline)
> +{
> +    char *path;
> +    int fdt_size;
> +#ifdef CONFIG_FDT
> +    void *fdt;
> +    int r;
> +
> +    /* Try the local "ppc.dtb" override.  */
> +    fdt = load_device_tree("ppc.dtb", &fdt_size);
> +    if (!fdt) {
> +        path = qemu_find_file(QEMU_FILE_TYPE_BIOS, BINARY_DEVICE_TREE_FILE);
> +        if (path) {
> +            fdt = load_device_tree(path, &fdt_size);
> +            qemu_free(path);
> +        }
> +        if (!fdt)
> +            return 0;
> +    }
> +
> +    r = qemu_devtree_setprop_string(fdt, "/chosen", "bootargs", kernel_cmdline);
> +    if (r < 0)
> +        fprintf(stderr, "couldn't set /chosen/bootargs\n");
> +    cpu_physical_memory_write (addr, (void *)fdt, fdt_size);
> +#else
> +    /* We lack libfdt so we cannot manipulate the fdt. Just pass on the blob
> +       to the kernel.  */
> +    fdt_size = load_image_targphys("ppc.dtb", addr, 0x10000);
> +    if (fdt_size < 0) {
> +        path = qemu_find_file(QEMU_FILE_TYPE_BIOS, BINARY_DEVICE_TREE_FILE);
> +        if (path) {
> +            fdt_size = load_image_targphys(path, addr, 0x10000);
> +	    qemu_free(path);
> +        }
> +    }
> +
> +    if (kernel_cmdline) {
> +        fprintf(stderr,
> +                "Warning: missing libfdt, cannot pass cmdline to kernel!\n");
> +    }
> +#endif
> +    return fdt_size;
> +}
> +
> +static uint64_t translate_kaddr(void *opaque, uint64_t addr)
> +{
> +    /* Occationally this becomes handy when loading certain ELF images.  */
> +    return addr;
> +}
>   

If it's not required, please just pass NULL to the loader.

> +
> +static void virtex_init(ram_addr_t ram_size,
> +                        const char *boot_device,
> +                        const char *kernel_filename,
> +                        const char *kernel_cmdline,
> +                        const char *initrd_filename, const char *cpu_model)
> +{
> +    DeviceState *dev;
> +    CPUState *env;
> +    target_phys_addr_t ram_base = 0;
> +    DriveInfo *dinfo;
> +    ram_addr_t phys_ram;
> +    ram_addr_t phys_flash;
> +    qemu_irq irq[32], *cpu_irq;
> +    clk_setup_t clk_setup[7];
> +    int kernel_size;
> +    int i;
> +
> +    /* init CPUs */
> +    if (cpu_model == NULL) {
> +        cpu_model = "440-Xilinx";
> +    }
> +
> +    memset(clk_setup, 0, sizeof(clk_setup));
> +    env = ppc440_init_xilinx(&ram_size, 1, cpu_model, &clk_setup[0],
> +                             &clk_setup[1], 400000000);
> +    qemu_register_reset(main_cpu_reset, env);
> +
> +    phys_ram = qemu_ram_alloc(NULL, "ram", ram_size);
> +    cpu_register_physical_memory(ram_base, ram_size, phys_ram | IO_MEM_RAM);
> +
> +    phys_flash = qemu_ram_alloc(NULL, "virtex.flash", FLASH_SIZE);
> +    dinfo = drive_get(IF_PFLASH, 0, 0);
> +    pflash_cfi01_register(0xfc000000, phys_flash,
> +                          dinfo ? dinfo->bdrv : NULL, (64 * 1024),
> +                          FLASH_SIZE >> 16,
> +                          1, 0x89, 0x18, 0x0000, 0x0, 1);
> +
> +    cpu_irq = (qemu_irq *) &env->irq_inputs[PPC40x_INPUT_INT];
> +    dev = xilinx_intc_create(0x81800000, cpu_irq[0], 0);
> +    for (i = 0; i < 32; i++) {
> +        irq[i] = qdev_get_gpio_in(dev, i);
> +    }
> +
> +    serial_mm_init(0x83e01003ULL, 2, irq[9], 115200, serial_hds[0], 1, 0);
> +
> +    /* 2 timers at irq 2 @ 62 Mhz.  */
> +    xilinx_timer_create(0x83c00000, irq[3], 2, 62 * 1000000);
> +
> +    if (kernel_filename) {
> +        uint64_t entry, low, high;
> +        uint32_t base32;
> +        target_phys_addr_t boot_offset;
> +
> +        /* Boots a kernel elf binary.  */
> +        kernel_size = load_elf(kernel_filename, translate_kaddr, NULL,
> +                               &entry, &low, &high, 1, ELF_MACHINE, 0);
> +        base32 = entry;
> +        boot_info.bootstrap_pc = entry & 0x00ffffff;
> +
> +        if (kernel_size < 0) {
> +            boot_offset = 0x1200000;
> +            /* If we failed loading ELF's try a raw image.  */
> +            kernel_size = load_image_targphys(kernel_filename,
> +                                              boot_offset,
> +                                              ram_size);
> +            boot_info.bootstrap_pc = boot_offset;
> +            high = boot_info.bootstrap_pc + kernel_size + 8192;
> +        }
> +
> +        boot_info.ima_size = kernel_size;
> +
> +        /* Provide a device-tree.  */
> +        boot_info.fdt = high + (8192 * 2);
> +        boot_info.fdt &= ~8191;
> +        xilinx_load_device_tree(boot_info.fdt, ram_size, 0, 0, kernel_cmdline);
> +    }
> +}
> +
> +static QEMUMachine virtex_machine = {
> +    .name = "virtex-ml507",
> +    .desc = "Xilinx Virtex ML507 reference design",
> +    .init = virtex_init,
>   

Hrm. Where is your main system bus? I don't see you create any qdev bus.


Alex