From nobody Mon Feb 9 10:29:08 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1555669249; cv=none; d=zoho.com; s=zohoarc; b=mauyYjP7HdWJ1kZ514N+pqvmtKLMP6AsKxwEtBdJK0AK/sPJDM2RyUA3a+6BOIX9yhL+yUkS/j5lNPFkE7tUbjr2S8VgvBQFAMrQz41QitCjvLiwB9qWht+3DteGCm5OFqTZpONol08sNNqRSBPFNPogbT+cTNr2xeGgWnjmLuM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555669249; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=v5cokx4nXjwh8r/JVk8jPiL+ZAGb0tquWy7Hooe+6nM=; b=fumymd1mF9mSkwtfdUE1M4Nn8lq/026x9A/Oi8b46IManX22x2SRrw22VXultGC+2dKwgudBg8WTCW8sJUDFsi2Wveye9ASb3XBn+H61v/PuMWjYm/OrEogoU7f+vfMV6pPLnei23r/Kwb4Apk642deaQ2m2ZjgPtzUxOzI2Mck= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555669249040481.63085687503394; Fri, 19 Apr 2019 03:20:49 -0700 (PDT) Received: from localhost ([127.0.0.1]:54328 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHQdP-0004J1-Ih for importer@patchew.org; Fri, 19 Apr 2019 06:20:43 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50750) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHQbR-0003BM-ID for qemu-devel@nongnu.org; Fri, 19 Apr 2019 06:18:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHQbQ-0002v0-8v for qemu-devel@nongnu.org; Fri, 19 Apr 2019 06:18:41 -0400 Received: from mel.act-europe.fr ([2a02:2ab8:224:1::a0a:d2]:58529 helo=smtp.eu.adacore.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hHQbP-0002tr-V2 for qemu-devel@nongnu.org; Fri, 19 Apr 2019 06:18:40 -0400 Received: from localhost (localhost [127.0.0.1]) by filtered-smtp.eu.adacore.com (Postfix) with ESMTP id D20A281393; Fri, 19 Apr 2019 12:18:37 +0200 (CEST) Received: from smtp.eu.adacore.com ([127.0.0.1]) by localhost (smtp.eu.adacore.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RKDGppgIkXWq; Fri, 19 Apr 2019 12:18:37 +0200 (CEST) Received: from localhost.localdomain.localdomain (apoitiers-155-1-191-106.w109-220.abo.wanadoo.fr [109.220.154.106]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.eu.adacore.com (Postfix) with ESMTPSA id 928E181391; Fri, 19 Apr 2019 12:18:37 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at eu.adacore.com From: KONRAD Frederic To: qemu-devel@nongnu.org Date: Fri, 19 Apr 2019 12:18:10 +0200 Message-Id: <1555669092-10351-2-git-send-email-frederic.konrad@adacore.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1555669092-10351-1-git-send-email-frederic.konrad@adacore.com> References: <1555669092-10351-1-git-send-email-frederic.konrad@adacore.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 2a02:2ab8:224:1::a0a:d2 Subject: [Qemu-devel] [PATCH V1 1/3] leon3: add a little bootloader X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, mark.cave-ayland@ilande.co.uk, chouteau@adacore.com, frederic.konrad@adacore.com, philmd@redhat.com, atar4qemu@gmail.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This adds a little bootloader to the leon3_machine when a ram image is given through the kernel parameter and no bios are provided: * The UART transmiter is enabled. * The TIMER is initialized. Signed-off-by: KONRAD Frederic Reviewed-by: Fabien Chouteau Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/sparc/leon3.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++---= ---- 1 file changed, 70 insertions(+), 10 deletions(-) diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c index 774639a..2c6f486 100644 --- a/hw/sparc/leon3.c +++ b/hw/sparc/leon3.c @@ -1,7 +1,7 @@ /* * QEMU Leon3 System Emulator * - * Copyright (c) 2010-2011 AdaCore + * Copyright (c) 2010-2019 AdaCore * * Permission is hereby granted, free of charge, to any person obtaining a= copy * of this software and associated documentation files (the "Software"), t= o deal @@ -44,6 +44,8 @@ #define CPU_CLK (40 * 1000 * 1000) =20 #define PROM_FILENAME "u-boot.bin" +#define LEON3_PROM_OFFSET (0x00000000) +#define LEON3_RAM_OFFSET (0x40000000) =20 #define MAX_PILS 16 =20 @@ -53,6 +55,55 @@ typedef struct ResetData { target_ulong sp; /* initial stack pointer */ } ResetData; =20 +static uint32_t *gen_write_to_addr(uint32_t *code, hwaddr addr, uint32_t v= al) +{ + stl_p(code++, 0x82100000); /* mov %g0, %g1 */ + stl_p(code++, 0x84100000); /* mov %g0, %g2 */ + stl_p(code++, 0x03000000 + + extract32(addr, 10, 22)); + /* sethi %hi(addr), %g1 */ + stl_p(code++, 0x82106000 + + extract32(addr, 0, 10)); + /* or %g1, addr, %g1 */ + stl_p(code++, 0x05000000 + + extract32(val, 10, 22)); + /* sethi %hi(val), %g2 */ + stl_p(code++, 0x8410a000 + + extract32(val, 0, 10)); + /* or %g2, val, %g2 */ + stl_p(code++, 0xc4204000); /* st %g2, [ %g1 ] */ + + return code; +} + +/* + * When loading a kernel in RAM the machine is expected to be in a differe= nt + * state (eg: initialized by the bootloader). This little code reproduces + * this behavior. + */ +static void write_bootloader(CPUSPARCState *env, uint8_t *base, + hwaddr kernel_addr) +{ + uint32_t *p =3D (uint32_t *) base; + + /* Initialize the UARTs */ + p =3D gen_write_to_addr(p, 0x80000108, 3); + + /* Initialize the TIMER 0 */ + p =3D gen_write_to_addr(p, 0x80000304, 39); + p =3D gen_write_to_addr(p, 0x80000314, 0xFFFFFFFE); + p =3D gen_write_to_addr(p, 0x80000318, 3); + + /* JUMP to the entry point */ + stl_p(p++, 0x82100000); /* mov %g0, %g1 */ + stl_p(p++, 0x03000000 + extract32(kernel_addr, 10, 22)); + /* sethi %hi(kernel_addr), %g1 */ + stl_p(p++, 0x82106000 + extract32(kernel_addr, 0, 10)); + /* or kernel_addr, %g1 */ + stl_p(p++, 0x81c04000); /* jmp %g1 */ + stl_p(p++, 0x01000000); /* nop */ +} + static void main_cpu_reset(void *opaque) { ResetData *s =3D (ResetData *)opaque; @@ -131,11 +182,12 @@ static void leon3_generic_hw_init(MachineState *machi= ne) /* Reset data */ reset_info =3D g_malloc0(sizeof(ResetData)); reset_info->cpu =3D cpu; - reset_info->sp =3D 0x40000000 + ram_size; + reset_info->sp =3D LEON3_RAM_OFFSET + ram_size; qemu_register_reset(main_cpu_reset, reset_info); =20 /* Allocate IRQ manager */ - grlib_irqmp_create(0x80000200, env, &cpu_irqs, MAX_PILS, &leon3_set_pi= l_in); + grlib_irqmp_create(0x80000200, env, &cpu_irqs, MAX_PILS, + &leon3_set_pil_in); =20 env->qemu_irq_ack =3D leon3_irq_manager; =20 @@ -148,13 +200,13 @@ static void leon3_generic_hw_init(MachineState *machi= ne) } =20 memory_region_allocate_system_memory(ram, NULL, "leon3.ram", ram_size); - memory_region_add_subregion(address_space_mem, 0x40000000, ram); + memory_region_add_subregion(address_space_mem, LEON3_RAM_OFFSET, ram); =20 /* Allocate BIOS */ prom_size =3D 8 * MiB; memory_region_init_ram(prom, NULL, "Leon3.bios", prom_size, &error_fat= al); memory_region_set_readonly(prom, true); - memory_region_add_subregion(address_space_mem, 0x00000000, prom); + memory_region_add_subregion(address_space_mem, LEON3_PROM_OFFSET, prom= ); =20 /* Load boot prom */ if (bios_name =3D=3D NULL) { @@ -174,7 +226,7 @@ static void leon3_generic_hw_init(MachineState *machine) } =20 if (bios_size > 0) { - ret =3D load_image_targphys(filename, 0x00000000, bios_size); + ret =3D load_image_targphys(filename, LEON3_PROM_OFFSET, bios_size= ); if (ret < 0 || ret > prom_size) { error_report("could not load prom '%s'", filename); exit(1); @@ -198,10 +250,18 @@ static void leon3_generic_hw_init(MachineState *machi= ne) exit(1); } if (bios_size <=3D 0) { - /* If there is no bios/monitor, start the application. */ - env->pc =3D entry; - env->npc =3D entry + 4; - reset_info->entry =3D entry; + /* + * If there is no bios/monitor just start the application but = put + * the machine in an initialized state through a little + * bootloader. + */ + uint8_t *bootloader_entry; + + bootloader_entry =3D memory_region_get_ram_ptr(prom); + write_bootloader(env, bootloader_entry, entry); + env->pc =3D LEON3_PROM_OFFSET; + env->npc =3D LEON3_PROM_OFFSET + 4; + reset_info->entry =3D LEON3_PROM_OFFSET; } } =20 --=20 1.8.3.1