From nobody Sun May 19 19:10:14 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail 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; dmarc=fail(p=none dis=none) header.from=wdc.com ARC-Seal: i=1; a=rsa-sha256; t=1601653972; cv=none; d=zohomail.com; s=zohoarc; b=fYEEDBT49CdydGIQFFQ8k3CeAwIB4Z83sy+LPZwexof5q6XblcdaBbqsxe/4kghmKpv0hBNE5U4b20CiP4Lja08rGbYNBS+QB2CdTi5noFxNVfjGnO64PLGg9uOFR9L9UPmyMVfQjOEZ42ivpgiFcQNB5QBntDAXI+iddanOQQI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601653972; h=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=LlH6KjmVlwOFhePn1142vNF+BQOGp3TqywYwqz+CODU=; b=jOSgqqZyLMZXNgHImfxOVwv1XfT4N731YupyOAFNBPiOKVN2SY4Nd6dpDIK1wMnEtMABLJu+DnsY/RPadOsC7TfbfgiizFWAEvJiXZiXlrYan+K4h7ztu/RbTCOI9jEQp6IF/eQiMDbeok2Xv5lUltrhv4iojvuObiqW40sa6Qo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail 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; dmarc=fail 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 1601653972352601.7806008719881; Fri, 2 Oct 2020 08:52:52 -0700 (PDT) Received: from localhost ([::1]:37138 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kONMZ-0004ZQ-2Q for importer@patchew.org; Fri, 02 Oct 2020 11:52:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48012) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kONCE-0004Bl-OK; Fri, 02 Oct 2020 11:42:10 -0400 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:56198) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kONCB-00045N-A6; Fri, 02 Oct 2020 11:42:10 -0400 Received: from h199-255-45-15.hgst.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 02 Oct 2020 23:45:40 +0800 Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Oct 2020 08:28:01 -0700 Received: from dbzljc2.ad.shared (HELO risc6-mainframe.hgst.com) ([10.86.59.174]) by uls-op-cesaip01.wdc.com with ESMTP; 02 Oct 2020 08:42:04 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1601653543; x=1633189543; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=TC0Rre6PDSVGWrC6pMT7/cwluV53ut4KHlQPLQ1txFE=; b=ANazuekERHp5LbXZP32GmeipB4dNadPU1kPZVv2kpUc8XstLozkpLAWL I2VZJUtgJJd0HQZmQMto5amfJo5wOYB1w4EwrtfU0PUgTurfxHBM+qlaE D5J6ixRLL6U6Zs5VXUK5lzFNJhQY+mv+mqFrNbud1l+z0fYhv/4B3tYje IPalAmWz5MrZ3o52LTI16uo8DCkVTu116vybjx3zHkdvyX6sEZm6BLKZd eV2iM0TU2+9MUhgtBe+MwuwKIRsK1eZGJ/CUxbAdTojYHmN6V0koIgFdf fFxqVqtNEYvVbqTjpXkKCtEiugBSpY2Csu085SJB9l8ZVsSwT8t6Y60QW g==; IronPort-SDR: 0QC2RxoQOeNXTD582H/ph+2Hj2JPhxm8hCzhJ3ByfK42n158aznhvhgSgckAapqRqYrvlQwlfv pRiaSfy8VcB2SIrT0En2/L1+e4b/51Jandi7eX3fWBTZN7cvpzdUq8dpDPr3BYqqFZC5RDNTQw WRRdMpqeXaGbZP1ssuS2trhSh9NLGF1yENT1ozv26O68tyYXQ9/O85EqVnCwjUA0UO/ZulTXgC jCmtMq4y2NEWMXsLPwBXkJxSAgOYOHT9f6eo8CkzUARXLhkL91hKeAEgBtoimiTuva9Y1GXAdo fzk= X-IronPort-AV: E=Sophos;i="5.77,328,1596470400"; d="scan'208";a="252338159" IronPort-SDR: VB6w5xC/iHhfb5gYCFZIbgiNXDprlsUF4qqcz+K/C0LPkjC/OvJHv8de9MG2REow+Os9vekvs0 5xNZFqc3TyuQ== IronPort-SDR: fjU7uNNJGr/s2vH+lXVXcz0nhhdwbf/HI8dwecxfUAlTociVbn3sodn7RmhmXCeOx28X13lMyP tX8/OnJqyeDg== WDCIronportException: Internal From: Alistair Francis To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v1 1/4] hw/riscv: sifive_u: Allow specifying the CPU Date: Fri, 2 Oct 2020 08:31:05 -0700 Message-Id: <3b114129fbe4416dce88c454b03c31d8405cc141.1601652616.git.alistair.francis@wdc.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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.143.124; envelope-from=prvs=537b2d3de=alistair.francis@wdc.com; helo=esa2.hgst.iphmx.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/02 11:42:05 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_PASS=-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: alistair.francis@wdc.com, palmer@dabbelt.com, alistair23@gmail.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Allow the user to specify the main application CPU for the sifive_u machine. Signed-off-by: Alistair Francis Reviewed-by: Bin Meng --- include/hw/riscv/sifive_u.h | 1 + hw/riscv/sifive_u.c | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/include/hw/riscv/sifive_u.h b/include/hw/riscv/sifive_u.h index 22e7e6efa1..a9f7b4a084 100644 --- a/include/hw/riscv/sifive_u.h +++ b/include/hw/riscv/sifive_u.h @@ -48,6 +48,7 @@ typedef struct SiFiveUSoCState { CadenceGEMState gem; =20 uint32_t serial; + char *cpu_type; } SiFiveUSoCState; =20 #define TYPE_RISCV_U_MACHINE MACHINE_TYPE_NAME("sifive_u") diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index 6ad975d692..5f3ad9bc0f 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -424,6 +424,8 @@ static void sifive_u_machine_init(MachineState *machine) object_initialize_child(OBJECT(machine), "soc", &s->soc, TYPE_RISCV_U_= SOC); object_property_set_uint(OBJECT(&s->soc), "serial", s->serial, &error_abort); + object_property_set_str(OBJECT(&s->soc), "cpu-type", machine->cpu_type, + &error_abort); qdev_realize(DEVICE(&s->soc), NULL, &error_abort); =20 /* register RAM */ @@ -590,6 +592,11 @@ static void sifive_u_machine_class_init(ObjectClass *o= c, void *data) mc->init =3D sifive_u_machine_init; mc->max_cpus =3D SIFIVE_U_MANAGEMENT_CPU_COUNT + SIFIVE_U_COMPUTE_CPU_= COUNT; mc->min_cpus =3D SIFIVE_U_MANAGEMENT_CPU_COUNT + 1; +#if defined(TARGET_RISCV32) + mc->default_cpu_type =3D TYPE_RISCV_CPU_SIFIVE_U34; +#elif defined(TARGET_RISCV64) + mc->default_cpu_type =3D TYPE_RISCV_CPU_SIFIVE_U54; +#endif mc->default_cpus =3D mc->min_cpus; =20 object_class_property_add_bool(oc, "start-in-flash", @@ -618,7 +625,6 @@ type_init(sifive_u_machine_init_register_types) =20 static void sifive_u_soc_instance_init(Object *obj) { - MachineState *ms =3D MACHINE(qdev_get_machine()); SiFiveUSoCState *s =3D RISCV_U_SOC(obj); =20 object_initialize_child(obj, "e-cluster", &s->e_cluster, TYPE_CPU_CLUS= TER); @@ -636,10 +642,6 @@ static void sifive_u_soc_instance_init(Object *obj) =20 object_initialize_child(OBJECT(&s->u_cluster), "u-cpus", &s->u_cpus, TYPE_RISCV_HART_ARRAY); - qdev_prop_set_uint32(DEVICE(&s->u_cpus), "num-harts", ms->smp.cpus - 1= ); - qdev_prop_set_uint32(DEVICE(&s->u_cpus), "hartid-base", 1); - qdev_prop_set_string(DEVICE(&s->u_cpus), "cpu-type", SIFIVE_U_CPU); - qdev_prop_set_uint64(DEVICE(&s->u_cpus), "resetvec", 0x1004); =20 object_initialize_child(obj, "prci", &s->prci, TYPE_SIFIVE_U_PRCI); object_initialize_child(obj, "otp", &s->otp, TYPE_SIFIVE_U_OTP); @@ -661,6 +663,11 @@ static void sifive_u_soc_realize(DeviceState *dev, Err= or **errp) int i; NICInfo *nd =3D &nd_table[0]; =20 + qdev_prop_set_uint32(DEVICE(&s->u_cpus), "num-harts", ms->smp.cpus - 1= ); + qdev_prop_set_uint32(DEVICE(&s->u_cpus), "hartid-base", 1); + qdev_prop_set_string(DEVICE(&s->u_cpus), "cpu-type", s->cpu_type); + qdev_prop_set_uint64(DEVICE(&s->u_cpus), "resetvec", 0x1004); + sysbus_realize(SYS_BUS_DEVICE(&s->e_cpus), &error_abort); sysbus_realize(SYS_BUS_DEVICE(&s->u_cpus), &error_abort); /* @@ -792,6 +799,7 @@ static void sifive_u_soc_realize(DeviceState *dev, Erro= r **errp) =20 static Property sifive_u_soc_props[] =3D { DEFINE_PROP_UINT32("serial", SiFiveUSoCState, serial, OTP_SERIAL), + DEFINE_PROP_STRING("cpu-type", SiFiveUSoCState, cpu_type), DEFINE_PROP_END_OF_LIST() }; =20 --=20 2.28.0 From nobody Sun May 19 19:10:14 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail 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; dmarc=fail(p=none dis=none) header.from=wdc.com ARC-Seal: i=1; a=rsa-sha256; t=1601653422; cv=none; d=zohomail.com; s=zohoarc; b=Bxswxt5mnRNk1yvzOwnzxEaEPPzTKlPep3o8ROLv+JuJZmaiNUmHqtx0DU2Y+iTUX/iG6E7ckGAg9i+oipSwsn9qwPDm3MXWac5L1Yvdz3NUqj1FP9gE0yabZU7WE67nYpbJapwtHSHNvu0zMtmRimEGTu1NkadM0bSIJL+Qf/k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601653422; h=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=LDrFqsfqTkp+3Bh/7Wi8bSRb4d5ZZesVKNEH7euVzTI=; b=EkIO9dWGOT6niBJzhrRBTC7bkgqTO6uAjRAg93F2BZanb9yNpXndnkL1Kw6h8EyKQF+hbLVndgPHMzG80iw8IkspkXd/0yuK2XShLMpDlV5yeTCAad0cKy5a8ff0HmdL6tFHLDo3ca4fYBAIHh6/PgHUg3v+1JYcsjJlodxNzKg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail 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; dmarc=fail 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 1601653422333427.7004304214844; Fri, 2 Oct 2020 08:43:42 -0700 (PDT) Received: from localhost ([::1]:48710 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kONDh-0005VY-31 for importer@patchew.org; Fri, 02 Oct 2020 11:43:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48026) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kONCG-0004EF-7P; Fri, 02 Oct 2020 11:42:12 -0400 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:56208) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kONCE-00045p-0n; Fri, 02 Oct 2020 11:42:11 -0400 Received: from h199-255-45-15.hgst.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 02 Oct 2020 23:45:45 +0800 Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Oct 2020 08:28:04 -0700 Received: from dbzljc2.ad.shared (HELO risc6-mainframe.hgst.com) ([10.86.59.174]) by uls-op-cesaip01.wdc.com with ESMTP; 02 Oct 2020 08:42:07 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1601653547; x=1633189547; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=yqzJylZKVBoQLrbRf8f30FXXBLs3GyNMgU46lH2ELio=; b=fKYpi4cvuJMCSN5mmSXLuTXdMLTQ8HDDkNbRoIH6pk9sy3IWA4voGPvH VlZ7ze9HIoM33RDc2Epp3KwilEEoAPZhxD5FsFuJT8hpoNyoSrzSodpTn dDXQ30Gj0osb0VKTw4iVcZ5hGzVZsqWWSo4sQjqi8B7HJ/R1sySPSOE8G Dh9ta2JZMX4//4EDVuI6F3oGOo+1VnsRIxLkIEmKpwdcy9h5NrLDZlef3 oTkBojNpuiiRi6q99nbeQvQZ46GQ3Lyv1vv0HyIzZpL30+JktXYiBsoXu kwd2U8ysenprH0qEQaBAVfeKK6QL76TuJ+3OpbWA+lxsP7Q1kdGfkmwCk g==; IronPort-SDR: MS6kGOvM6xYJB1ey1BvrgDon9+sxjAxdtjswv90VFDlxn/d7jC28/Af6wjpv57+MqARHs71rPG BD1uA9BPvn5iY1yWnKkpJ9dV10oJEmT4rQqe6vE6CtkZc3DpCeGV4cFroLDmbIkybm4QuotWT/ U+uVTXVcHGcjwCdNxOuB0ZDh9YAncpWnziWKGnRtwfoUN8iit6hkDnV7x9af1fm7Bi410SEfSf FMS6QrrtCz6AlRnrdwhLld3O6VVVMxEvqNR0+wYasHKEoWJEquYcxl9km+kGncYh+yMcpq2/SU nL8= X-IronPort-AV: E=Sophos;i="5.77,328,1596470400"; d="scan'208";a="252338169" IronPort-SDR: IZFzHTq9+VrF5Xq+05yiW9qNNXLy9M1BsWa8E7L3r+Xodqrwkqy4RitavioL+kL7Rt4TCbnsiU SbTYQadhqKVw== IronPort-SDR: w0lVzOato0+43o5+FEcQx0W5sep/GuD/moYP001i42tt5krx//FlFJrW33jmcR+y2l+EzIqdtb O3lLV0ZjVIdA== WDCIronportException: Internal From: Alistair Francis To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v1 2/4] hw/riscv: Return the end address of the loaded firmware Date: Fri, 2 Oct 2020 08:31:08 -0700 Message-Id: X-Mailer: git-send-email 2.28.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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.143.124; envelope-from=prvs=537b2d3de=alistair.francis@wdc.com; helo=esa2.hgst.iphmx.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/02 11:42:05 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_PASS=-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: alistair.francis@wdc.com, palmer@dabbelt.com, alistair23@gmail.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Signature date is -125 seconds in the future.) Content-Type: text/plain; charset="utf-8" Signed-off-by: Alistair Francis --- include/hw/riscv/boot.h | 8 ++++---- hw/riscv/boot.c | 28 +++++++++++++++++----------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/include/hw/riscv/boot.h b/include/hw/riscv/boot.h index 451338780a..0acbd8aa6e 100644 --- a/include/hw/riscv/boot.h +++ b/include/hw/riscv/boot.h @@ -23,10 +23,10 @@ #include "exec/cpu-defs.h" #include "hw/loader.h" =20 -void riscv_find_and_load_firmware(MachineState *machine, - const char *default_machine_firmware, - hwaddr firmware_load_addr, - symbol_fn_t sym_cb); +target_ulong riscv_find_and_load_firmware(MachineState *machine, + const char *default_machine_firm= ware, + 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, diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c index 21adaae56e..fa699308a0 100644 --- a/hw/riscv/boot.c +++ b/hw/riscv/boot.c @@ -40,12 +40,13 @@ #define fw_dynamic_info_data(__val) cpu_to_le64(__val) #endif =20 -void riscv_find_and_load_firmware(MachineState *machine, - const char *default_machine_firmware, - hwaddr firmware_load_addr, - symbol_fn_t sym_cb) +target_ulong riscv_find_and_load_firmware(MachineState *machine, + const char *default_machine_firm= ware, + hwaddr firmware_load_addr, + symbol_fn_t sym_cb) { char *firmware_filename =3D NULL; + target_ulong firmware_end_addr =3D firmware_load_addr; =20 if ((!machine->firmware) || (!strcmp(machine->firmware, "default"))) { /* @@ -60,9 +61,12 @@ 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, sym_cb); + firmware_end_addr =3D riscv_load_firmware(firmware_filename, + firmware_load_addr, sym_cb= ); g_free(firmware_filename); } + + return firmware_end_addr; } =20 char *riscv_find_firmware(const char *firmware_filename) @@ -91,17 +95,19 @@ target_ulong riscv_load_firmware(const char *firmware_f= ilename, hwaddr firmware_load_addr, symbol_fn_t sym_cb) { - uint64_t firmware_entry; + uint64_t firmware_entry, firmware_size, firmware_end; =20 if (load_elf_ram_sym(firmware_filename, NULL, NULL, NULL, - &firmware_entry, NULL, NULL, NULL, + &firmware_entry, NULL, &firmware_end, NULL, 0, EM_RISCV, 1, 0, NULL, true, sym_cb) > 0) { - return firmware_entry; + return firmware_end; } =20 - if (load_image_targphys_as(firmware_filename, firmware_load_addr, - ram_size, NULL) > 0) { - return firmware_load_addr; + firmware_size =3D load_image_targphys_as(firmware_filename, + firmware_load_addr, ram_size, N= ULL); + + if (firmware_size > 0) { + return firmware_load_addr + firmware_size; } =20 error_report("could not load firmware '%s'", firmware_filename); --=20 2.28.0 From nobody Sun May 19 19:10:14 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail 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; dmarc=fail(p=none dis=none) header.from=wdc.com ARC-Seal: i=1; a=rsa-sha256; t=1601654172; cv=none; d=zohomail.com; s=zohoarc; b=PYQttrnfLd7ynnm/m803rPKvHaLBWPydy/kGjCaM/gowS7xPmEBW3VCVqAeUtix+rcU9YVKFnXvTRy17lTbuMFGWzX82HKTx8qOeZJ8P3JjZgBolIKD35JN+nToqVBqBw0CWtz/dgISEnafCR9U0U9mbYmVEH3iwxeIZgwujTKk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601654172; h=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=p+mpOwzkpf8J28JN7jlmkTIOCRGpKQ98eplxfWzR8FI=; b=JfNF6ntDmq8TMlbYv/x8eYEeSC4bLcZR1IUQZXhBsxOUPwXoXbamKXuAoNiUXPZfg1vI3gT6NDsN0gGqsgAjkcCmip3FNj8dFrXAkxq+LRNuWIw/ADHc1iD8T8jf+fsaN7C1dc0VGHYDO8x0G2m2nxLsnRQKqLMtbjfUMT+YDrw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail 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; dmarc=fail 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 1601654172807282.02100932493886; Fri, 2 Oct 2020 08:56:12 -0700 (PDT) Received: from localhost ([::1]:42342 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kONPn-0006lh-KE for importer@patchew.org; Fri, 02 Oct 2020 11:56:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48066) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kONCJ-0004Hc-Nc; Fri, 02 Oct 2020 11:42:17 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:29844) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kONCG-00047I-RN; Fri, 02 Oct 2020 11:42:15 -0400 Received: from h199-255-45-14.hgst.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 02 Oct 2020 23:42:10 +0800 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Oct 2020 08:29:01 -0700 Received: from dbzljc2.ad.shared (HELO risc6-mainframe.hgst.com) ([10.86.59.174]) by uls-op-cesaip02.wdc.com with ESMTP; 02 Oct 2020 08:42:10 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1601653332; x=1633189332; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=JcOoStNrLXLWG/1r+iBFhBgXWdomjHQ9Rs1v5g9tW2A=; b=lNU4qKe3h/H5FkRFmWIXR2nFuYtH3hpT73ZniVGBIs7irCWZ1iffWIXX UgS+JLBTLE2I3YGV3Bd7/0IWJhUxJ5+BnHW9Yp/a8H/okpJoidtK1Z8+i 4l6fWv1vnUiqxFUTawFJfL2TSi1Hmw4v7jfh8sgCoHpM34K5RxfJX+ZBV QZIDNX8JT+/uwRFhjOPiRffe0reQwqxHCXZFJJpIEEbOHIDwXNn1pXjWJ hMC5gEIu68CqVWOJgR3gDY0xXvz3Vbz8lha2Y1aVAuwkEIFiL/42HcMGN T53EvES18p+Zry2i1nH49QasNlI6Bd3A+iyN5KWNXEsYlSgVThIHt6x++ g==; IronPort-SDR: C7QQdtTtFf3Zpi8CzOIEEH92DESlfMbwffwqNpNcTs9zPgag/vNbntx5ytmQgXRma2aO7TkETi +SUOpQmBHkSvEhpH+B1MIN78j8EXSRVwID+45ugncEJrkvWs3Oqq/zTX77DeZDKP5y9uNwYiJp DWnKYL9bY3TS4BWp3cNMZPP1RtYzKs2KT+y94J8gtyrK5MsAbi0I3yxcD4K4UdgbN8TA+eAE+U d3VN821ZnHmvTxj0Rnnw6us7ZInLNIpg86HsS4SSY18HeYVhKHNd3mGbJ9InyirkkD2mDcAV3U 4Uc= X-IronPort-AV: E=Sophos;i="5.77,328,1596470400"; d="scan'208";a="258699509" IronPort-SDR: OS2Ntoe6oNuUFUm+TG9fs673RxSaBkiV1SE1PXYMc/iinch8UBdk5dATs77dWdDPTlgX9+Jbf4 tDk0hZNhMzkA== IronPort-SDR: K2l4AZetrL/lIS9yzexH1Xatkze96DT7yfyYTnC/mSwVAv6VJtPBEWDhFaT7nvZY9bF4SRME56 qdCQhAqLO3tA== WDCIronportException: Internal From: Alistair Francis To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v1 3/4] hw/riscv: Add a riscv_is_32_bit() function Date: Fri, 2 Oct 2020 08:31:10 -0700 Message-Id: <76a3cad9eb172108a0e415fe5afd481df42090d0.1601652616.git.alistair.francis@wdc.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=537b2d3de=alistair.francis@wdc.com; helo=esa1.hgst.iphmx.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/02 11:42:11 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_PASS=-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: alistair.francis@wdc.com, palmer@dabbelt.com, alistair23@gmail.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Alistair Francis --- include/hw/riscv/boot.h | 2 ++ hw/riscv/boot.c | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/include/hw/riscv/boot.h b/include/hw/riscv/boot.h index 0acbd8aa6e..2975ed1a31 100644 --- a/include/hw/riscv/boot.h +++ b/include/hw/riscv/boot.h @@ -23,6 +23,8 @@ #include "exec/cpu-defs.h" #include "hw/loader.h" =20 +bool riscv_is_32_bit(MachineState *machine); + target_ulong riscv_find_and_load_firmware(MachineState *machine, const char *default_machine_firm= ware, hwaddr firmware_load_addr, diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c index fa699308a0..5dea644f47 100644 --- a/hw/riscv/boot.c +++ b/hw/riscv/boot.c @@ -40,6 +40,15 @@ #define fw_dynamic_info_data(__val) cpu_to_le64(__val) #endif =20 +bool riscv_is_32_bit(MachineState *machine) +{ + if (!strncmp(machine->cpu_type, "rv32", 4)) { + return true; + } else { + return false; + } +} + target_ulong riscv_find_and_load_firmware(MachineState *machine, const char *default_machine_firm= ware, hwaddr firmware_load_addr, --=20 2.28.0 From nobody Sun May 19 19:10:14 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail 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; dmarc=fail(p=none dis=none) header.from=wdc.com ARC-Seal: i=1; a=rsa-sha256; t=1601654101; cv=none; d=zohomail.com; s=zohoarc; b=kbjV7sta/Zsi7gorWY3aIJoHC2l782AwUBR+vxYCpoROezb+lJ2iCMvGnq5djgQ369abzMsRCTzfXtDUZ5VuApSlilwiDLyfRM+icERvXoPVstYFuV5/7icE0ZyUI7ZVw18iVDX3r80tNWGPdOnEzlmWwsKP5W0rvjNx3iGcN/8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601654101; h=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=F9bqDO5sstyIuBSiX4hfZHp6V3mYj4PBkdO64BIp0Z0=; b=mnzAWPp/qXt+HHePGWDsw/9fv4NhwSU2kEhc2ibYfq3DcZdEud2nTQ40ibcno92hbvn498IUFGU2RhBl8m00pM0uABRvpui+X5aZhc8eDbQofMBYCiZA6LTNDJkJ0t4nRurDvfSPFfg+SVUBc44nHuB3RxR1hIzdT5jByb8q1M4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail 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; dmarc=fail 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 1601654101077592.014246052084; Fri, 2 Oct 2020 08:55:01 -0700 (PDT) Received: from localhost ([::1]:40846 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kONOd-00067o-JT for importer@patchew.org; Fri, 02 Oct 2020 11:54:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48098) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kONCM-0004KK-NU; Fri, 02 Oct 2020 11:42:19 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:29847) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kONCJ-0004A2-Rb; Fri, 02 Oct 2020 11:42:18 -0400 Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 02 Oct 2020 23:42:13 +0800 Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Oct 2020 08:28:09 -0700 Received: from dbzljc2.ad.shared (HELO risc6-mainframe.hgst.com) ([10.86.59.174]) by uls-op-cesaip01.wdc.com with ESMTP; 02 Oct 2020 08:42:13 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1601653335; x=1633189335; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=urafqw6/5hxvDuPMaVr9zng5Nq+MbPlIdYqVYn2xjT4=; b=mpV3YjKOwOzHHrTQDrKhsrKazzHi5bgNVn40IgL4AwPdX30uH8gqXBZQ mVzAYoYJ3fs3YsNoPNnnaF3N2amy06tuAHn8lA7UZR/g8euGxUxNLI7Rt 3lK6fTcye34vgGD6TeHcX9M4RrRPZHfsSvqu1L5sypQxWQXs8rNIVwnwJ RZxKUPdOz1+MYOuR/hdmLmrpX/+1vmA6hRu4EDVyhvDBC7bRcv+n7DodI YgFyuzXzONcUM+R8nkoF7HetWDEmn0ZdWxW9tiFVFRrd39H6gCvxUb4jP z+e7Uw0C0aYNEnFegpurTYiKNkyJ0YO4BD1IbbwB5EWk0QyKyqyDFFwYY w==; IronPort-SDR: SGKARZi5oC/plm2ntz5o/fx+Xoflf+n1iC9G/7ATANkqrYv2OsZqZBwI3XRjghAxw3CIM+3/Rq gjUz4TkzSeSbuAxsjvPhMP+yRS0k1Q31UsB6am66FWHLSwQGrr5GkciDw3GHhvXuNrQw6vJf+I 3lY3xMU4012T02M7YB1cSn/5c157z4CQMH/831CClyJmK2UMQ8SjfW5nxbW8phi/sa14Pd04U+ qBsU5ehl74NnnPWI8IDO/01HmeFpWJVemPxauMabwcEN+/eudJYF29K03ngPS51176ZYyDia7G TAQ= X-IronPort-AV: E=Sophos;i="5.77,328,1596470400"; d="scan'208";a="258699511" IronPort-SDR: tLZ6q7HqHRSSlKJ57jRsl/JefF+adAlg9nYL/6NBNvluD2dSH6c8ho/zR1OJM76V6j5rk8M2PW SclGgEhYZVnQ== IronPort-SDR: MyilKsbWK4ebXnlC0Ky/FtZHq2eFo5M+VJj9EjUtbldKYU6KRaO8Ed0JI/eNsddncOQNWjmDl6 ymsOPG3GR6qA== WDCIronportException: Internal From: Alistair Francis To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v1 4/4] hw/riscv: Load the kernel after the firmware Date: Fri, 2 Oct 2020 08:31:13 -0700 Message-Id: <4f272c9fab34bedc34b22adb8f9e2fb2dbd338d2.1601652616.git.alistair.francis@wdc.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=537b2d3de=alistair.francis@wdc.com; helo=esa1.hgst.iphmx.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/02 11:42:11 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_PASS=-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: alistair.francis@wdc.com, palmer@dabbelt.com, alistair23@gmail.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Alistair Francis --- include/hw/riscv/boot.h | 1 + hw/riscv/boot.c | 10 +++++----- hw/riscv/opentitan.c | 3 ++- hw/riscv/sifive_e.c | 3 ++- hw/riscv/sifive_u.c | 13 +++++++++++-- hw/riscv/spike.c | 14 +++++++++++--- hw/riscv/virt.c | 14 +++++++++++--- 7 files changed, 43 insertions(+), 15 deletions(-) diff --git a/include/hw/riscv/boot.h b/include/hw/riscv/boot.h index 2975ed1a31..85d3227ea6 100644 --- a/include/hw/riscv/boot.h +++ b/include/hw/riscv/boot.h @@ -34,6 +34,7 @@ target_ulong riscv_load_firmware(const char *firmware_fil= ename, hwaddr firmware_load_addr, symbol_fn_t sym_cb); target_ulong riscv_load_kernel(const char *kernel_filename, + target_ulong firmware_end_addr, symbol_fn_t sym_cb); hwaddr riscv_load_initrd(const char *filename, uint64_t mem_size, uint64_t kernel_entry, hwaddr *start); diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c index 5dea644f47..f8e55ca16a 100644 --- a/hw/riscv/boot.c +++ b/hw/riscv/boot.c @@ -33,10 +33,8 @@ #include =20 #if defined(TARGET_RISCV32) -# define KERNEL_BOOT_ADDRESS 0x80400000 #define fw_dynamic_info_data(__val) cpu_to_le32(__val) #else -# define KERNEL_BOOT_ADDRESS 0x80200000 #define fw_dynamic_info_data(__val) cpu_to_le64(__val) #endif =20 @@ -123,7 +121,9 @@ target_ulong riscv_load_firmware(const char *firmware_f= ilename, exit(1); } =20 -target_ulong riscv_load_kernel(const char *kernel_filename, symbol_fn_t sy= m_cb) +target_ulong riscv_load_kernel(const char *kernel_filename, + target_ulong kernel_start_addr, + symbol_fn_t sym_cb) { uint64_t kernel_entry; =20 @@ -138,9 +138,9 @@ target_ulong riscv_load_kernel(const char *kernel_filen= ame, symbol_fn_t sym_cb) return kernel_entry; } =20 - if (load_image_targphys_as(kernel_filename, KERNEL_BOOT_ADDRESS, + if (load_image_targphys_as(kernel_filename, kernel_start_addr, ram_size, NULL) > 0) { - return KERNEL_BOOT_ADDRESS; + return kernel_start_addr; } =20 error_report("could not load kernel '%s'", kernel_filename); diff --git a/hw/riscv/opentitan.c b/hw/riscv/opentitan.c index 0531bd879b..cc758b78b8 100644 --- a/hw/riscv/opentitan.c +++ b/hw/riscv/opentitan.c @@ -75,7 +75,8 @@ static void opentitan_board_init(MachineState *machine) } =20 if (machine->kernel_filename) { - riscv_load_kernel(machine->kernel_filename, NULL); + riscv_load_kernel(machine->kernel_filename, + memmap[IBEX_DEV_RAM].base, NULL); } } =20 diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c index fcfac16816..59bac4cc9a 100644 --- a/hw/riscv/sifive_e.c +++ b/hw/riscv/sifive_e.c @@ -114,7 +114,8 @@ static void sifive_e_machine_init(MachineState *machine) memmap[SIFIVE_E_DEV_MROM].base, &address_space_m= emory); =20 if (machine->kernel_filename) { - riscv_load_kernel(machine->kernel_filename, NULL); + riscv_load_kernel(machine->kernel_filename, + memmap[SIFIVE_E_DEV_DTIM].base, NULL); } } =20 diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index 5f3ad9bc0f..08b0a3937d 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -415,6 +415,7 @@ static void sifive_u_machine_init(MachineState *machine) MemoryRegion *main_mem =3D g_new(MemoryRegion, 1); MemoryRegion *flash0 =3D g_new(MemoryRegion, 1); target_ulong start_addr =3D memmap[SIFIVE_U_DEV_DRAM].base; + target_ulong firmware_end_addr, kernel_start_addr; uint32_t start_addr_hi32 =3D 0x00000000; int i; uint32_t fdt_load_addr; @@ -474,10 +475,18 @@ static void sifive_u_machine_init(MachineState *machi= ne) break; } =20 - riscv_find_and_load_firmware(machine, BIOS_FILENAME, start_addr, NULL); + firmware_end_addr =3D riscv_find_and_load_firmware(machine, BIOS_FILEN= AME, + start_addr, NULL); =20 if (machine->kernel_filename) { - kernel_entry =3D riscv_load_kernel(machine->kernel_filename, NULL); + if (riscv_is_32_bit(machine)) { + kernel_start_addr =3D QEMU_ALIGN_UP(firmware_end_addr, 0x40000= 0); + } else { + kernel_start_addr =3D QEMU_ALIGN_UP(firmware_end_addr, 0x20000= 0); + } + + kernel_entry =3D riscv_load_kernel(machine->kernel_filename, + kernel_start_addr, NULL); =20 if (machine->initrd_filename) { hwaddr start; diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c index 3fd152a035..280fb1f328 100644 --- a/hw/riscv/spike.c +++ b/hw/riscv/spike.c @@ -195,6 +195,7 @@ static void spike_board_init(MachineState *machine) MemoryRegion *system_memory =3D get_system_memory(); MemoryRegion *main_mem =3D g_new(MemoryRegion, 1); MemoryRegion *mask_rom =3D g_new(MemoryRegion, 1); + target_ulong firmware_end_addr, kernel_start_addr; uint32_t fdt_load_addr; uint64_t kernel_entry; char *soc_name; @@ -261,12 +262,19 @@ 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); + firmware_end_addr =3D riscv_find_and_load_firmware(machine, BIOS_FILEN= AME, + memmap[SPIKE_DRAM].ba= se, + htif_symbol_callback); =20 if (machine->kernel_filename) { + if (riscv_is_32_bit(machine)) { + kernel_start_addr =3D QEMU_ALIGN_UP(firmware_end_addr, 0x40000= 0); + } else { + kernel_start_addr =3D QEMU_ALIGN_UP(firmware_end_addr, 0x20000= 0); + } + kernel_entry =3D riscv_load_kernel(machine->kernel_filename, + kernel_start_addr, htif_symbol_callback); =20 if (machine->initrd_filename) { diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 41bd2f38ba..bf22d28eef 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -493,6 +493,7 @@ static void virt_machine_init(MachineState *machine) char *plic_hart_config, *soc_name; size_t plic_hart_config_len; target_ulong start_addr =3D memmap[VIRT_DRAM].base; + target_ulong firmware_end_addr, kernel_start_addr; uint32_t fdt_load_addr; uint64_t kernel_entry; DeviceState *mmio_plic, *virtio_plic, *pcie_plic; @@ -602,11 +603,18 @@ static void virt_machine_init(MachineState *machine) memory_region_add_subregion(system_memory, memmap[VIRT_MROM].base, mask_rom); =20 - riscv_find_and_load_firmware(machine, BIOS_FILENAME, - memmap[VIRT_DRAM].base, NULL); + firmware_end_addr =3D riscv_find_and_load_firmware(machine, BIOS_FILEN= AME, + start_addr, NULL); =20 if (machine->kernel_filename) { - kernel_entry =3D riscv_load_kernel(machine->kernel_filename, NULL); + if (riscv_is_32_bit(machine)) { + kernel_start_addr =3D QEMU_ALIGN_UP(firmware_end_addr, 0x40000= 0); + } else { + kernel_start_addr =3D QEMU_ALIGN_UP(firmware_end_addr, 0x20000= 0); + } + + kernel_entry =3D riscv_load_kernel(machine->kernel_filename, + kernel_start_addr, NULL); =20 if (machine->initrd_filename) { hwaddr start; --=20 2.28.0