Commit d94e7434 authored by Peter A. G. Crosthwaite's avatar Peter A. G. Crosthwaite Committed by Edgar E. Iglesias
Browse files

microblaze: factored out common boot code 



factored out the copy-pasted common boot code from the two microblaze platforms
into a dedicated microblaze bootloader (microblaze_boot.o).

Signed-off-by: default avatarPeter A. G. Crosthwaite <peter.crosthwaite@petalogix.com>
Signed-off-by: default avatarEdgar E. Iglesias <edgar.iglesias@gmail.com>
parent 27a9476c

Makefile.target

+1 −0
Original line number Diff line number Diff line
@@ -307,6 +307,7 @@ obj-mips-$(CONFIG_FULONG) += bonito.o vt82c686.o mips_fulong2e.o 


obj-microblaze-y = petalogix_s3adsp1800_mmu.o

obj-microblaze-y += petalogix_ml605_mmu.o

obj-microblaze-y += microblaze_boot.o



obj-microblaze-y += microblaze_pic_cpu.o

obj-microblaze-y += xilinx_intc.o

hw/microblaze_boot.c

0 → 100644
+183 −0
Original line number Diff line number Diff line 
/*

 * Microblaze kernel loader

 *

 * Copyright (c) 2012 Peter Crosthwaite <peter.crosthwaite@petalogix.com>

 * Copyright (c) 2012 PetaLogix

 * Copyright (c) 2009 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 "qemu-option.h"

#include "qemu-config.h"

#include "qemu-common.h"

#include "device_tree.h"

#include "loader.h"

#include "elf.h"



#include "microblaze_boot.h"



static struct

{

    void (*machine_cpu_reset)(CPUState *);

    uint32_t bootstrap_pc;

    uint32_t cmdline;

    uint32_t fdt;

} boot_info;



static void main_cpu_reset(void *opaque)

{

    CPUState *env = opaque;



    cpu_reset(env);

    env->regs[5] = boot_info.cmdline;

    env->regs[7] = boot_info.fdt;

    env->sregs[SR_PC] = boot_info.bootstrap_pc;

    if (boot_info.machine_cpu_reset) {

        boot_info.machine_cpu_reset(env);

    }

}



static int microblaze_load_dtb(target_phys_addr_t addr,

                                      uint32_t ramsize,

                                      const char *kernel_cmdline,

                                      const char *dtb_filename)

{

    char *path;

    int fdt_size;

#ifdef CONFIG_FDT

    void *fdt;

    int r;



    /* Try the local "mb.dtb" override.  */

    fdt = load_device_tree("mb.dtb", &fdt_size);

    if (!fdt) {

        path = qemu_find_file(QEMU_FILE_TYPE_BIOS, dtb_filename);

        if (path) {

            fdt = load_device_tree(path, &fdt_size);

            g_free(path);

        }

        if (!fdt) {

            return 0;

        }

    }



    if (kernel_cmdline) {

        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("mb.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);

            g_free(path);

        }

    }



    if (kernel_cmdline) {

        fprintf(stderr,

                "Warning: missing libfdt, cannot pass cmdline to kernel!\n");

    }

#endif

    return fdt_size;

}



static uint64_t translate_kernel_address(void *opaque, uint64_t addr)

{

    return addr - 0x30000000LL;

}



void microblaze_load_kernel(CPUState *env, target_phys_addr_t ddr_base,

                            uint32_t ramsize, const char *dtb_filename,

                                  void (*machine_cpu_reset)(CPUState *))

