From patchwork Thu Jul 9 01:09:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 11653149 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 967A5618 for ; Thu, 9 Jul 2020 01:10:14 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6D7C920739 for ; Thu, 9 Jul 2020 01:10:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Vi2PWSg3" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6D7C920739 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:41662 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jtL4n-0003eF-Kh for patchwork-qemu-devel@patchwork.kernel.org; Wed, 08 Jul 2020 21:10:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53438) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jtL3y-0002QX-Es; Wed, 08 Jul 2020 21:09:22 -0400 Received: from mail-pj1-x1042.google.com ([2607:f8b0:4864:20::1042]:53750) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jtL3w-0004dE-QE; Wed, 08 Jul 2020 21:09:22 -0400 Received: by mail-pj1-x1042.google.com with SMTP id cm21so339068pjb.3; Wed, 08 Jul 2020 18:09:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=DMPcXBPT3sVJAnuBxLEiaF82OmeeooQVYUpuYan8c3k=; b=Vi2PWSg3ZO2OV/Qxan4Z5Tz8/zVG6mx2rml/U54zDkjFzysMUVX9Vt2h/f8/jqt1S9 vz+1cgcBkoDNaWZxNqHlwPwDnMErY8w34gQ6j9jmr0aoOjyJRvGoT+nn9ugTE+9lLVZZ 4gnoy4Z8eX2OUGkaabAAyYXyBeRCxEe2wm089NLfSPNg6fdA1afHV8vSRQSKsWUMUG1X T+LxqI1hdkKZu3YHs38ga/Kv9cjCGymkgyh9FDjfR+DSUeOHrbL2ZjLWbve+uCi4q6l/ t/GMDk158ifBZqdXm99w0ItIOCHynxVRaYD4JrWQjgG9BuviNctYcIXr8OA/LjyK6ed6 wSMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=DMPcXBPT3sVJAnuBxLEiaF82OmeeooQVYUpuYan8c3k=; b=kBynESmhQit1E+SJoMVgKDfw9F9CGVGdT8S3KF2PNDxuqaf0Cn9SaxypOsP/LcloqI ipyRodF2BgWmuy3bBXlqby0DYG1v7d0ven7PCYECQrY3Wk23iB//v5dGaayI4gf/cnz8 jdNomHAVoyy9jTZOMHIK9ibswsWLZFhUO5P6yS8YhvQON6Q2ame++NuigGFDdlhjOy7y ZGPlnNiTGJlD9e1t3U43+9pxYQ4KCLvGF5RIT87iVMtpV8yM4haPiKGA9h6qeo3HQ/Pc jvVBBx9Es4bHOowtUDiIo0gP59gJ1Ifp0R8zug7MfhaYi3AcR/pNVhwpUUSICMiV00hX LpGg== X-Gm-Message-State: AOAM530eaLQ7dsVa+1y5ueOq6NICDcn3UvHyZjwh7AsF/K0k58+JR32p XY3+dsK/0Z/0X75uZqb1EzU= X-Google-Smtp-Source: ABdhPJwHbl/7sm6/OYM0/wmHJptwsbxmFGtE4ApODFf1PPYYb0q6jb7TZ7GpqWfC95+1eXGaq8p+Dg== X-Received: by 2002:a17:902:c401:: with SMTP id k1mr30542589plk.202.1594256958565; Wed, 08 Jul 2020 18:09:18 -0700 (PDT) Received: from localhost.localdomain (unknown-224-80.windriver.com. [147.11.224.80]) by smtp.gmail.com with ESMTPSA id g3sm868071pfq.19.2020.07.08.18.09.17 (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 08 Jul 2020 18:09:18 -0700 (PDT) From: Bin Meng To: Alistair Francis , Bastian Koppelmann , Palmer Dabbelt , Sagar Karandikar , qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH 1/2] hw/riscv: Modify MROM size to end at 0x10000 Date: Wed, 8 Jul 2020 18:09:04 -0700 Message-Id: <1594256945-21744-1-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.1 Received-SPF: pass client-ip=2607:f8b0:4864:20::1042; envelope-from=bmeng.cn@gmail.com; helo=mail-pj1-x1042.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bin Meng Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Bin Meng At present the size of Mask ROM for sifive_u / spike / virt machines is set to 0x11000, which ends at an unusual address. This changes the size to 0xf000 so that it ends at 0x10000. Signed-off-by: Bin Meng Reviewed-by: Philippe Mathieu-Daudé --- hw/riscv/sifive_u.c | 2 +- hw/riscv/spike.c | 2 +- hw/riscv/virt.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index dc46f64..3413369 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -70,7 +70,7 @@ static const struct MemmapEntry { hwaddr size; } sifive_u_memmap[] = { [SIFIVE_U_DEBUG] = { 0x0, 0x100 }, - [SIFIVE_U_MROM] = { 0x1000, 0x11000 }, + [SIFIVE_U_MROM] = { 0x1000, 0xf000 }, [SIFIVE_U_CLINT] = { 0x2000000, 0x10000 }, [SIFIVE_U_L2LIM] = { 0x8000000, 0x2000000 }, [SIFIVE_U_PLIC] = { 0xc000000, 0x4000000 }, diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c index a187aa3..ea4be98 100644 --- a/hw/riscv/spike.c +++ b/hw/riscv/spike.c @@ -57,7 +57,7 @@ static const struct MemmapEntry { hwaddr base; hwaddr size; } spike_memmap[] = { - [SPIKE_MROM] = { 0x1000, 0x11000 }, + [SPIKE_MROM] = { 0x1000, 0xf000 }, [SPIKE_CLINT] = { 0x2000000, 0x10000 }, [SPIKE_DRAM] = { 0x80000000, 0x0 }, }; diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 5ca49c5..37b8c55 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -53,7 +53,7 @@ static const struct MemmapEntry { hwaddr size; } virt_memmap[] = { [VIRT_DEBUG] = { 0x0, 0x100 }, - [VIRT_MROM] = { 0x1000, 0x11000 }, + [VIRT_MROM] = { 0x1000, 0xf000 }, [VIRT_TEST] = { 0x100000, 0x1000 }, [VIRT_RTC] = { 0x101000, 0x1000 }, [VIRT_CLINT] = { 0x2000000, 0x10000 }, From patchwork Thu Jul 9 01:09:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 11653151 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0C95A14DD for ; Thu, 9 Jul 2020 01:10:15 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D8D1720739 for ; Thu, 9 Jul 2020 01:10:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HuvdCf5m" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D8D1720739 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:41638 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jtL4o-0003dh-3r for patchwork-qemu-devel@patchwork.kernel.org; Wed, 08 Jul 2020 21:10:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53442) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jtL3y-0002RB-Vl; Wed, 08 Jul 2020 21:09:22 -0400 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]:40809) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jtL3x-0004dI-BR; Wed, 08 Jul 2020 21:09:22 -0400 Received: by mail-pg1-x542.google.com with SMTP id e18so197233pgn.7; Wed, 08 Jul 2020 18:09:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Rzogyha5+VyEqgQmO+ZRoX1hNxug0G55gpp60N51A2g=; b=HuvdCf5mupCxLouSVELAzwxOzDS+IOoSP5XOZ+bbVv2TQf79YrJCcFJU9p4+h6O+IC oFxwlW3gC4WskXx5lBcxYScbuqhmtHL4B3FKtNE7/WCPxJEqYfmRDRDMluXiUjuhTnY8 aAnVOaSHFxyb6VbfkRwQM/ZsiPaPUZTDZK5shORog1yLFtmRpF3HNRt3yMsDPAb9qFuL SkdWU0DaUY0LbyXksasOzXRIqxeapkhRRXaHL8hknbR+14n4uP6K3IV/9jxLu88bt1To NwzM3rvhzBqOmoywIciYs0xJOITaHbP2iu8QWhvgs/KUtzWb6OHmLLZxZr5IXfgyEi+R 9KHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Rzogyha5+VyEqgQmO+ZRoX1hNxug0G55gpp60N51A2g=; b=JBi2JEtCvihyaMmbJfKbLmrFyqOsFoH9ka+JtNO3iExCEYrwnHgpgeoCwv9FyTesVw H5WRRllQOgnHyCSCb9SMyPdfvXZH5ogaFWmwL39J8iKnc3dIR5uXZkuE4mVsRi4AUuki 2Njxzwiriu1aQBJakgQe+7K50h2/meRVxCZdHckg8LvxFs2MBO0VoLOcAw1ZM6VJSEIj e9dzPVGWluDUIXxsX5+2Z4Wt6oV320gfmWNiSuWZ3rSDBRFQ06Og79hS8n4vdzTqBTwA vSF+aukJCgmoTovFE7r41nu718n/8apjZeRgWU+I1jt+p4GMv615ralPHQFtvVGgWUVo 3S+Q== X-Gm-Message-State: AOAM531w++eZg7VMzD4iYog7e8nbTve/quXJEQkvQjebznaVF5TdhFda ovjjkAaRYKzIBdY0SMNrxe8= X-Google-Smtp-Source: ABdhPJzM3uqH/WcRXsh3ULzNcsnNoMk1vn57MQExIlMUvQ1p9I/8ZWj9ggAnEgXbnf7qndHoS5RLzA== X-Received: by 2002:a63:9d45:: with SMTP id i66mr52891860pgd.25.1594256959522; Wed, 08 Jul 2020 18:09:19 -0700 (PDT) Received: from localhost.localdomain (unknown-224-80.windriver.com. [147.11.224.80]) by smtp.gmail.com with ESMTPSA id g3sm868071pfq.19.2020.07.08.18.09.18 (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 08 Jul 2020 18:09:19 -0700 (PDT) From: Bin Meng To: Alistair Francis , Bastian Koppelmann , Palmer Dabbelt , Sagar Karandikar , qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH 2/2] hw/riscv: sifive_u: Provide a reliable way for bootloader to detect whether it is running in QEMU Date: Wed, 8 Jul 2020 18:09:05 -0700 Message-Id: <1594256945-21744-2-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1594256945-21744-1-git-send-email-bmeng.cn@gmail.com> References: <1594256945-21744-1-git-send-email-bmeng.cn@gmail.com> Received-SPF: pass client-ip=2607:f8b0:4864:20::542; envelope-from=bmeng.cn@gmail.com; helo=mail-pg1-x542.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bin Meng Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Bin Meng The reset vector codes are subject to change, e.g.: with recent fw_dynamic type image support, it breaks oreboot again. Add a subregion in the MROM, with the size of machine RAM stored, so that we can provide a reliable way for bootloader to detect whether it is running in QEMU. Signed-off-by: Bin Meng --- hw/riscv/sifive_u.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index 3413369..6d714a2 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -88,6 +88,7 @@ static const struct MemmapEntry { #define OTP_SERIAL 1 #define GEM_REVISION 0x10070109 +#define MROM_RAMSIZE_OFFSET 0xf8 static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap, uint64_t mem_size, const char *cmdline) @@ -382,6 +383,7 @@ static void sifive_u_machine_init(MachineState *machine) int i; uint32_t fdt_load_addr; uint64_t kernel_entry; + ram_addr_t ram_size = machine->ram_size; /* Initialize SoC */ object_initialize_child(OBJECT(machine), "soc", &s->soc, TYPE_RISCV_U_SOC); @@ -391,7 +393,7 @@ static void sifive_u_machine_init(MachineState *machine) /* register RAM */ memory_region_init_ram(main_mem, NULL, "riscv.sifive.u.ram", - machine->ram_size, &error_fatal); + ram_size, &error_fatal); memory_region_add_subregion(system_memory, memmap[SIFIVE_U_DRAM].base, main_mem); @@ -406,7 +408,7 @@ static void sifive_u_machine_init(MachineState *machine) qemu_allocate_irq(sifive_u_machine_reset, NULL, 0)); /* create device tree */ - create_fdt(s, memmap, machine->ram_size, machine->kernel_cmdline); + create_fdt(s, memmap, ram_size, machine->kernel_cmdline); if (s->start_in_flash) { /* @@ -443,7 +445,7 @@ static void sifive_u_machine_init(MachineState *machine) if (machine->initrd_filename) { hwaddr start; hwaddr end = riscv_load_initrd(machine->initrd_filename, - machine->ram_size, kernel_entry, + ram_size, kernel_entry, &start); qemu_fdt_setprop_cell(s->fdt, "/chosen", "linux,initrd-start", start); @@ -460,7 +462,7 @@ static void sifive_u_machine_init(MachineState *machine) /* Compute the fdt load address in dram */ fdt_load_addr = riscv_load_fdt(memmap[SIFIVE_U_DRAM].base, - machine->ram_size, s->fdt); + ram_size, s->fdt); #if defined(TARGET_RISCV64) start_addr_hi32 = start_addr >> 32; #endif @@ -496,6 +498,17 @@ static void sifive_u_machine_init(MachineState *machine) riscv_rom_copy_firmware_info(memmap[SIFIVE_U_MROM].base, memmap[SIFIVE_U_MROM].size, sizeof(reset_vec), kernel_entry); + + /* + * Tell guest the machine ram size at MROM_RAMSIZE_OFFSET. + * On real hardware, the 64-bit value from MROM_RAMSIZE_OFFSET is zero. + * QEMU aware bootloader (e.g.: oreboot, U-Boot) can check value stored + * here to determine whether it is running in QEMU. + */ + ram_size = cpu_to_le32(ram_size); + rom_add_blob_fixed_as("mrom.ram_size", &ram_size, sizeof(ram_size), + memmap[SIFIVE_U_MROM].base + MROM_RAMSIZE_OFFSET, + &address_space_memory); } static bool sifive_u_machine_get_start_in_flash(Object *obj, Error **errp)