From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=3.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1F602C388F9 for ; Fri, 23 Oct 2020 23:46:31 +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 9838420704 for ; Fri, 23 Oct 2020 23:46:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="sR9bFFye" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9838420704 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+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:35218 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kW6lR-0005Kp-KM for qemu-devel@archiver.kernel.org; Fri, 23 Oct 2020 19:46:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49462) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kW6kL-0004cA-Cm; Fri, 23 Oct 2020 19:45:21 -0400 Received: from mail-io1-xd43.google.com ([2607:f8b0:4864:20::d43]:41788) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kW6kH-00043e-SJ; Fri, 23 Oct 2020 19:45:21 -0400 Received: by mail-io1-xd43.google.com with SMTP id u62so3942628iod.8; Fri, 23 Oct 2020 16:45:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=qjnuDSkXspZX0oK9YZhnBqaMGu+nHJxmu6U+0JKMbsc=; b=sR9bFFye6tXAKczLXmjC9Iu+vevh/Dz4bEpKKhG8LO3SfBf3zBUzpjsnKxaz9QyqnG MYhASD5Fz+BM6ZydI4++6peoIcxzf49LKNJc/FtDDF8Rb+cFMg26iWvuFY595nTgK49g dapOe16u3EvHt8V3V8UnHg+p4mPnwgYweZzKn8EQMI3QOHepPJB5nRSN/eB9ZhqD4gc/ r1YkPG9tMebjJYKWs3PSZhmKz8q3ntiCN4+94s2jB2EhV+Hxkc3OtNNgucAav1jV9Lfy IoujQr6VdW4X8Dx02bmkb9cRN9lFxoNt33m7tqsB9D0GszVZuTti5TAVTHCkyurxhAlE aGvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=qjnuDSkXspZX0oK9YZhnBqaMGu+nHJxmu6U+0JKMbsc=; b=EK/PTFyTaVySP/Wst/RCmShoNh2aGH2gRwjUX8BnzTkdBj/r4Uxay5iEQdTFr/S7+S N4q4IzOCD+30nQuTOnFCJq3Tfdq0bIRCXyNr5e5hXFzehb2w5kWwkpta7dwYWuifoyqJ lbQnvQNfTq8BFolHdeNyGbECXHLFTHSByTw2gcb0zlZsET2v21lg3YSpB0llOBiFYM+k RNBZNb/RksdxXxFRAzp5zqj5hjbKICVczHjc/u2psDc4iB4orRm3tPQ21EvSXExrZiyR 2XOOUhnxRQsXRRIU1AXweIFJPuvzm0kVMS/byjXYbNOLOPCuyxQv/RDt81Ypbi+nJwF/ GzAw== X-Gm-Message-State: AOAM530sz0yX6zge9EoU2l72h+TJEmRmV70G5BlmpUOVqd1HLbc6d2i/ niN2rhMkUQy9eE5d6jaiGsocbLOsZ80u6l+/jRE= X-Google-Smtp-Source: ABdhPJzbnmX0Ro17qaIHzSToNl3cUejfcFMB7HPsrx7cfJOinRzBrPUVYCK+msOwBYtOjLII5nGvx/lX4qKhrqRXm18= X-Received: by 2002:a02:c956:: with SMTP id u22mr3836309jao.135.1603496716590; Fri, 23 Oct 2020 16:45:16 -0700 (PDT) MIME-Version: 1.0 References: <20201022053225.2596110-1-anup.patel@wdc.com> <20201022053225.2596110-2-anup.patel@wdc.com> In-Reply-To: <20201022053225.2596110-2-anup.patel@wdc.com> From: Alistair Francis Date: Fri, 23 Oct 2020 16:33:29 -0700 Message-ID: Subject: Re: [PATCH 2/2] hw/riscv: virt: Allow passing custom DTB To: Anup Patel Content-Type: text/plain; charset="UTF-8" Received-SPF: pass client-ip=2607:f8b0:4864:20::d43; envelope-from=alistair23@gmail.com; helo=mail-io1-xd43.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: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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_ENVFROM_END_DIGIT=0.25, 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: Peter Maydell , "open list:RISC-V" , Sagar Karandikar , Anup Patel , "qemu-devel@nongnu.org Developers" , Atish Patra , Alistair Francis , Palmer Dabbelt Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Wed, Oct 21, 2020 at 10:34 PM Anup Patel wrote: > > Extend virt machine to allow passing custom DTB using "-dtb" > command-line parameter. This will help users pass modified DTB > to virt machine. > > Signed-off-by: Anup Patel Reviewed-by: Alistair Francis Alistair > --- > hw/riscv/virt.c | 27 ++++++++++++++++++++------- > 1 file changed, 20 insertions(+), 7 deletions(-) > > diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c > index 41bd2f38ba..d535119e37 100644 > --- a/hw/riscv/virt.c > +++ b/hw/riscv/virt.c > @@ -181,6 +181,7 @@ static void create_fdt(RISCVVirtState *s, const struct MemmapEntry *memmap, > { > void *fdt; > int i, cpu, socket; > + const char *dtb_filename; > MachineState *mc = MACHINE(s); > uint64_t addr, size; > uint32_t *clint_cells, *plic_cells; > @@ -194,10 +195,20 @@ static void create_fdt(RISCVVirtState *s, const struct MemmapEntry *memmap, > hwaddr flashsize = virt_memmap[VIRT_FLASH].size / 2; > hwaddr flashbase = virt_memmap[VIRT_FLASH].base; > > - fdt = s->fdt = create_device_tree(&s->fdt_size); > - if (!fdt) { > - error_report("create_device_tree() failed"); > - exit(1); > + dtb_filename = qemu_opt_get(qemu_get_machine_opts(), "dtb"); > + if (dtb_filename) { > + fdt = s->fdt = load_device_tree(dtb_filename, &s->fdt_size); > + if (!fdt) { > + error_report("load_device_tree() failed"); > + exit(1); > + } > + goto update_bootargs; > + } else { > + fdt = s->fdt = create_device_tree(&s->fdt_size); > + if (!fdt) { > + error_report("create_device_tree() failed"); > + exit(1); > + } > } > > qemu_fdt_setprop_string(fdt, "/", "model", "riscv-virtio,qemu"); > @@ -418,9 +429,6 @@ static void create_fdt(RISCVVirtState *s, const struct MemmapEntry *memmap, > > qemu_fdt_add_subnode(fdt, "/chosen"); > qemu_fdt_setprop_string(fdt, "/chosen", "stdout-path", name); > - if (cmdline) { > - qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", cmdline); > - } > g_free(name); > > name = g_strdup_printf("/soc/rtc@%lx", (long)memmap[VIRT_RTC].base); > @@ -441,6 +449,11 @@ static void create_fdt(RISCVVirtState *s, const struct MemmapEntry *memmap, > 2, flashbase + flashsize, 2, flashsize); > qemu_fdt_setprop_cell(s->fdt, name, "bank-width", 4); > g_free(name); > + > +update_bootargs: > + if (cmdline) { > + qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", cmdline); > + } > } > > static inline DeviceState *gpex_pcie_init(MemoryRegion *sys_mem, > -- > 2.25.1 > >