{



    QemuOpts *machine_opts;

    const char *kernel_filename = NULL;

    const char *kernel_cmdline = NULL;



    machine_opts = qemu_opts_find(qemu_find_opts("machine"), 0);

    if (machine_opts) {

        kernel_filename = qemu_opt_get(machine_opts, "kernel");

        kernel_cmdline = qemu_opt_get(machine_opts, "append");

    }



    boot_info.machine_cpu_reset = machine_cpu_reset;

    qemu_register_reset(main_cpu_reset, env);



    if (kernel_filename) {

        int kernel_size;

        uint64_t entry, low, high;

        uint32_t base32;

        int big_endian = 0;



#ifdef TARGET_WORDS_BIGENDIAN

        big_endian = 1;

#endif



        /* Boots a kernel elf binary.  */

        kernel_size = load_elf(kernel_filename, NULL, NULL,

                               &entry, &low, &high,

                               big_endian, ELF_MACHINE, 0);

        base32 = entry;

        if (base32 == 0xc0000000) {

            kernel_size = load_elf(kernel_filename, translate_kernel_address,

                                   NULL, &entry, NULL, NULL,

                                   big_endian, ELF_MACHINE, 0);

        }

        /* Always boot into physical ram.  */

        boot_info.bootstrap_pc = ddr_base + (entry & 0x0fffffff);



        /* If it wasn't an ELF image, try an u-boot image.  */

        if (kernel_size < 0) {

            target_phys_addr_t uentry, loadaddr;



            kernel_size = load_uimage(kernel_filename, &uentry, &loadaddr, 0);

            boot_info.bootstrap_pc = uentry;

            high = (loadaddr + kernel_size + 3) & ~3;

        }



        /* Not an ELF image nor an u-boot image, try a RAW image.  */

        if (kernel_size < 0) {

            kernel_size = load_image_targphys(kernel_filename, ddr_base,

                                              ram_size);

            boot_info.bootstrap_pc = ddr_base;

            high = (ddr_base + kernel_size + 3) & ~3;

        }



        boot_info.cmdline = high + 4096;

        if (kernel_cmdline && strlen(kernel_cmdline)) {

            pstrcpy_targphys("cmdline", boot_info.cmdline, 256, kernel_cmdline);

        }

        /* Provide a device-tree.  */

        boot_info.fdt = boot_info.cmdline + 4096;

        microblaze_load_dtb(boot_info.fdt, ram_size, kernel_cmdline,

                                                     dtb_filename);

    }



}

hw/microblaze_boot.h

0 → 100644
+10 −0
Original line number Diff line number Diff line 
#ifndef __MICROBLAZE_BOOT__

#define __MICROBLAZE_BOOT__



#include "hw.h"



void microblaze_load_kernel(CPUState *env, target_phys_addr_t ddr_base,

                            uint32_t ramsize, const char *dtb_filename,

                                  void (*machine_cpu_reset)(CPUState *));



#endif /* __MICROBLAZE_BOOT __ */

hw/petalogix_ml605_mmu.c

+13 −131
Original line number Diff line number Diff line
@@ -32,35 +32,30 @@ 
#include "sysemu.h"

#include "devices.h"

#include "boards.h"

#include "device_tree.h"

#include "xilinx.h"

#include "loader.h"

#include "elf.h"

#include "blockdev.h"

#include "pc.h"

#include "exec-memory.h"



#include "microblaze_boot.h"

#include "microblaze_pic_cpu.h"

#include "xilinx_axidma.h"



#define LMB_BRAM_SIZE  (128 * 1024)

#define FLASH_SIZE     (32 * 1024 * 1024)



static struct

{

    uint32_t bootstrap_pc;

    uint32_t cmdline;

    uint32_t fdt;

} boot_info;

#define BINARY_DEVICE_TREE_FILE "petalogix-ml605.dtb"



static void main_cpu_reset(void *opaque)

{

    CPUState *env = opaque;

#define MEMORY_BASEADDR 0x50000000

#define FLASH_BASEADDR 0x86000000

#define INTC_BASEADDR 0x81800000

#define TIMER_BASEADDR 0x83c00000

#define UART16550_BASEADDR 0x83e00000

#define AXIENET_BASEADDR 0x82780000

#define AXIDMA_BASEADDR 0x84600000



    cpu_reset(env);

    env->regs[5] = boot_info.cmdline;

    env->regs[7] = boot_info.fdt;

    env->sregs[SR_PC] = boot_info.bootstrap_pc;

static void machine_cpu_reset(CPUState *env)

{

    env->pvr.regs[10] = 0x0e000000; /* virtex 6 */

    /* setup pvr to match kernel setting */

    env->pvr.regs[5] |= PVR5_DCACHE_WRITEBACK_MASK;
@@ -71,70 +66,6 @@ static void main_cpu_reset(void *opaque) 
    env->pvr.regs[5] = 0xc56be000;

}



#define BINARY_DEVICE_TREE_FILE "petalogix-ml605.dtb"

static int petalogix_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 "mb.dtb" override.  */

    fdt = load_device_tree("mb.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);

            g_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("mb.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);

            g_free(path);

        }

    }



    if (kernel_cmdline) {

        fprintf(stderr,

                "Warning: missing libfdt, cannot pass cmdline to kernel!\n");

    }

#endif

    return fdt_size;

}



