From patchwork Sat May 5 23:35:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Clark X-Patchwork-Id: 10382469 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EEEC66053F for ; Sat, 5 May 2018 23:41:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D5F7728C3F for ; Sat, 5 May 2018 23:41:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CAAA928F5B; Sat, 5 May 2018 23:41:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 32E3728C3F for ; Sat, 5 May 2018 23:41:17 +0000 (UTC) Received: from localhost ([::1]:40283 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fF6nl-0007LV-2V for patchwork-qemu-devel@patchwork.kernel.org; Sat, 05 May 2018 19:41:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54228) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fF6je-0003pK-Ia for qemu-devel@nongnu.org; Sat, 05 May 2018 19:37:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fF6jd-0003Zy-Ni for qemu-devel@nongnu.org; Sat, 05 May 2018 19:37:02 -0400 Received: from mail-pg0-x243.google.com ([2607:f8b0:400e:c05::243]:37840) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fF6jd-0003Zo-Ho for qemu-devel@nongnu.org; Sat, 05 May 2018 19:37:01 -0400 Received: by mail-pg0-x243.google.com with SMTP id a13-v6so17785781pgu.4 for ; Sat, 05 May 2018 16:37:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=USSSK7S/Vpn9QRZZXmOnn9vRr0DRKPNDSFTBR54D4AM=; b=ZuE8rLdE79hK5+gdxOr4ntaaK3CjpxOxW2NWmVZ+gPr/DhpEDoiE0istG3WvXDL7yD z2We0SfZYIxik0dFfmobNzJLL/jygBZASkpTF5ZjX85E6TNmdlXkhAF+qwwlS4S2a85K mMJEmxVw5myqw2ZrHQvb+ZwR12Qyw0LjyHQKYSRcMLVzIqoiAsNLZbac4squT3tALGSJ Ug3B999gXvhUMZ2u0/vQeBjiUZOEDmtfjjoziDFKzK5uW5y94jLEKvKq9ksqL6lSY5RQ Vluv0cV734icfxaCBgSpFp4ULVG9IaeLKZbUs9M/9Qtd5681216R/m8cQeFSo/bVHftC KaZg== 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:mime-version:content-transfer-encoding; bh=USSSK7S/Vpn9QRZZXmOnn9vRr0DRKPNDSFTBR54D4AM=; b=HBpprdIZ3cvAH7GnmIXfPFCGiJ77IDGJNQVpH47oniuzK8b80Gpn69WQujX1hjLqyu hEOGDiaKN+IWZ91fymDYQdOOcQ6dMxQSj1hXTEGmhz4n854OimDuAvvB+eIfn1rG78rh wJuboMGYJjNyj77zuAX2nf30MX47kOf1vvV8BWuiy556gjgCd9PNvRNaImDUQt9XabDN jXp+qhhGLKHFzfj/oVDUFFP7/5J3dOnV6POWYdKunnYruKFOeyNHIVaSyqMMuk6F+WeW PZuWoy7O3xX9WW3tUYTIHNgbGMso0GDYROXNpdwh5YS/TNXObel7JlfryHE/4LMif5kG HIwA== X-Gm-Message-State: ALQs6tC5lLXH9h8ihRDvDyUkKkWWj8F09Vr5pakJul5tOt/oWVTV5jvz D3WZuq/OV/xLCAkCzaC0ZhnNHLRpg1Q= X-Google-Smtp-Source: AB8JxZqdOE011BnJmowukKNa3DodGMk6fdwuVS/OayZOscPk8OzjODrM/Wt1P9PQwhU8V6FW+ad3/g== X-Received: by 2002:a65:44cc:: with SMTP id g12-v6mr26140850pgs.110.1525563420512; Sat, 05 May 2018 16:37:00 -0700 (PDT) Received: from localhost.localdomain (122-58-167-38-fibre.bb.spark.co.nz. [122.58.167.38]) by smtp.gmail.com with ESMTPSA id x8sm47297094pfa.173.2018.05.05.16.36.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 05 May 2018 16:37:00 -0700 (PDT) From: Michael Clark To: qemu-devel@nongnu.org Date: Sun, 6 May 2018 11:35:08 +1200 Message-Id: <1525563325-62963-4-git-send-email-mjc@sifive.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1525563325-62963-1-git-send-email-mjc@sifive.com> References: <1525563325-62963-1-git-send-email-mjc@sifive.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::243 Subject: [Qemu-devel] [PULL 03/20] RISC-V: Use ROM base address and size from memmap 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: patches@groups.riscv.org, Michael Clark , Palmer Dabbelt , Sagar Karandikar , Bastian Koppelmann Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Another case of replacing hard coded constants, this time referring to the definition in the virt machine's memmap. Cc: Sagar Karandikar Cc: Bastian Koppelmann Signed-off-by: Michael Clark Signed-off-by: Palmer Dabbelt Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis --- hw/riscv/virt.c | 4 ++-- include/hw/riscv/virt.h | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index df06fc720755..3cc9c8090bfb 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -341,11 +341,11 @@ static void riscv_virt_board_init(MachineState *machine) }; /* copy in the reset vector */ - copy_le32_to_phys(ROM_BASE, reset_vec, sizeof(reset_vec)); + copy_le32_to_phys(memmap[VIRT_MROM].base, reset_vec, sizeof(reset_vec)); /* copy in the device tree */ qemu_fdt_dumpdtb(s->fdt, s->fdt_size); - cpu_physical_memory_write(ROM_BASE + sizeof(reset_vec), + cpu_physical_memory_write(memmap[VIRT_MROM].base + sizeof(reset_vec), s->fdt, s->fdt_size); /* create PLIC hart topology configuration string */ diff --git a/include/hw/riscv/virt.h b/include/hw/riscv/virt.h index 2fbe808da5f6..655e85ddbd3c 100644 --- a/include/hw/riscv/virt.h +++ b/include/hw/riscv/virt.h @@ -23,8 +23,6 @@ #define VIRT(obj) \ OBJECT_CHECK(RISCVVirtState, (obj), TYPE_RISCV_VIRT_BOARD) -enum { ROM_BASE = 0x1000 }; - typedef struct { /*< private >*/ SysBusDevice parent_obj;