{"id":2224345,"url":"http://patchwork.ozlabs.org/api/1.2/patches/2224345/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260417100302.162260-5-djordje.todorovic@htecgroup.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.2/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260417100302.162260-5-djordje.todorovic@htecgroup.com>","list_archive_url":null,"date":"2026-04-17T10:03:11","name":"[v7,4/6] hw/riscv: Make boot code endianness-aware at runtime","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"3c642c699e2d579ee92c3800ea04408d74348fd5","submitter":{"id":90738,"url":"http://patchwork.ozlabs.org/api/1.2/people/90738/?format=json","name":"Djordje Todorovic","email":"Djordje.Todorovic@htecgroup.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260417100302.162260-5-djordje.todorovic@htecgroup.com/mbox/","series":[{"id":500299,"url":"http://patchwork.ozlabs.org/api/1.2/series/500299/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=500299","date":"2026-04-17T10:03:08","name":"Add RISC-V big-endian target support","version":7,"mbox":"http://patchwork.ozlabs.org/series/500299/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2224345/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2224345/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=htecgroup.com header.i=@htecgroup.com\n header.a=rsa-sha256 header.s=selector1 header.b=mkQDTUH9;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists1p.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)","dkim=none (message not signed)\n header.d=none;dmarc=none action=none header.from=htecgroup.com;"],"Received":["from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fxr7j5whvz1yD3\n\tfor ; Fri, 17 Apr 2026 20:04:01 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1wDg3D-0000mf-Pl; Fri, 17 Apr 2026 06:03:52 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1wDg2s-0000Wr-J3; Fri, 17 Apr 2026 06:03:31 -0400","from mail-northeuropeazlp170100001.outbound.protection.outlook.com\n ([2a01:111:f403:c200::1] helo=DB3PR0202CU003.outbound.protection.outlook.com)\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1wDg2q-0006gN-TC; Fri, 17 Apr 2026 06:03:30 -0400","from PA2PR09MB7634.eurprd09.prod.outlook.com (2603:10a6:102:412::6)\n by AM7PR09MB3736.eurprd09.prod.outlook.com (2603:10a6:20b:10e::16)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9818.25; Fri, 17 Apr\n 2026 10:03:11 +0000","from PA2PR09MB7634.eurprd09.prod.outlook.com\n ([fe80::c461:b510:b6b9:f442]) by PA2PR09MB7634.eurprd09.prod.outlook.com\n ([fe80::c461:b510:b6b9:f442%3]) with mapi id 15.20.9818.023; Fri, 17 Apr 2026\n 10:03:11 +0000"],"ARC-Seal":"i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none;\n b=fSPSSiX8gh90j91E9t02jmVnqDSOpednSO7RaR2OwwXar1I1t6+XPHKhBQfaQCDCXzv4uafsKcd0UTc/jYqeBPNDyvFvpiHiNjA5hZwHIExOIgXbXM20hmq0tUDQCQ7d4os+gg5PdkRaHNRmfxiEqyWA7hkJmCoNtzHUWhj2AtGdcY0NntDaWPVJZuFs128HV13ZRkb21bmf6mpo942q749mjgIOrgO9+jP+JRAUdH2UmyAsNgpl50QXEWdrMMVYmNpPnWsvqdyWued63fqcGownOE0Oalr2mHx7ybIuGP+0yBT0RTb1UqM6RLo0I82cMQTl1NIT3QYKf9h51DuYlQ==","ARC-Message-Signature":"i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=arcselector10001;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;\n bh=xY1YGwQHj8EamZNz+VldBgGRJe54OJY4CKUosYVdpa4=;\n b=YwPVdMUz+xt2SZDfzsAv2PgOv9SdCZbEu4b2AqcKHPgpZ2jaawX+nQu0S0EAenDiYlRPqieHfiOAb6gPPW1wOJAp5hsDjlh6Li/RaWC98e16EFHTSS6F0kdCD+/I1aDhKyf9nmr54dWuI9UuV97Txltaz0AfXFIBNP9AnfbnzNM61P81W7lQD0rpPP2GpAIK9mhhq9InLgP3uV8y2suX0KYU3Gt5mp8KO5BWgbPN9xUy0x3WZdqFJJTiTNTVjLfB9moYyTsDUNelOl769wo7ikTjGDeFlUq/jxp5MGx1nJxHnQnHCovU3BeBB1CmezBN6tAFAqdcbyjDvutZ1mjn2Q==","ARC-Authentication-Results":"i=1; mx.microsoft.com 1; spf=pass\n smtp.mailfrom=htecgroup.com; dmarc=pass action=none\n header.from=htecgroup.com; dkim=pass header.d=htecgroup.com; arc=none","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=htecgroup.com;\n s=selector1;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=xY1YGwQHj8EamZNz+VldBgGRJe54OJY4CKUosYVdpa4=;\n b=mkQDTUH9os8DTlHfN2ZaIvtcqBTHoIxEaIAIVJeM+ev9bVoGqODtgZO4UjodlGN5R/mdY5rtaVTFKKr4VggYYkS08L8kycSx3EVRyj9WUqfX7aNeISmfXkt8qGzg5c6yD8bDmlyGutSbRx5Zyru5eeXU5YPVVZx/twbJgwWfgCiTr1OC7A7O3TR04q6MI6MkXNCchuNMbP8DqN/pyCMmVoGaWmmAAfnti7ziKMpdf2CQlK9jB56QXNOWd01yGf0szWz9P+EL91+94lyuyEfMwsOoXC+va7R2XHJU86PhKvc9dQ9TMT38XetKTzsKJrV9KV0RaQFGgVtUVVBK1s6DOg==","From":"Djordje Todorovic ","To":"\"qemu-devel@nongnu.org\" ","CC":"\"qemu-riscv@nongnu.org\" , \"cfu@mips.com\"\n , \"mst@redhat.com\" ,\n \"marcel.apfelbaum@gmail.com\" ,\n \"dbarboza@ventanamicro.com\" , \"philmd@linaro.org\"\n , \"alistair23@gmail.com\" ,\n \"thuth@redhat.com\" , Djordje Todorovic\n ","Subject":"[PATCH v7 4/6] hw/riscv: Make boot code endianness-aware at runtime","Thread-Topic":"[PATCH v7 4/6] hw/riscv: Make boot code endianness-aware at\n runtime","Thread-Index":"AQHczlFmFPIHc5hQSU+ag6N5sRR99A==","Date":"Fri, 17 Apr 2026 10:03:11 +0000","Message-ID":"<20260417100302.162260-5-djordje.todorovic@htecgroup.com>","References":"<20260417100302.162260-1-djordje.todorovic@htecgroup.com>","In-Reply-To":"<20260417100302.162260-1-djordje.todorovic@htecgroup.com>","Accept-Language":"en-US","Content-Language":"en-US","X-MS-Has-Attach":"","X-MS-TNEF-Correlator":"","authentication-results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=htecgroup.com header.i=@htecgroup.com\n header.a=rsa-sha256 header.s=selector1 header.b=mkQDTUH9;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists1p.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)","dkim=none (message not signed)\n header.d=none;dmarc=none action=none header.from=htecgroup.com;"],"x-ms-publictraffictype":"Email","x-ms-traffictypediagnostic":"PA2PR09MB7634:EE_|AM7PR09MB3736:EE_","x-ms-office365-filtering-correlation-id":"0ebc0b02-9d54-41bf-0f13-08de9c6888ba","x-ms-exchange-senderadcheck":"1","x-ms-exchange-antispam-relay":"0","x-microsoft-antispam":"BCL:0;\n ARA:13230040|1800799024|366016|376014|38070700021|18002099003|22082099003|56012099003;","x-microsoft-antispam-message-info":"\n mW0fWFiXQQSxPx4dUJixPrcrf+67aetCPQP0+za6Qb9km7Le+yrgqt051XalTPksqQNBwLpCwD6/jjYoYFA/P1Sk0wt3nu8yPfPsYRTF7g3Vf5mgiIrjtlU+nwmYoIMVtjYQIu5uUeLdviY1ZHcU2hs7ToHLl8t+12ojQ0kYtCbj1Y/lT/nzn3h05SuW1NrN5qmCXS0RyzUftQvnv5/5y2wPHVcEfvTQ3Bwlbiohu3YA0TK4YTUGmL/cKHmTGGTFFbf6AyT0pJOoGUuH6EOzIlknbw19KJ6SCyqtyYFxt25exOgEWMZuohCQISNhNRHzNnT5QTLdJRxWqFtgU6y/+EbhWVka7ufBsuR2NYiE4RZfkvdViccgOXrHOdk6Uz8T7ufjVOpf80n+mCqUOVtCEH3mu2YhjNoLSMtiSCgoOH0o3dWK9oVE+HToE9gXHMAT53ZM3TAzDoIugBRrHI7sKdvCX2u8Fc3R/KfN+HN3RBFewMJrAXf4IS+mK240RL9NN+a84BdRESAT8jEYMtwBVCm0BgiMyVAWKeN+P82FVQJq3Dz4n0250QFevSNqs+L5hMP+uC1e+Qln1UrrVVKCSXFz2e+rvuCN8W5mge98W4dmySzdclwP3bTglsqil9++7e93JnDvdBCiflQJyWgJFMzRM1U4j7kKPX6jYXjd9ltYjVs6UVKDcGTZRiU8uLwh7HHAoqLEE2Mw4+IFJEJNSLBIiOUF2mZQRZ4TWAsJYklSBoK2e+d/h9VtQ97ytZnN5iUzWgJo6V6DnQinZFRz2xuCzzl/KStNIdpnkQYt2nE=","x-forefront-antispam-report":"CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;\n IPV:NLI; SFV:NSPM; H:PA2PR09MB7634.eurprd09.prod.outlook.com; PTR:; CAT:NONE;\n SFS:(13230040)(1800799024)(366016)(376014)(38070700021)(18002099003)(22082099003)(56012099003);\n DIR:OUT; SFP:1102;","x-ms-exchange-antispam-messagedata-chunkcount":"1","x-ms-exchange-antispam-messagedata-0":"=?iso-8859-1?q?Uq9vvdv4CjCPoxkFkhJpSSm?=\n\t=?iso-8859-1?q?QIVSepDoFqjSVGC7yY18FqHOXA8yFtXm1ZVFZDFx80Q/oyi2n9nvj5z0W7mN?=\n\t=?iso-8859-1?q?laesNI1jXuhLmeAWwpQ5SkPNotJjsSrlq0lhMog69SGiHwDOshbsIKCNZRWI?=\n\t=?iso-8859-1?q?FhL0nr+uB7WM0MyoQpFTStWn+cIvFetDMCWDYOXXMs6G1tx5p7l+ZPAshMuG?=\n\t=?iso-8859-1?q?C3OaJ8K4uIGEzKEpkxtmXvjaoQ+BzmLKpkh/cKMt9PWyIB5yqcF5MJFZABFN?=\n\t=?iso-8859-1?q?HJwITCZVqCbnMxVJnbvOZbB/pEnyysNQVjP1DZUu9aJFbBpVXEJb55SyXbhe?=\n\t=?iso-8859-1?q?aQSzXFdQPGdIJcXuyU6ozDVQAKwSNI+N0gHSZeFayZ4yiRtX7IJQXQT35Hdn?=\n\t=?iso-8859-1?q?QGUFAsrwUzd6VoRMIEeP3SX6RHrXKZITSPuW976MTCcF+IWUOnrE0OkWYfmj?=\n\t=?iso-8859-1?q?MgRE6VIK1TEBc7XMXXr3apRSwkB5STxogZ8jmb5McYSCxftwEp1v17Zy/QdG?=\n\t=?iso-8859-1?q?sqSESwOR1QtW858g5lZlfDMfFePUON0+g/QcRGZrxo1t1hx/WHR+VTfM6rMK?=\n\t=?iso-8859-1?q?/NUliD5uimT+RRa3ArQkRcEUrbT89fV/AqGw6L6yrTKzwCukRAeMyz5pKePE?=\n\t=?iso-8859-1?q?B3fefbuhdL4Qbbq1Sx8ZAtoFcAiv/PSRwZYVS2UW/945VJyG4LPILQVnmUh1?=\n\t=?iso-8859-1?q?ixgpGA5fZDd5i96fbrEPllavmrHL9sG98kkdaCsDwWkIiKYQYdxmZkcGwVNp?=\n\t=?iso-8859-1?q?voAxC/qRbtHB4Q+l3nYGwhlYzEjvEl+gAHc0Sj9XG1HgeAwMCQZScs13W9dS?=\n\t=?iso-8859-1?q?s4h/udc+QbS1fm5MgzxIsi4jTzU3zeAsi1fEaa0lVWBAdQZ34Ha94pjHEfL4?=\n\t=?iso-8859-1?q?Ta1GG0df1cMMOo/vpF+T+CGb0+bN0FlVsO1ohT+hCmchHepbXsZ4yLhaGQ3i?=\n\t=?iso-8859-1?q?uxc8XiJCdbP2cCHFwxdPE/6GQKqMT1QbAhU/fvYc2QXcQfi8jzXPR+5HJDup?=\n\t=?iso-8859-1?q?5Tlf6nbqG96W/XGuqGrr9mKQykKHvYgtB+SKj3mnMp5uPL0RLRY6i+Azgs9X?=\n\t=?iso-8859-1?q?7m/yOgBPtddkXNutoSU+wzU+mUp1P8P9m9UcgvpB15XBXlZ669OCjiDYc1XV?=\n\t=?iso-8859-1?q?zv9R1weL+1ZU+2yfbOo0+Zx1DdCfXe0z8Fioak9N9uG7SZQiQkCvcx6WEZNn?=\n\t=?iso-8859-1?q?zbwrZucjv1OWgTenn/oCzC9CnvGu0LX3iZz73al0YI/1FQ1XQaMI4GLggHuk?=\n\t=?iso-8859-1?q?5H42nDh0ksyFii7ELGkf1pzUFm2RIqmUHTYjFmFTQCu6RfTPLvzFv5PjJZE2?=\n\t=?iso-8859-1?q?5D82tiUZ9atdIR+LPWAD83i7nELG3NCRDe7qWpaID+M/ucjbpy0tjfqAx1VC?=\n\t=?iso-8859-1?q?6VnJnWIs7BQZNyJoY+Y08WcWybIsCunRvWsd1o2OGMFhYJvQ0Znn6BM/05L6?=\n\t=?iso-8859-1?q?NOOQ1Q4XwdHg/uoHzNCR/2jEK0RQleh1dt8N3mfioovXSVcs2Dhcxm7jNMCw?=\n\t=?iso-8859-1?q?DEny6tNI5HUeyPRV2K+qEsGg8C9R2gaxuA0zja57ba43cJI4RmBic/uv4+Zc?=\n\t=?iso-8859-1?q?O27iHKUX1iXIwOpDBAsQf4RNDpWM8j/BFB8OlXOoCXbH+83X1aAiQeBwNdEw?=\n\t=?iso-8859-1?q?Mwq/IlYlGr9ZQKhf9EUq2RWns6ReBhIZl9meOiHnBCjcBvfx0itWcUv4aQuj?=\n\t=?iso-8859-1?q?PDuPp9sekKZJb96G3ahFaj93yCUTwzAr4KgNTFG2aZCbKRDLoCcUHrEnclN3?=\n\t=?iso-8859-1?q?rShE9P1yYE/f03iLyIeoHNaKRXXAYTFYNk4j7j79TNfgwfDOmVbe/mLOh2yK?=\n\t=?iso-8859-1?q?Yoq0Vn85/+qZSzwT1aGHSb/BIgu+T?=","Content-Type":"text/plain; charset=\"iso-8859-1\"","Content-Transfer-Encoding":"quoted-printable","MIME-Version":"1.0","X-OriginatorOrg":"htecgroup.com","X-MS-Exchange-CrossTenant-AuthAs":"Internal","X-MS-Exchange-CrossTenant-AuthSource":"PA2PR09MB7634.eurprd09.prod.outlook.com","X-MS-Exchange-CrossTenant-Network-Message-Id":"\n 0ebc0b02-9d54-41bf-0f13-08de9c6888ba","X-MS-Exchange-CrossTenant-originalarrivaltime":"17 Apr 2026 10:03:11.7186 (UTC)","X-MS-Exchange-CrossTenant-fromentityheader":"Hosted","X-MS-Exchange-CrossTenant-id":"9f85665b-7efd-4776-9dfe-b6bfda2565ee","X-MS-Exchange-CrossTenant-mailboxtype":"HOSTED","X-MS-Exchange-CrossTenant-userprincipalname":"\n AkDeC67HYHeuzIkyvvZtAykeFb1XETFqU4TMlZsIBbc15xDJ9Qm0u9m7AKdVloG3TyCdtjxvMqdX62fjv/It4nejtwh0WA62Ne+6pedoqtc=","X-MS-Exchange-Transport-CrossTenantHeadersStamped":"AM7PR09MB3736","Received-SPF":"pass client-ip=2a01:111:f403:c200::1;\n envelope-from=Djordje.Todorovic@htecgroup.com;\n helo=DB3PR0202CU003.outbound.protection.outlook.com","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,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n SPF_HELO_PASS=-0.001,\n 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.29","Precedence":"list","List-Id":"qemu development ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"Add riscv_is_big_endian() helper that checks the hart's big-endian CPU\nproperty and use it throughout the boot code:\n\n- ELF loading: pass ELFDATA2MSB or ELFDATA2LSB based on endianness\n- Firmware dynamic info: use cpu_to_be* or cpu_to_le* based on endianness\n- Reset vector: instructions (entries 0-5) remain always little-endian,\n data words (entries 6-9) use target data endianness. For RV64 BE, the\n hi/lo word pairs within each dword are swapped since LD reads as BE.\n\nThis is part of the runtime big-endian support series which avoids\nseparate BE binaries by handling endianness as a CPU property.\n\nSigned-off-by: Djordje Todorovic \n---\n hw/riscv/boot.c | 81 +++++++++++++++++++++++++++++++++++------\n include/hw/riscv/boot.h | 1 +\n 2 files changed, 70 insertions(+), 12 deletions(-)","diff":"diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c\nindex e5490beda0..03fb338d2a 100644\n--- a/hw/riscv/boot.c\n+++ b/hw/riscv/boot.c\n@@ -40,6 +40,28 @@ bool riscv_is_32bit(RISCVHartArrayState *harts)\n return mcc->def->misa_mxl_max == MXL_RV32;\n }\n \n+bool riscv_is_big_endian(RISCVHartArrayState *harts)\n+{\n+ return harts->harts[0].cfg.big_endian;\n+}\n+\n+/*\n+ * Convert a pair of 32-bit words forming a 64-bit dword to target data\n+ * endianness. For big-endian, the hi/lo word order is swapped since LD\n+ * interprets bytes as BE.\n+ */\n+static void riscv_boot_data_dword(uint32_t *data, bool big_endian)\n+{\n+ if (big_endian) {\n+ uint32_t tmp = data[0];\n+ data[0] = cpu_to_be32(data[1]);\n+ data[1] = cpu_to_be32(tmp);\n+ } else {\n+ data[0] = cpu_to_le32(data[0]);\n+ data[1] = cpu_to_le32(data[1]);\n+ }\n+}\n+\n /*\n * Return the per-socket PLIC hart topology configuration string\n * (caller must free with g_free())\n@@ -247,8 +269,9 @@ void riscv_load_kernel(MachineState *machine,\n */\n kernel_size = load_elf_ram_sym(kernel_filename, NULL, NULL, NULL, NULL,\n &info->image_low_addr, &info->image_high_addr,\n- NULL, ELFDATA2LSB, EM_RISCV,\n- 1, 0, NULL, true, sym_cb);\n+ NULL,\n+ ELFDATA2LSB,\n+ EM_RISCV, 1, 0, NULL, true, sym_cb);\n if (kernel_size > 0) {\n info->kernel_size = kernel_size;\n goto out;\n@@ -391,21 +414,32 @@ void riscv_rom_copy_firmware_info(MachineState *machine,\n struct fw_dynamic_info64 dinfo64;\n void *dinfo_ptr = NULL;\n size_t dinfo_len;\n+ bool big_endian = riscv_is_big_endian(harts);\n \n if (riscv_is_32bit(harts)) {\n- dinfo32.magic = cpu_to_le32(FW_DYNAMIC_INFO_MAGIC_VALUE);\n- dinfo32.version = cpu_to_le32(FW_DYNAMIC_INFO_VERSION);\n- dinfo32.next_mode = cpu_to_le32(FW_DYNAMIC_INFO_NEXT_MODE_S);\n- dinfo32.next_addr = cpu_to_le32(kernel_entry);\n+ dinfo32.magic = big_endian ? cpu_to_be32(FW_DYNAMIC_INFO_MAGIC_VALUE)\n+ : cpu_to_le32(FW_DYNAMIC_INFO_MAGIC_VALUE);\n+ dinfo32.version = big_endian ? cpu_to_be32(FW_DYNAMIC_INFO_VERSION)\n+ : cpu_to_le32(FW_DYNAMIC_INFO_VERSION);\n+ dinfo32.next_mode = big_endian\n+ ? cpu_to_be32(FW_DYNAMIC_INFO_NEXT_MODE_S)\n+ : cpu_to_le32(FW_DYNAMIC_INFO_NEXT_MODE_S);\n+ dinfo32.next_addr = big_endian ? cpu_to_be32(kernel_entry)\n+ : cpu_to_le32(kernel_entry);\n dinfo32.options = 0;\n dinfo32.boot_hart = 0;\n dinfo_ptr = &dinfo32;\n dinfo_len = sizeof(dinfo32);\n } else {\n- dinfo64.magic = cpu_to_le64(FW_DYNAMIC_INFO_MAGIC_VALUE);\n- dinfo64.version = cpu_to_le64(FW_DYNAMIC_INFO_VERSION);\n- dinfo64.next_mode = cpu_to_le64(FW_DYNAMIC_INFO_NEXT_MODE_S);\n- dinfo64.next_addr = cpu_to_le64(kernel_entry);\n+ dinfo64.magic = big_endian ? cpu_to_be64(FW_DYNAMIC_INFO_MAGIC_VALUE)\n+ : cpu_to_le64(FW_DYNAMIC_INFO_MAGIC_VALUE);\n+ dinfo64.version = big_endian ? cpu_to_be64(FW_DYNAMIC_INFO_VERSION)\n+ : cpu_to_le64(FW_DYNAMIC_INFO_VERSION);\n+ dinfo64.next_mode = big_endian\n+ ? cpu_to_be64(FW_DYNAMIC_INFO_NEXT_MODE_S)\n+ : cpu_to_le64(FW_DYNAMIC_INFO_NEXT_MODE_S);\n+ dinfo64.next_addr = big_endian ? cpu_to_be64(kernel_entry)\n+ : cpu_to_le64(kernel_entry);\n dinfo64.options = 0;\n dinfo64.boot_hart = 0;\n dinfo_ptr = &dinfo64;\n@@ -474,10 +508,33 @@ void riscv_setup_rom_reset_vec(MachineState *machine, RISCVHartArrayState *harts\n reset_vec[2] = 0x00000013; /* addi x0, x0, 0 */\n }\n \n- /* copy in the reset vector in little_endian byte order */\n- for (i = 0; i < ARRAY_SIZE(reset_vec); i++) {\n+ /* RISC-V instructions are always little-endian */\n+ for (i = 0; i < 6; i++) {\n reset_vec[i] = cpu_to_le32(reset_vec[i]);\n }\n+\n+ /*\n+ * Data words (addresses at entries 6-9) must match the firmware's data\n+ * endianness.\n+ */\n+ if (riscv_is_32bit(harts)) {\n+ for (i = 6; i < ARRAY_SIZE(reset_vec); i++) {\n+ if (riscv_is_big_endian(harts)) {\n+ reset_vec[i] = cpu_to_be32(reset_vec[i]);\n+ } else {\n+ reset_vec[i] = cpu_to_le32(reset_vec[i]);\n+ }\n+ }\n+ } else {\n+ /*\n+ * For RV64, each pair of 32-bit words forms a dword. For big-endian,\n+ * the hi/lo word order within each dword must be swapped since LD\n+ * interprets bytes as BE.\n+ */\n+ for (i = 6; i < ARRAY_SIZE(reset_vec); i += 2) {\n+ riscv_boot_data_dword(reset_vec + i, riscv_is_big_endian(harts));\n+ }\n+ }\n rom_add_blob_fixed_as(\"mrom.reset\", reset_vec, sizeof(reset_vec),\n rom_base, &address_space_memory);\n riscv_rom_copy_firmware_info(machine, harts,\ndiff --git a/include/hw/riscv/boot.h b/include/hw/riscv/boot.h\nindex f00b3ca122..93b9a37f03 100644\n--- a/include/hw/riscv/boot.h\n+++ b/include/hw/riscv/boot.h\n@@ -39,6 +39,7 @@ typedef struct RISCVBootInfo {\n } RISCVBootInfo;\n \n bool riscv_is_32bit(RISCVHartArrayState *harts);\n+bool riscv_is_big_endian(RISCVHartArrayState *harts);\n \n char *riscv_plic_hart_config_string(int hart_count);\n \n","prefixes":["v7","4/6"]}