static uint64_t translate_kernel_address(void *opaque, uint64_t addr)

{

    return addr - 0x30000000LL;

}



#define MEMORY_BASEADDR 0x50000000

#define FLASH_BASEADDR 0x86000000

#define INTC_BASEADDR 0x81800000

#define TIMER_BASEADDR 0x83c00000

#define UART16550_BASEADDR 0x83e00000

#define AXIENET_BASEADDR 0x82780000

#define AXIDMA_BASEADDR 0x84600000



static void

petalogix_ml605_init(ram_addr_t ram_size,

                          const char *boot_device,
@@ -145,7 +76,6 @@ petalogix_ml605_init(ram_addr_t ram_size, 
    MemoryRegion *address_space_mem = get_system_memory();

    DeviceState *dev;

    CPUState *env;

    int kernel_size;

    DriveInfo *dinfo;

    int i;

    target_phys_addr_t ddr_base = MEMORY_BASEADDR;
@@ -159,8 +89,6 @@ petalogix_ml605_init(ram_addr_t ram_size, 
    }

    env = cpu_init(cpu_model);



    qemu_register_reset(main_cpu_reset, env);



    /* Attach emulated BRAM through the LMB.  */

    memory_region_init_ram(phys_lmb_bram, "petalogix_ml605.lmb_bram",

                           LMB_BRAM_SIZE);
@@ -203,55 +131,9 @@ petalogix_ml605_init(ram_addr_t ram_size, 
                                     irq[1], irq[0], 100 * 1000000);

    }



    if (kernel_filename) {

        uint64_t entry, low, high;

        uint32_t base32;

        int big_endian = 0;



#ifdef TARGET_WORDS_BIGENDIAN

        big_endian = 1;

#endif



        /* Boots a kernel elf binary.  */

        kernel_size = load_elf(kernel_filename, NULL, NULL,

                               &entry, &low, &high,

                               big_endian, ELF_MACHINE, 0);

        base32 = entry;

        if (base32 == 0xc0000000) {

            kernel_size = load_elf(kernel_filename, translate_kernel_address,

                                   NULL, &entry, NULL, NULL,

                                   big_endian, ELF_MACHINE, 0);

        }

        /* Always boot into physical ram.  */

        boot_info.bootstrap_pc = ddr_base + (entry & 0x0fffffff);



        /* If it wasn't an ELF image, try an u-boot image.  */

        if (kernel_size < 0) {

            target_phys_addr_t uentry, loadaddr;

    microblaze_load_kernel(env, ddr_base, ram_size, BINARY_DEVICE_TREE_FILE,

                                                            machine_cpu_reset);



            kernel_size = load_uimage(kernel_filename, &uentry, &loadaddr, 0);

            boot_info.bootstrap_pc = uentry;

            high = (loadaddr + kernel_size + 3) & ~3;

        }



        /* Not an ELF image nor an u-boot image, try a RAW image.  */

        if (kernel_size < 0) {

            kernel_size = load_image_targphys(kernel_filename, ddr_base,

                                              ram_size);

            boot_info.bootstrap_pc = ddr_base;

            high = (ddr_base + kernel_size + 3) & ~3;

        }



        boot_info.cmdline = high + 4096;

        if (kernel_cmdline && strlen(kernel_cmdline)) {

            pstrcpy_targphys("cmdline", boot_info.cmdline, 256, kernel_cmdline);

        }

        /* Provide a device-tree.  */

        boot_info.fdt = boot_info.cmdline + 4096;

        petalogix_load_device_tree(boot_info.fdt, ram_size,

                                   0, 0,

                                   kernel_cmdline);

    }

}



