From nobody Sat May 18 15:08:17 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@wdc.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=wdc.com); dmarc=pass(p=none dis=none) header.from=wdc.com ARC-Seal: i=2; a=rsa-sha256; t=1587975040; cv=pass; d=zohomail.com; s=zohoarc; b=eXXydjs3pcjaQvSCN7ttjgn/qRZQYH2skgu0BVTg6QpD2I4NbsSpPU96uIxDrEy9YReZ17gVZeoN+bpaWX26IxN6m10XiHcQIuYQAH+AVWcXSvZ/sz2zfSy3CI0ksMKtXRt3+NA3Bj8QTDZmt816SZTqZmJltOqTizuZSocjJ0c= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587975040; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xTyNkJJ7Dbav6Xh5HsRL5r1+SCo8qt3+2ntEswOAkAg=; b=AzkD+1lMhm5BNSpEfppdZ12BXeHBL/Dl9+xFRSsiqDCYJjGyFpvziiaLi/qOuOFEJYrQtzNv+Q8LGyjS+ApNysRZ1IbH0lbC21R+SgFfGNmv6UWgwqCHKNu/dMuc4knakRbH9pG+0H35N3x7/P7nmsdchJaENLeP70ioOwO+HrM= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass header.i=@wdc.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=wdc.com); dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1587975040900500.91294403248526; Mon, 27 Apr 2020 01:10:40 -0700 (PDT) Received: from localhost ([::1]:56294 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jSyqd-0006sd-Ff for importer@patchew.org; Mon, 27 Apr 2020 04:10:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43270) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jSynj-0002gW-5M for qemu-devel@nongnu.org; Mon, 27 Apr 2020 04:07:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jSyni-0001eF-MR for qemu-devel@nongnu.org; Mon, 27 Apr 2020 04:07:38 -0400 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:37468) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jSynU-0000s1-F9; Mon, 27 Apr 2020 04:07:24 -0400 Received: from mail-bn3nam04lp2058.outbound.protection.outlook.com (HELO NAM04-BN3-obe.outbound.protection.outlook.com) ([104.47.46.58]) by ob1.hgst.iphmx.com with ESMTP; 27 Apr 2020 16:07:23 +0800 Received: from DM6PR04MB6201.namprd04.prod.outlook.com (20.178.225.224) by DM6PR04MB5241.namprd04.prod.outlook.com (20.178.27.155) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.22; Mon, 27 Apr 2020 08:07:21 +0000 Received: from DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::f8b3:c124:482b:52e0]) by DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::f8b3:c124:482b:52e0%5]) with mapi id 15.20.2937.023; Mon, 27 Apr 2020 08:07:21 +0000 Received: from wdc.com (106.51.31.156) by MAXPR0101CA0062.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:e::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.13 via Frontend Transport; Mon, 27 Apr 2020 08:07:18 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1587974844; x=1619510844; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=nl3aSz2zkjAV9pCzBXTdUWqq+qb4ll+bYePGIRZ+OTE=; b=VOIvS0ejt4JE7qzmOED9foAai3G4mHPZIH8Fghq6RoiARfe6i7d2WbnG YMk6bJdrknAz/GaKAqm6XRYFFERy081azquvNsR+I1i8VSYER35GYdHeT r+gxZ9M2l+zWN5SleEKAelvdsks01pntwJSFqUGn6vmmFHWrmpH/7VBvO y9ePz5WdcL8EhN9dB6quFmxhhEvydAFya1XeBomjFDR68Bpor01Hp8uHf yt7JnjW8FA2Kn8saVpCdTuxOH8H2EeWrMTyIjFVpIgGK0yLSSpEzpFrXG 9xhpoS/tDraHJqmxaZXGIcSpxmp2ZsrE6qHV2ZR5KoyGPsc1/zcM4HwjC Q==; IronPort-SDR: +tW/lkyBU6kB8dY6weSvdiUtvFKF/iSeW21UQE/UIb9EQA2quqTAjDplaSIz4F9CC4rC8kk1VW KTDLeg4ouePDLE/19VtXuggyrZaLQX+54cHBmgN6T1lxrBWSZp8F8yJ8VdfbhatfRh5oStDTUr CkMntzTfSms3BFDlqOrzE/LaYyCAWc71QewE8f7jaO9EBrS+aIcMrHesgFyHUvhJnURoP9iuMZ Urg+lAV4cu4khj6I5B4obIhRbKIAyIKT9h6QpQVaYfxDjaiHT3tCWolUX9zMoZnbu6uAIL9bfg /m8= X-IronPort-AV: E=Sophos;i="5.73,323,1583164800"; d="scan'208";a="137668055" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NPx98bctKF1LHwhk3QHJ0QlISea1paZPPQReQll/L2XvzBLZvFRzPD9xAjmSuQqK6Xw8AiGw4ojXTkx9MLsYZBtKl0W5AbkVDa9NXBaw6Iwn27/m6At2+CtzE3YDjKhzEzwSotAFvP0yK8ORka3u/AsSJ1tf0EGJcdLttFGs4mjhAVBctwsIybMzHYgXVcPNeV5OV/HwDqDjoalX/u/A1Oq3woaKjHOQ7JmOBqElpNQ40nosHhkMpP0I87EySlCpAibT0FVWxpJU0pkKiVy4MoVhoAAVct5ZbZUp3SWts1spYia80tE8K4Pc9Ekw5CqHFsSeYAY/b97KbG9OwPfLGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=xTyNkJJ7Dbav6Xh5HsRL5r1+SCo8qt3+2ntEswOAkAg=; b=CTLV5OnzchMgiOdneKntF6Qudn57n1lnNGVIauu1ExCp5yNLk4eiBZXSimup0XT9kRq40ePxS92g+JnfFJs8xTpdZcUt+p5OMMfq9aZUh1BvpAPvzVeRS+cPYoxIpnIrkV7XXfNGLwyAcKGBnjSrz1neWNOcidEEFJpbB4WW1fB31uZgL+fgEQzsC3l7R8knLSVKQ/n1RSHt1NVk3YJiTTGF3wTdfl+HeGZ5kjqDbrWJgP7aTCLTwwNUzjpd+M8Jp4o0Ti2Sot/jvVIZk7VuX2QNq99nbKtp1DJ/M4cxh+nxIHIj/2wD/VHeJSnvoTReXWeB8d0cJ5GqvPN0rN88Cw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wdc.com; dmarc=pass action=none header.from=wdc.com; dkim=pass header.d=wdc.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector2-sharedspace-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=xTyNkJJ7Dbav6Xh5HsRL5r1+SCo8qt3+2ntEswOAkAg=; b=arsmYjIhZNfCmIhyLyNKxKFzkOAA4270gmY0VS/HrfTc48UGBZXy4qJLSto3jq8yh09QqRFBa0rgX9qGWVYeVSk+R5GSMNoHAFi441exnNcxlUEs6Iu0+hBsamR+R/pHknoVERiMfXmuJ/wsrvpPtwu7AONuBqx8SgYEzzdO9hU= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Anup.Patel@wdc.com; From: Anup Patel To: Peter Maydell , Palmer Dabbelt , Alistair Francis , Sagar Karandikar Subject: [PATCH v3 1/3] hw/riscv: Add optional symbol callback ptr to riscv_load_firmware() Date: Mon, 27 Apr 2020 13:36:42 +0530 Message-Id: <20200427080644.168461-2-anup.patel@wdc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200427080644.168461-1-anup.patel@wdc.com> References: <20200427080644.168461-1-anup.patel@wdc.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: MAXPR0101CA0062.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:e::24) To DM6PR04MB6201.namprd04.prod.outlook.com (2603:10b6:5:127::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.25.1 X-Originating-IP: [106.51.31.156] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 2f27ed5b-65c2-4454-b501-08d7ea82030c X-MS-TrafficTypeDiagnostic: DM6PR04MB5241: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: WDCIPOUTBOUND: EOP-TRUE X-MS-Oob-TLC-OOBClassifiers: OLM:1417; X-Forefront-PRVS: 0386B406AA X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM6PR04MB6201.namprd04.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(376002)(396003)(136003)(39860400002)(366004)(346002)(55236004)(16526019)(6666004)(8676002)(1006002)(54906003)(1076003)(8936002)(81156014)(186003)(478600001)(316002)(110136005)(44832011)(86362001)(5660300002)(8886007)(4326008)(26005)(2906002)(55016002)(7696005)(52116002)(66476007)(66556008)(2616005)(36756003)(956004)(66946007); DIR:OUT; SFP:1102; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tuIkMyTqB1ySbjeuyjQvkUTibI8/VVcArx453VRuSTketJBC8BOK6IpHQ1+IRFixaywfIveRsNmGoi4IluQx4cJYYbe36qepRfzo/pOAuMSqTLkR5besO+ygRR26KOQPsywm7eAcocbS9S0v9vKJQmp2lUNIRy8nSk36zNxZLpNBcvCQX2kQHwHTNJT2jtaw2OV3EqDsy89Boe7pS6X0T9Zkd/gt72w1Oh8omUs95YFKKTxGndsHHNn/coSg2nbcwdmWcrjFf06pQjRxC5xc/g5HqSbEXIo0UcS2mLqY1j3Ua9YceFtJqcs9NDDjNUwPT0NdGisVfPpCTLJjzDpwyeCN5qNtvDp0cw3kxkdwsbeQX6uWV9sUIC9RRCYGXakMjlybDQsWmETgr7zb3ZgaymP3Ihj5pIkn5Iag5ntLnxZU8mvsP9NmHb0rpcXnMU6q X-MS-Exchange-AntiSpam-MessageData: BvdeMCQM0DyOQuo30lnUQse7+lUOnL8ga/98xWwtuOoHJ3ZkRLWl1mJDhbSwBWp7FeaQxoW3BC9vIr1xF+2DkTQlm6FO5WEzN+dHMI82U73N7cmA8lWXPpBeVtWdIeYIBHCLHG5lSgBlzE1gRzRrg9JbUpcpGpplMOUPy8RgvqlRcotptLLECHdQP1+8O3N7ax0jK81oHUblmqkJ4EDzSCArlCx1wsJQNWQrmLvUnxrtTl9j7Yf0fmxKYUSQODFZBoMv/+66+7yUqe4RrQe/cEZMsimNbtJ9/TbKVP2vh2NH84V0tdsmR7CCDfz16fgV87WQLVLNqK+FDnSd325MGYaaS8zCP/w/riPoJMZOgx/KBbhgw/n4hRC7zIlPiMxRUUNTO+ChGJtimrygXWh8dw2meITnH06LAEoRvGuoxUahpFPQZ8ST1duGgvzjHBE7iefOXFSzJ8FAU7yNGvW38i4AYwVT/lAtzmbEVio9450JW4vmkwoDgTOLv2wdULlRQVQeAwoXdsyvPJTNxs81SUdo//CR2H7A6V702apt0S5NZBcGAskSdGWXANhSYUxUXcD7fBfgbXYWC7eMKBr/RWSz1NjrphyFh28toYCS3G+sEsWLZsd7JA0VB3v6HDBe1PDRpXa+JM7n7eG1D8ANH4dFoM0J1jMc0VKfNTs9cA5OPt+638/8TYLysGByUwhFOARsA2j2D8aj2LbYhf2HYYKg563XrNiWlbsTUwUxaIeKt+DWGzZ9wiKLhvgjf2yMj8VnGM0YVhIrAKNra9LwSeYk8WPpYfk8ZPdmWlGtxCo= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2f27ed5b-65c2-4454-b501-08d7ea82030c X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Apr 2020 08:07:21.6065 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ULJvFAVbOjxifrL3+QBxk+oQaWPHo1ZixaXnwTfQzNBN0MxdLpIkVG927zgHtGeBqzSAtMTMgR/lnZzx7zTIoQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR04MB5241 Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=216.71.154.45; envelope-from=prvs=379c65f89=Anup.Patel@wdc.com; helo=esa6.hgst.iphmx.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/27 04:07:17 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Received-From: 216.71.154.45 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: Atish Patra , Anup Patel , qemu-riscv@nongnu.org, qemu-devel@nongnu.org, Anup Patel Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @sharedspace.onmicrosoft.com) Content-Type: text/plain; charset="utf-8" This patch adds an optional function pointer, "sym_cb", to riscv_load_firmware() which provides the possibility to access the symbol table during kernel loading. The pointer is ignored, if supplied with flat (non-elf) firmware image. The Spike board requires it locate the HTIF symbols from firmware ELF passed via "-bios" option. Signed-off-by: Anup Patel Reviewed-by: Alistair Francis --- hw/riscv/boot.c | 13 ++++++++----- hw/riscv/sifive_u.c | 2 +- hw/riscv/virt.c | 2 +- include/hw/riscv/boot.h | 6 ++++-- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c index b8e765277d..726300a171 100644 --- a/hw/riscv/boot.c +++ b/hw/riscv/boot.c @@ -36,7 +36,8 @@ =20 void riscv_find_and_load_firmware(MachineState *machine, const char *default_machine_firmware, - hwaddr firmware_load_addr) + hwaddr firmware_load_addr, + symbol_fn_t sym_cb) { char *firmware_filename =3D NULL; =20 @@ -76,7 +77,7 @@ void riscv_find_and_load_firmware(MachineState *machine, =20 if (firmware_filename) { /* If not "none" load the firmware */ - riscv_load_firmware(firmware_filename, firmware_load_addr); + riscv_load_firmware(firmware_filename, firmware_load_addr, sym_cb); g_free(firmware_filename); } } @@ -96,12 +97,14 @@ char *riscv_find_firmware(const char *firmware_filename) } =20 target_ulong riscv_load_firmware(const char *firmware_filename, - hwaddr firmware_load_addr) + hwaddr firmware_load_addr, + symbol_fn_t sym_cb) { uint64_t firmware_entry, firmware_start, firmware_end; =20 - if (load_elf(firmware_filename, NULL, NULL, NULL, &firmware_entry, - &firmware_start, &firmware_end, NULL, 0, EM_RISCV, 1, 0) = > 0) { + if (load_elf_ram_sym(firmware_filename, NULL, NULL, NULL, + &firmware_entry, &firmware_start, &firmware_end, = NULL, + 0, EM_RISCV, 1, 0, NULL, true, sym_cb) > 0) { return firmware_entry; } =20 diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index 56351c4faa..54bb9eb1bf 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -345,7 +345,7 @@ static void riscv_sifive_u_init(MachineState *machine) create_fdt(s, memmap, machine->ram_size, machine->kernel_cmdline); =20 riscv_find_and_load_firmware(machine, BIOS_FILENAME, - memmap[SIFIVE_U_DRAM].base); + memmap[SIFIVE_U_DRAM].base, NULL); =20 if (machine->kernel_filename) { uint64_t kernel_entry =3D riscv_load_kernel(machine->kernel_filena= me, diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 85ec9e22aa..24f851e895 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -507,7 +507,7 @@ static void riscv_virt_board_init(MachineState *machine) mask_rom); =20 riscv_find_and_load_firmware(machine, BIOS_FILENAME, - memmap[VIRT_DRAM].base); + memmap[VIRT_DRAM].base, NULL); =20 if (machine->kernel_filename) { uint64_t kernel_entry =3D riscv_load_kernel(machine->kernel_filena= me, diff --git a/include/hw/riscv/boot.h b/include/hw/riscv/boot.h index df80051fbc..474a940ad5 100644 --- a/include/hw/riscv/boot.h +++ b/include/hw/riscv/boot.h @@ -24,10 +24,12 @@ =20 void riscv_find_and_load_firmware(MachineState *machine, const char *default_machine_firmware, - hwaddr firmware_load_addr); + hwaddr firmware_load_addr, + symbol_fn_t sym_cb); char *riscv_find_firmware(const char *firmware_filename); target_ulong riscv_load_firmware(const char *firmware_filename, - hwaddr firmware_load_addr); + hwaddr firmware_load_addr, + symbol_fn_t sym_cb); target_ulong riscv_load_kernel(const char *kernel_filename, symbol_fn_t sym_cb); hwaddr riscv_load_initrd(const char *filename, uint64_t mem_size, --=20 2.25.1 From nobody Sat May 18 15:08:17 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@wdc.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=wdc.com); dmarc=pass(p=none dis=none) header.from=wdc.com ARC-Seal: i=2; a=rsa-sha256; t=1587974933; cv=pass; d=zohomail.com; s=zohoarc; b=ZiXjpEiK2xf3S0Qb4/5AjPikvQEYFMxLrWGWhdx2W8sbHTi47EKmUa7osXLmkVpPhRKkRVDEp9B4Z8aUN2RYtOU5tgJcYyb55sh8p4egtbDjBebf2NBkum5Xa3H1OMhpWR7NJk9BynmWo69rixnzDMTHqG4MDQ87AWU+oIhVhqY= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587974933; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fe7TnEEFhCpLOM+DVliA9+BSHBG0ZHws7ChNLGirMJE=; b=WlgKCFLGcCFra3UOi1rS4tQTgpQ5OoLoDDfIApEv8UFawAyxIfj/77ZD5tGjeqI4wVZUGv724lmL2GkrV6uxJOkVw6RpvI13K7SkSq2o5lf9ekOkWQGsz9CGNi2BBAPsZEREnzntrA0PKpkupPEu/lBYOhGNFjRrutpGWlGWRbU= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass header.i=@wdc.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=wdc.com); dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1587974933667291.2441357343748; Mon, 27 Apr 2020 01:08:53 -0700 (PDT) Received: from localhost ([::1]:56120 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jSyou-0004FX-69 for importer@patchew.org; Mon, 27 Apr 2020 04:08:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43254) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jSynf-0002Ys-KN for qemu-devel@nongnu.org; Mon, 27 Apr 2020 04:07:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jSynf-0001Yl-8n for qemu-devel@nongnu.org; Mon, 27 Apr 2020 04:07:35 -0400 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:37489) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jSynb-0001Hu-Er; Mon, 27 Apr 2020 04:07:33 -0400 Received: from mail-bn3nam04lp2054.outbound.protection.outlook.com (HELO NAM04-BN3-obe.outbound.protection.outlook.com) ([104.47.46.54]) by ob1.hgst.iphmx.com with ESMTP; 27 Apr 2020 16:07:29 +0800 Received: from DM6PR04MB6201.namprd04.prod.outlook.com (20.178.225.224) by DM6PR04MB5241.namprd04.prod.outlook.com (20.178.27.155) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.22; Mon, 27 Apr 2020 08:07:27 +0000 Received: from DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::f8b3:c124:482b:52e0]) by DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::f8b3:c124:482b:52e0%5]) with mapi id 15.20.2937.023; Mon, 27 Apr 2020 08:07:27 +0000 Received: from wdc.com (106.51.31.156) by MAXPR0101CA0062.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:e::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.13 via Frontend Transport; Mon, 27 Apr 2020 08:07:23 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1587974851; x=1619510851; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=IkX3NAMOd7d00WdzX3NnoJRwc0QuyzD1CnB87D0CqNs=; b=jvGcxQK2PO3Bp4oKM+5r1+VWV2tFAm16jODhboOHtxiLNhmlpCI77RR5 2x19H6HuaDvytNE5uUAa6yE6FFunKT1Tfzz/9bIqGBIus02P+QCm2ZChc +mgJmWB347uZNn4z2BR5Go+25+4+sPZk+cOXPj3kzSvgmcf5EeKIoaqQy MwP0cboKu5dvCGOmEdXS7nY/qtwQsCbEAmLPC8ax5ZtURCQB0IPbiDlTR r0FwZ6HgG80+6NwJaGA9amWtGZPAr/nOCbqLiw3Pdywu0oKzhMJgXfjQX FNB6WlEXRNxI/QgBzmycqMqJzcy5RxxrSvFwEK0XAY2Tx0I4o7M6eP5x3 A==; IronPort-SDR: JqDQcoCmSEgVgECBvd9FaWHfKop9+FTj0CHTiu8/nNRW6iyrBhqwM0gGDpDAuhIgeS9I09WHBd Li/HaqsOYopuHCu+85IWL2rk27B3SplKVrB0aWs019Y2xCA+C+ZCy0+r16FHAHjz3fxG392/Lh I2Pw6IU3iNNWmTGeCa0XuvTiEhOoNTje3vlfhE1hQPHszZQawzEjkBQfCws7uwLEYaSHr7mXNC 97Cz/XLkOS/djoGvaOgcuPPGL8+ADbk+ub+e548zzZCHUepgVRqKclgendMoSpkeQxjXn/Uxg4 iiM= X-IronPort-AV: E=Sophos;i="5.73,323,1583164800"; d="scan'208";a="137668059" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UOm5aUQ/k4vucbg4uMPIwjj/XPAY/7HuzvWTUMQpqR+CSxeIPZRtfLZoWjL0Bgzp613syM9MkXKg4+OdNBNeN9HcgY3Wqh10BtT6XQx/P0XPzyYDnEXVfu/hbi6ySIID+9FtTKZIXLYs3OfYnzlIPseZJUhNPrAQdNsMVAGEigWr9lH7tPFiq86zP/KjAWCCI+n7rI/CLeLaeqM1tdZoS1hR09LPUmQLk7BP9dCCfURJTE4NvOQil1QVh84QUwbZsGtpP2mNQfD7oQswsB27eDPByCge05E6EOBUJ9ppcgBD9gWK3c5Rm6j6wpNkArIiFfSHPD36a7DpFL5HhngLMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=fe7TnEEFhCpLOM+DVliA9+BSHBG0ZHws7ChNLGirMJE=; b=SC//2l+mnPC9H/nkiEM5MZePpu2+SZpWS5E+mS7+iEcdJ/mKZTiIH2UNa4hAdn5aqMne3iWEOT+zyxj5EHTaedY9KzoRRvsEVdpq2vlY9pH3XuKM1KiPZ5972e5cwj5DrQfXSF91q82DyiGM8cpvzudd018gZ1+KqcyO7lM/zYxGyNxYKd+Sw9u3UHyekrkyLHpu9ornEb61p+x3N0ZOBSroK6YF7bD/TGisElH7kv7MXGTKXxwukqcFRKorPfwhAS0RiiXEh3dxIxsZ2aX4b/MJC6t/b9HzfhBA+TCyzar5V34Al5hvqc5TJEw8t72vooKMSA+7M6RuJcJL0inqRQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wdc.com; dmarc=pass action=none header.from=wdc.com; dkim=pass header.d=wdc.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector2-sharedspace-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=fe7TnEEFhCpLOM+DVliA9+BSHBG0ZHws7ChNLGirMJE=; b=RGN2P2VkoqvNebBUEyNggscgtIvqsNnJGFnyGL8Q1jPkJHJS6DUZ9lOM2NE3pJIlS4lRgQ94Uj0kYG1Rp1pSIfei9jVeSzSJ9RgCM3o4Myx0LpoEG2zibRwnTnrtwQs/bf7x5CFT/PqtbvPhzSconhegv6v7tsC2ruUncswFwVc= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Anup.Patel@wdc.com; From: Anup Patel To: Peter Maydell , Palmer Dabbelt , Alistair Francis , Sagar Karandikar Subject: [PATCH v3 2/3] hw/riscv/spike: Allow loading firmware separately using -bios option Date: Mon, 27 Apr 2020 13:36:43 +0530 Message-Id: <20200427080644.168461-3-anup.patel@wdc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200427080644.168461-1-anup.patel@wdc.com> References: <20200427080644.168461-1-anup.patel@wdc.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: MAXPR0101CA0062.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:e::24) To DM6PR04MB6201.namprd04.prod.outlook.com (2603:10b6:5:127::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.25.1 X-Originating-IP: [106.51.31.156] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 6d6c78cb-85dd-482e-a390-08d7ea8206b6 X-MS-TrafficTypeDiagnostic: DM6PR04MB5241: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: WDCIPOUTBOUND: EOP-TRUE X-MS-Oob-TLC-OOBClassifiers: OLM:93; X-Forefront-PRVS: 0386B406AA X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM6PR04MB6201.namprd04.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(366004)(55236004)(16526019)(6666004)(8676002)(1006002)(54906003)(1076003)(8936002)(498600001)(81156014)(186003)(110136005)(44832011)(86362001)(5660300002)(8886007)(4326008)(26005)(2906002)(55016002)(7696005)(52116002)(66476007)(66556008)(2616005)(36756003)(956004)(66946007); DIR:OUT; SFP:1102; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iaoIRSKgBB++DUDoxIeMXLdsVw4+tO2H3QomYVDuO05+k0PYPOvWtVlB7Aump6Ce3k10ZQGfpO7t/mI77SwgAaFWh5dwyRw4xL6nYVlzeLQAUkR1EZQ/xr7hnlUlhM+4h13hAI6127PoakaA20YwesuXi+ksC0I6Mk+crfND/vvpCWpuYhWASGmMNsIZBVjZr1tIiv6EO/Ybl4uz9CX01sQuvURJsr1e3BHjYGvpiMkwJrAuB69NH+YHaVpETuaKw98K0+pbpkNgZ6XxOS1Qq7cQ//XC3X4y+xdK3wkXKc/mV+J4TZvtpjMuMELFAEo2SiHLOm4ElZgPYaILJmXt+QsjMTF2vaeAcIkzLuG3IXcf+lLYEEXWUwzmo4os7fFHpIs9MibgDD3U2CoJ9sT1uSMjKzroWtOo7Q7813+opiorL1AG2e70DGdcXEOaTmyu X-MS-Exchange-AntiSpam-MessageData: B0gVIVaCvqk7FPeZy2fXz6LjDV2IxEB3j3z7kxvQyn3rNHvJbwxlQESJnvc+vD6+KUjb8b9dhX5DiezNUmMtjU3bLBgOxa8AeA61B33mOp3WPdlHX/YHczu7G27brAeON4z5U1MGnMwxX6jajnNur0ugnaVJZLFE2i5ikW9DEEmQyyE3VUQzyExzeLmNoYc4jqXaRWGCe5smDMUeYqUIxdHXEHStuyRJopKdkfxXs6dKoyddStZFPUPxKaPgeCj6epwbL9ZH2OMQwEvsNDiOWsjew9ibvbHOezjMLnuFzc6mOiMvtNRt0jtFZpnnG5pw8XjyFM3vuZcbidernvNwkfZjhFop1fzuy3n+6jnQurh81QO/QyuKCwAiz/gO84fvYbihch1jL2WP/GxrsQWSciCHigMuHN1E5zWz254mKVMl0RvaqyvhhxtrDlOohQ5pMGK+VRhL/cGSCNQXXX1CH0YGTkJfmVqgnES5UXlZY2ax5iWeMyxQugr/vE8hrvXUPvoJFUg82PhnHuLHKyfD8PpLKdcwqNpnLgDSjpERrQfLwx5mJbhAwlsHciDg2gH/z2J1oPGxk+UqRmqjeJzr5T2nL2kOk+jyF1KKgngWku6Tj88MSEgAlqC4+yey4/c29VeEGPUsN/p8mMA1cv4XEuMd6zUZkaiyIUTldawlFLQDlqZ3rrCYjplJwAwAYe6Aj/QM3yStFQvRbrHPSY3xvyw0UkFTgp0GJKpNOn5tznA/CyaubEr7Cu3yOXql1UAkNGWeT5vs+KhuAuOr+WIfsqqravpnpWYaVXWvhRq37MQ= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6d6c78cb-85dd-482e-a390-08d7ea8206b6 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Apr 2020 08:07:27.8393 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: q2rpoj6b+hFtjkSefDl2kgTihb3QqgK9SYKk31Ojr/UMamGNWn6ajhf6eLecpsYLhMwuIjWPTj0wQjrKAEE42Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR04MB5241 Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=216.71.154.45; envelope-from=prvs=379c65f89=Anup.Patel@wdc.com; helo=esa6.hgst.iphmx.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/27 04:07:17 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Received-From: 216.71.154.45 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: Atish Patra , Anup Patel , qemu-riscv@nongnu.org, qemu-devel@nongnu.org, Anup Patel Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @sharedspace.onmicrosoft.com) Content-Type: text/plain; charset="utf-8" This patch extends Spike machine support to allow loading OpenSBI firmware (fw_jump.elf) separately using -bios option. Signed-off-by: Anup Patel Reviewed-by: Alistair Francis --- hw/riscv/spike.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c index 5053fe4590..b0395e227c 100644 --- a/hw/riscv/spike.c +++ b/hw/riscv/spike.c @@ -45,6 +45,12 @@ =20 #include =20 +#if defined(TARGET_RISCV32) +# define BIOS_FILENAME "opensbi-riscv32-spike-fw_jump.elf" +#else +# define BIOS_FILENAME "opensbi-riscv64-spike-fw_jump.elf" +#endif + static const struct MemmapEntry { hwaddr base; hwaddr size; @@ -183,8 +189,24 @@ static void spike_board_init(MachineState *machine) memory_region_add_subregion(system_memory, memmap[SPIKE_MROM].base, mask_rom); =20 + riscv_find_and_load_firmware(machine, BIOS_FILENAME, + memmap[SPIKE_DRAM].base, + htif_symbol_callback); + if (machine->kernel_filename) { - riscv_load_kernel(machine->kernel_filename, htif_symbol_callback); + uint64_t kernel_entry =3D riscv_load_kernel(machine->kernel_filena= me, + htif_symbol_callback); + + if (machine->initrd_filename) { + hwaddr start; + hwaddr end =3D riscv_load_initrd(machine->initrd_filename, + machine->ram_size, kernel_entry, + &start); + qemu_fdt_setprop_cell(s->fdt, "/chosen", + "linux,initrd-start", start); + qemu_fdt_setprop_cell(s->fdt, "/chosen", "linux,initrd-end", + end); + } } =20 /* reset vector */ --=20 2.25.1 From nobody Sat May 18 15:08:17 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@wdc.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=wdc.com); dmarc=pass(p=none dis=none) header.from=wdc.com ARC-Seal: i=2; a=rsa-sha256; t=1587975034; cv=pass; d=zohomail.com; s=zohoarc; b=Ht79Ztc6kXvvWC7Z/PmBZ7clwDXu0LMjX3AtEyWsumBo1Bj0UI/s9LtRHsC3zu/uoxSuCcljMOiuiahuhTcUfdC/nojid0hfuvHPeU88iBJiOMf63kBEFVPN00VXj/6JFCEuMuBn7C2PQxUjFkbNqT86Nra8FKLAgU9mne3diFs= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587975034; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=NUAk/xq7dVqtv2rmjbGHykFpmVSVedXFCrMjaY+su+g=; b=fTBuvrOAny9iE+B3wD+viNcRprL1jdGvDSY+SWbCIQDpPz4yqRKqq0ZhNgJF3+uvTprTbXAoLrfRiNWCPNEvZbkDFkOl69XY3UemlFLjBU5UpK52I/40PoI2a1vN+0SlWbES+xhKOVNsfT0IC6hEl7Zw+m63wtdBHy2qE+i8fVo= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass header.i=@wdc.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=wdc.com); dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1587975034657220.23742534172504; Mon, 27 Apr 2020 01:10:34 -0700 (PDT) Received: from localhost ([::1]:56288 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jSyqX-0006dn-8C for importer@patchew.org; Mon, 27 Apr 2020 04:10:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43360) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jSyo1-0003Gs-75 for qemu-devel@nongnu.org; Mon, 27 Apr 2020 04:07:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jSynp-0001or-8W for qemu-devel@nongnu.org; Mon, 27 Apr 2020 04:07:57 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:65296) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jSynl-0001db-S8; Mon, 27 Apr 2020 04:07:42 -0400 Received: from mail-mw2nam12lp2045.outbound.protection.outlook.com (HELO NAM12-MW2-obe.outbound.protection.outlook.com) ([104.47.66.45]) by ob1.hgst.iphmx.com with ESMTP; 27 Apr 2020 16:07:37 +0800 Received: from DM6PR04MB6201.namprd04.prod.outlook.com (20.178.225.224) by DM6PR04MB5241.namprd04.prod.outlook.com (20.178.27.155) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.22; Mon, 27 Apr 2020 08:07:36 +0000 Received: from DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::f8b3:c124:482b:52e0]) by DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::f8b3:c124:482b:52e0%5]) with mapi id 15.20.2937.023; Mon, 27 Apr 2020 08:07:36 +0000 Received: from wdc.com (106.51.31.156) by MAXPR0101CA0062.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:e::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.13 via Frontend Transport; Mon, 27 Apr 2020 08:07:32 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1587974861; x=1619510861; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=CkPbWQt5m8Kp0IXCkN2oowW79G2q3mQ0lgq4R2jFUTg=; b=k18NtNQcb5fiGPAZfjONUvRL5R7p5R26eNd3C8/6BatloFod/S1PEJSu s5yncsjfCgfQLWW7qPFCZ0yJaDWNiAyCfoDYOe6nDKuJtBfp0bTXG9fRO CF/I3TavwJgkf29MTym6noKeeyw3plRuzxD2nV/cR6Nh/TcljHLBZBQlT 5IKLp/QGK8+kkHVARO1/NXeJ62h38qjY/JyQbaIBf43ur2rj+M5eTL5M5 83ejshLbVE8PpAQUB2rSg/qbo/Dp024T3xHAyv8fWOGp/UdJEpisiNGCJ T1XTJUaVvDqCwq285zwPZNQLRKaeCJVTcva6ZWF9we7Ao3TOQ0HXEwDTK w==; IronPort-SDR: 534lwcazxS9mN5v13DILJeVF1ocuFmir5IFvApl61ysQ9iIkGRB8xXnoMFZKjdYTBGq0irkv4c kdMw7g1UWATXpYBEuhazH6H3I3yVKjbY21ZnyZxbm3vSRFx0jL8w8HTDtZfA6q7so46Yec7lRV EW8bN6SOPdR7LmLMLD6D+A/EeDM9oZI+9mhCFKNsgghcu6aX+KihVcUPEBkggONsCW5ufk1XbH WlpZzIu0pTkI+akggRr4c59zHkVkQpY+LhhlbMgNb+Rq/G7yF66S54ARVAiA1XRi+IDkobgGNi yjc= X-IronPort-AV: E=Sophos;i="5.73,323,1583164800"; d="scan'208";a="245003193" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YutnkAJeJltzFCsUl5jfLqAWwJDjGX2RELoC7noHWmlF3k273lceVMq5JI/vvXb2UKhI77M+b06/gq/QHsIFhQ3C+VV0A4Aizjr52JmLUCQQUZO6K2J3LCd0DyQ3eBXVinFjLPf5aDQnC/0Ojj6PNkFpxFUkrV3rqVpLpzsy+ChLL8QoyW1nFlnaDCCXo1A4NK/jrPpafu6/NB3U3mOZyso+OP42m7Bz3dJD+C70FOlC2G21NvHETtJGwGcFHoB8kej2Q0Vr34aWr7HSo9abZtbOLK9IDqoS7R82+DkKOSDUvXuxo4tTUydFwM3gm2igimzZzvjmLFvCLqHKSsVT3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NUAk/xq7dVqtv2rmjbGHykFpmVSVedXFCrMjaY+su+g=; b=cuAA6OVurW9vbf8DTkHV312lpLpD2f/OmSLTgt9PNyTZm9gZKYg4kvYzYEJfpsH9npSIarB/QAsPK4iVYmyeytqWAAxYwIxMHhcH53QgY1js1IJKnCu4D7MczMfXv3B5himIcE0q82lmSgRRrkQxm2mFYFftRNbu+JiO5alo1ErnsnIdF5zVuqMSGSZTiE5z3CGMzH0JbIlbBpLiPOrvv0AHop90UCXcyVGw7m+daBqABIQBqgd0YQ4hA22DLiPtsfdrGYUqUapYySN/nqF9G3sPV401m2cQnfmiCWmIlXlHc6k+EYwJN1BA4WkbNLU54/P2jPdx5m1E8HThT0+9fA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wdc.com; dmarc=pass action=none header.from=wdc.com; dkim=pass header.d=wdc.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector2-sharedspace-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NUAk/xq7dVqtv2rmjbGHykFpmVSVedXFCrMjaY+su+g=; b=JdHjtJD/hO4Z/tZRH113B3MGYClv+GN0MeTXPRm2zjgDN3I5qXihth8nk5pYgNal1shDVryVL+bMPPKn1AqCmoMuTPHIfi5ez9ZnBErQHu00dK8F+FdJvarftZJ3d2V4L1qj3AT8f29XlIL+wcQcV7yI+DJyoGmdc3eLePjNSCQ= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Anup.Patel@wdc.com; From: Anup Patel To: Peter Maydell , Palmer Dabbelt , Alistair Francis , Sagar Karandikar Subject: [PATCH v3 3/3] hw/riscv/spike: Allow more than one CPUs Date: Mon, 27 Apr 2020 13:36:44 +0530 Message-Id: <20200427080644.168461-4-anup.patel@wdc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200427080644.168461-1-anup.patel@wdc.com> References: <20200427080644.168461-1-anup.patel@wdc.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: MAXPR0101CA0062.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:e::24) To DM6PR04MB6201.namprd04.prod.outlook.com (2603:10b6:5:127::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.25.1 X-Originating-IP: [106.51.31.156] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 4a23e00c-8562-4140-a706-08d7ea820ba7 X-MS-TrafficTypeDiagnostic: DM6PR04MB5241: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: WDCIPOUTBOUND: EOP-TRUE X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-Forefront-PRVS: 0386B406AA X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM6PR04MB6201.namprd04.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(376002)(396003)(136003)(39860400002)(366004)(346002)(55236004)(16526019)(6666004)(8676002)(1006002)(54906003)(1076003)(8936002)(81156014)(186003)(478600001)(316002)(110136005)(44832011)(86362001)(5660300002)(8886007)(4326008)(26005)(2906002)(55016002)(7696005)(52116002)(66476007)(66556008)(2616005)(4744005)(36756003)(956004)(66946007); DIR:OUT; SFP:1102; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5QopnMi8HTeRHRTK3plCGYCaiphIfIDLPaneAyZqsEV5f0o5T/ccApGagLI+9/MnxsSh1Volcm/aoITr/FkyAiro48o3EkNyMmSLhrf97ZabRrjAGNkhJArHvupHkiqR9wEnsHhDk8Q5l7eZjFTwFd6TFI5+tmfHUVBgayFBmVMWIoB3mpzWECJuk1/B9xbduF0GnNYxgtDBMmyIHwVTeKhG51qJ8HvmREJyJH4y/6YPqz3cPdSMq0emhLRHtd2WW+EAYxUF1UbgtbmusuGU+uCZGgSthOso97yO7IfeTPUHEVyzsaAJjVqtpL2on5C09sfbWpSw7KLGOscDBTI18Hy074Uf+U7V2oyEBtQps2SACGtUtym6rxclAQEofa9N0KHA8oCvU6+2kJd05b3KNC96Wmqq5OjACrc00RzBtzFlwFC9yrvwbK4nosEN0xnS X-MS-Exchange-AntiSpam-MessageData: N8+Y7GIg4RnwxxgwrY+zZnzv2l26Hlg9TWQdb+GEE5b6QuNTI3aSDsrCCH28z8VAIUbjQhyYlcQMHqLiwxJSbyVBKKZ+HbYz+2DPeSJlfO/lgrL+CdoRoSMt3+JCFEIsiWpoJsZAkD1Gr/m0RBzrwsBYamoHEi56ZgjTQjIEpcvvCuJtg0umeiDBiEx21KpVT1o4P8CNkY5fFuW/MPft73NnYoZ0Q63eeShesgKek5HZtzkZ37lgYZLd4T/r3vOu72xZ+PjzWg6t7ZOyGTFv1+JuE24ZNrmLgr+3n0q59iKcLnGx9Ag4xVCBLVPG2VgIMtB6vHJRVgM4cC5PMtLK25ji1IOlZHK2a7vDp5ZLM7XG5FjuHsqmce+6ZkHmr/DLb+w8jAgMZYBrfYtOtS4BTATw+CIErFAG/8m5vVMnP3CTCXgppFyY+iFBrblThVF5rHAExNdmU22OCktOcoyRq3C8MDvkF3qa1Y4V9qfoO8LZ0tg4yt8Fp31o6Z38dVG0vPekFV9ng6u0RzO9AfTvIM5qX3PfCNhfQMtPTx4L4C2a9n86PXyhf7QsEObreF+BkRNj5hCroDOVkAY+s4ZD5uj8JD+6P0WTU5SkJkPyyC5IvfdYEzWfSp3VKnn6O15H/Z8/r+qU5iZbVfnz2biPXZ46mD08cXOvY0fmwZKKZuRw3c6Sz9sQYc4ExDF2reyI37Pa5u8EuvmB2/Ao3Gmki92Nj/QHjozxotrq4UA+zDr+RW0w0c/btR1MIYp5G1f4U08GsGffC3i2Bc7HuK74cku5+FnKpURAeUUXVwfgCZE= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4a23e00c-8562-4140-a706-08d7ea820ba7 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Apr 2020 08:07:36.3445 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: vtsSSUlT8ah+G27a0AnKVC0+IZzTGVj0O8MWLfpQTGUloLZQQtRmCfgcKOa+N2sIA6/35YgVXh8AW8Kp/COYuA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR04MB5241 Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=68.232.141.245; envelope-from=prvs=379c65f89=Anup.Patel@wdc.com; helo=esa1.hgst.iphmx.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/27 04:07:37 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Received-From: 68.232.141.245 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: Atish Patra , Anup Patel , qemu-riscv@nongnu.org, qemu-devel@nongnu.org, Anup Patel Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @sharedspace.onmicrosoft.com) Content-Type: text/plain; charset="utf-8" Currently, the upstream Spike ISA simulator allows more than one CPUs so we update QEMU Spike machine on similar lines to allow more than one CPUs. The maximum number of CPUs for QEMU Spike machine is kept same as QEMU Virt machine. Signed-off-by: Anup Patel Reviewed-by: Alistair Francis --- hw/riscv/spike.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c index b0395e227c..1799b9291c 100644 --- a/hw/riscv/spike.c +++ b/hw/riscv/spike.c @@ -472,7 +472,7 @@ static void spike_machine_init(MachineClass *mc) { mc->desc =3D "RISC-V Spike Board"; mc->init =3D spike_board_init; - mc->max_cpus =3D 1; + mc->max_cpus =3D 8; mc->is_default =3D true; mc->default_cpu_type =3D SPIKE_V1_10_0_CPU; } --=20 2.25.1