Add a Linux-specific pre-boot routine that matches the device specific bootloaders behaviour. This is needed for modern Linux that expects the ARM PLL in SLCR to be a more even value (not 26).
FIXME: The blob population should only happen on Linux boots. Signed-off-by: Peter Crosthwaite <crosthwaite.pe...@gmail.com> --- hw/arm/xilinx_zynq.c | 41 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index 9f89483..5bf03de 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -43,6 +43,41 @@ static const int dma_irqs[8] = { 46, 47, 48, 49, 72, 73, 74, 75 }; +#define LOAD_ADDR 0x1000 +#define FW_BLOB_ADDR 0x0 + +#define SLCR_ARM_PLL_OFFSET 0x100 +#define SLCR_LOCK_OFFSET 0x004 +#define SLCR_UNLOCK_OFFSET 0x008 + +#define SLCR_XILINX_UNLOCK_KEY 0xdf0d +#define SLCR_XILINX_LOCK_KEY 0x767b + +#define SLCR_WRITE(addr, val) \ + 0xe3a01000 + extract32((val), 0, 8), \ + 0xe3811c00 + extract32((val), 8, 8), \ + 0xe3811800 + extract32((val), 16, 8), \ + 0xe3811400 + extract32((val), 24, 8), \ + 0xe5801000 + (addr), + +static void zynq_write_fw_blob(void) +{ + int n; + uint32_t fw_blob[] = { + 0xe3a004f8, /* mov r0, #0xf8000000 */ + SLCR_WRITE(SLCR_UNLOCK_OFFSET, SLCR_XILINX_UNLOCK_KEY) + SLCR_WRITE(SLCR_ARM_PLL_OFFSET, 0x00014008) + //SLCR_WRITE(0x120, 0x1f000200) + SLCR_WRITE(SLCR_LOCK_OFFSET, SLCR_XILINX_LOCK_KEY) + 0xe12fff1e, /* bx lr */ + }; + for (n = 0; n < ARRAY_SIZE(fw_blob); n++) { + fw_blob[n] = tswap32(fw_blob[n]); + } + rom_add_blob_fixed("firmware", fw_blob, sizeof(fw_blob), FW_BLOB_ADDR); +} + + static struct arm_boot_info zynq_binfo = {}; static void gem_init(NICInfo *nd, uint32_t base, qemu_irq irq) @@ -251,7 +286,11 @@ static void zynq_init(MachineState *machine) zynq_binfo.initrd_filename = initrd_filename; zynq_binfo.nb_cpus = 1; zynq_binfo.board_id = 0xd32; - zynq_binfo.loader_start = 0; + zynq_binfo.loader_start = LOAD_ADDR; + zynq_binfo.board_setup_blob = true; + zynq_binfo.board_setup_blob_addr = FW_BLOB_ADDR; + + zynq_write_fw_blob(); arm_load_kernel(ARM_CPU(first_cpu), &zynq_binfo); } -- 1.9.1