static QEMUMachine petalogix_ml605_machine = {

hw/petalogix_s3adsp1800_mmu.c

+4 −123
Original line number Diff line number Diff line
@@ -30,88 +30,17 @@ 
#include "sysemu.h"

#include "devices.h"

#include "boards.h"

#include "device_tree.h"

#include "xilinx.h"

#include "loader.h"

#include "elf.h"

#include "blockdev.h"

#include "exec-memory.h"



#include "microblaze_boot.h"

#include "microblaze_pic_cpu.h"



#define LMB_BRAM_SIZE  (128 * 1024)

#define FLASH_SIZE     (16 * 1024 * 1024)



static struct

{

    uint32_t bootstrap_pc;

    uint32_t cmdline;

    uint32_t fdt;

} boot_info;



static void main_cpu_reset(void *opaque)

{

    CPUState *env = opaque;



    cpu_reset(env);

    env->regs[5] = boot_info.cmdline;

    env->regs[7] = boot_info.fdt;

    env->sregs[SR_PC] = boot_info.bootstrap_pc;

}



#define BINARY_DEVICE_TREE_FILE "petalogix-s3adsp1800.dtb"

static int petalogix_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 "mb.dtb" override.  */

    fdt = load_device_tree("mb.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);

            g_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("mb.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);

	    g_free(path);

        }

    }



    if (kernel_cmdline) {

        fprintf(stderr,

                "Warning: missing libfdt, cannot pass cmdline to kernel!\n");

    }

#endif

    return fdt_size;

}



static uint64_t translate_kernel_address(void *opaque, uint64_t addr)

{

    return addr - 0x30000000LL;

}



static void

petalogix_s3adsp1800_init(ram_addr_t ram_size,
@@ -122,7 +51,6 @@ petalogix_s3adsp1800_init(ram_addr_t ram_size, 
{

    DeviceState *dev;

    CPUState *env;

    int kernel_size;

    DriveInfo *dinfo;

    int i;

    target_phys_addr_t ddr_base = 0x90000000;
@@ -137,8 +65,8 @@ petalogix_s3adsp1800_init(ram_addr_t ram_size, 
    }

    env = cpu_init(cpu_model);



    /* FIXME: move to machine specfic cpu reset */

    env->pvr.regs[10] = 0x0c000000; /* spartan 3a dsp family.  */

    qemu_register_reset(main_cpu_reset, env);



    /* Attach emulated BRAM through the LMB.  */

    memory_region_init_ram(phys_lmb_bram,
@@ -168,55 +96,8 @@ petalogix_s3adsp1800_init(ram_addr_t ram_size, 
    xilinx_timer_create(0x83c00000, irq[0], 2, 62 * 1000000);

    xilinx_ethlite_create(&nd_table[0], 0x81000000, irq[1], 0, 0);



    if (kernel_filename) {

        uint64_t entry, low, high;

        uint32_t base32;

        int big_endian = 0;



#ifdef TARGET_WORDS_BIGENDIAN

        big_endian = 1;

#endif



        /* Boots a kernel elf binary.  */

        kernel_size = load_elf(kernel_filename, NULL, NULL,

                               &entry, &low, &high,

                               big_endian, ELF_MACHINE, 0);

        base32 = entry;

        if (base32 == 0xc0000000) {

            kernel_size = load_elf(kernel_filename, translate_kernel_address,

                                   NULL, &entry, NULL, NULL,

                                   big_endian, ELF_MACHINE, 0);

        }

        /* Always boot into physical ram.  */

        boot_info.bootstrap_pc = ddr_base + (entry & 0x0fffffff);



        /* If it wasn't an ELF image, try an u-boot image.  */

        if (kernel_size < 0) {

            target_phys_addr_t uentry, loadaddr;



            kernel_size = load_uimage(kernel_filename, &uentry, &loadaddr, 0);

            boot_info.bootstrap_pc = uentry;

            high = (loadaddr + kernel_size + 3) & ~3;

        }



        /* Not an ELF image nor an u-boot image, try a RAW image.  */

        if (kernel_size < 0) {

            kernel_size = load_image_targphys(kernel_filename, ddr_base,

                                              ram_size);

            boot_info.bootstrap_pc = ddr_base;

            high = (ddr_base + kernel_size + 3) & ~3;

        }



        boot_info.cmdline = high + 4096;

        if (kernel_cmdline && strlen(kernel_cmdline)) {

            pstrcpy_targphys("cmdline", boot_info.cmdline, 256, kernel_cmdline);

        }

        /* Provide a device-tree.  */

        boot_info.fdt = boot_info.cmdline + 4096; 

        petalogix_load_device_tree(boot_info.fdt, ram_size,

                                   0, 0,

                                   kernel_cmdline);

    }

    microblaze_load_kernel(env, ddr_base, ram_size,

                    BINARY_DEVICE_TREE_FILE, NULL);

}



static QEMUMachine petalogix_s3adsp1800_machine = {