{"id":2220203,"url":"http://patchwork.ozlabs.org/api/patches/2220203/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260406154935.144674-7-djordje.todorovic@htecgroup.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/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":"<20260406154935.144674-7-djordje.todorovic@htecgroup.com>","list_archive_url":null,"date":"2026-04-06T15:49:42","name":"[v6,6/7] target/riscv: Fix page table walk endianness for big-endian harts","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"6bf9d371901936c1761fae33dd4ac76c90d33921","submitter":{"id":90738,"url":"http://patchwork.ozlabs.org/api/people/90738/?format=json","name":"Djordje Todorovic","email":"Djordje.Todorovic@htecgroup.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260406154935.144674-7-djordje.todorovic@htecgroup.com/mbox/","series":[{"id":498877,"url":"http://patchwork.ozlabs.org/api/series/498877/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=498877","date":"2026-04-06T15:49:42","name":"Add RISC-V big-endian target support","version":6,"mbox":"http://patchwork.ozlabs.org/series/498877/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2220203/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2220203/checks/","tags":{},"related":[],"headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","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=njA1Q5Am;\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=lists.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 lists.gnu.org (lists.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 4fqDMT0KQ3z1yFt\n\tfor <incoming@patchwork.ozlabs.org>; Tue, 07 Apr 2026 01:51:17 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces@nongnu.org>)\n\tid 1w9mDC-0005eE-P3; Mon, 06 Apr 2026 11:50:02 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <Djordje.Todorovic@htecgroup.com>)\n id 1w9mDB-0005dm-77; Mon, 06 Apr 2026 11:50:01 -0400","from mail-swedencentralazlp170130007.outbound.protection.outlook.com\n ([2a01:111:f403:c202::7] helo=GVXPR05CU001.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 <Djordje.Todorovic@htecgroup.com>)\n id 1w9mD9-00021U-L8; Mon, 06 Apr 2026 11:50:00 -0400","from GV2PR09MB8755.eurprd09.prod.outlook.com (2603:10a6:150:358::6)\n by VI1PR09MB6903.eurprd09.prod.outlook.com (2603:10a6:800:1e2::19)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9769.19; Mon, 6 Apr\n 2026 15:49:43 +0000","from GV2PR09MB8755.eurprd09.prod.outlook.com\n ([fe80::939c:95df:4890:ce63]) by GV2PR09MB8755.eurprd09.prod.outlook.com\n ([fe80::939c:95df:4890:ce63%3]) with mapi id 15.20.9769.014; Mon, 6 Apr 2026\n 15:49:43 +0000"],"ARC-Seal":"i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none;\n b=VXYyIefMU5XMdWG4w3eOtCsYpwwrqPa/RAiqxeoJrUiA/HnjYeqV5/LPjab2woJpNaEsdANAM99OsSjDdOq3U4zk2Xe9+hbsFTfadwKCeHVVXhmVdKI63HNz/MbCKVwzrLq+VqBuyIUl5cY3bUyyJXdatsi7l9o1EbjA8rMt1hEEIm4qJXkj9ZRHuEA62QlKth1iInGcnk3R0SYv3BfbBrpdgU+9Lm9FMn/4/8jW2W8zBFhzRM0OEfjT1+ScfFEsLO6Qc5mxb50TLjWmJg+1oynMedtDF/l3ByTtdUK2hGweuF+iyPK4M40gpuFtWNmpZYpI/ND3+tKu88Md4YUKwg==","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=TVlOz68TH6Rn29Kd8vfhWLfqyIhG54uGQnnB6efYGDo=;\n b=ADixOhDhJ9ExIMkg0VIcMqQEIIVmzu1hjdmJtvArH2cxT2gaNvAz+HKTXonWTtWMX5d6DnckgIRNwJPBG0lBwmR3U7sF2amiYDVusv51DMVpA3kkS8AJGIn9Fbq1XGglspWawL8rwRML/EPCBiq4tvFfZS2cPL01RMAQA0jsRJlLt27N+ENSM0vGOyCJFrJU3yL7nAisRxFCIc7Ek2xEu86Y8/q0X0Jhdsw8UPGhpEFZvy+Z2M/c96PEhSqzkn7Xc3aqCivoI38DV+9Cqy/nyDpD4ym4wtIUqu+8Mb0Gm6NINoZ3obqPL0Gl2pRZVi32micnE/na+r4kFPrX66VJ1g==","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=TVlOz68TH6Rn29Kd8vfhWLfqyIhG54uGQnnB6efYGDo=;\n b=njA1Q5AmDDSM528ByVtg3kiBYa6ZdUpXThvX6TXrNp/A3ID/Io8O+a5ed9DXAN95tC54gYhdFoDtXK6EQAqpNCINTsy4b5VjaUIgxydrlNa7UqMLnOUkcJxpGrGCTdBo6Hw3yTHCYwZDRs2/SMmILBh3BGbEtNzh5BWTMBWSIthEckxWRAS9tJ/GUI1jjGHwu+fUlOAVj07Al+ifPy+MzEkbkfh7ggetu24EiO366cxeNOawKwQb7l+D0oZNJe0M4TwHZ3yZQvblmnffZVIEK4O5RVVNdas9GZBmY1vm948zW38bRNIYbvcPTpze2tEwjFgiVE9br1EcNbSq/++vOg==","From":"Djordje Todorovic <Djordje.Todorovic@htecgroup.com>","To":"\"qemu-devel@nongnu.org\" <qemu-devel@nongnu.org>","CC":"\"qemu-riscv@nongnu.org\" <qemu-riscv@nongnu.org>, \"cfu@mips.com\"\n <cfu@mips.com>, \"mst@redhat.com\" <mst@redhat.com>,\n \"marcel.apfelbaum@gmail.com\" <marcel.apfelbaum@gmail.com>,\n \"dbarboza@ventanamicro.com\" <dbarboza@ventanamicro.com>, \"philmd@linaro.org\"\n <philmd@linaro.org>, \"alistair23@gmail.com\" <alistair23@gmail.com>,\n \"thuth@redhat.com\" <thuth@redhat.com>, Djordje Todorovic\n <Djordje.Todorovic@htecgroup.com>","Subject":"[PATCH v6 6/7] target/riscv: Fix page table walk endianness for\n big-endian harts","Thread-Topic":"[PATCH v6 6/7] target/riscv: Fix page table walk endianness for\n big-endian harts","Thread-Index":"AQHcxdz85GQ32f8AqkK1O7gP1A+/Sw==","Date":"Mon, 6 Apr 2026 15:49:42 +0000","Message-ID":"<20260406154935.144674-7-djordje.todorovic@htecgroup.com>","References":"<20260406154935.144674-1-djordje.todorovic@htecgroup.com>","In-Reply-To":"<20260406154935.144674-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=njA1Q5Am;\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=lists.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":"GV2PR09MB8755:EE_|VI1PR09MB6903:EE_","x-ms-office365-filtering-correlation-id":"c70ab610-5457-410e-69a2-08de93f41f0b","x-ms-exchange-senderadcheck":"1","x-ms-exchange-antispam-relay":"0","x-microsoft-antispam":"BCL:0;\n ARA:13230040|366016|376014|1800799024|18002099003|38070700021|22082099003|56012099003;","x-microsoft-antispam-message-info":"\n XLzaSgEO+nPUcxDfMwmtYXfTNvLcL3uMUPnPib2IUboWrWQ+so4u4ELKRbg29UG6c9D02qwaKRjcp3mNbKgqOvRrM6SNeoJ8h45ygdqO00KKRci0bL0BdzLJ78rzSW/dYNEPxQ0Eqf8KaAOcBH29bN5DvaHS3w+chwG0OJbKsWAtUWPVNsA0EKKrpInOiIF58TrtW8tV/KE+TxqovRxOy55sMpuWSz9r92VDJl1GtljHnp2iK/8AMuzT3rVUe8C3/4V8wfeGFTITML24Q/i5X2X5MVa16LMrp9s+AaBIyPcvn/mxrLTPoCKkJ82etwoBlD1gdjVGTgLE0K5+Sfh7tM5PBPrDIWLWJO5RWtxQnCfCE4bWM996ah8bRPIESx/paDsZQN5pVJdrsHSALkbXcehfhtlUo+xHUF+cB+JjRORq6TGc9asz/Wn7XR2L8ZMpNq0GeGUiVOX8vjA88gmeRA7dHNr3JCPn7EqcFZGDkZn6pev7/+gcAlBRvYUbs8WcILec/2GewNDvmPDbrG7VFmh9xw9pssgcjFvut1aW4SKMbPEErHxHqJ9+DYLQjBUxzUPCRiq35zKXgFkRtx2RJKshTr+VceBXgXJrFKnmVGDw7tOmofGBe2dwiUfLT0H55z0n8QHZGSzr36e9yAsg14aou9GSs5tlPtmQaui8fNAMPG7YBEKrsedACj9kNFyPLiWYKZVKAOCAIYp4voMiKwsfVg8vai6WtE9lipRutIfEfEg0bGz7D2+K34y8K4sp0rGRCul33UKcFeqvaKzYxJJ1rZOObWGhIueDH+I15+E=","x-forefront-antispam-report":"CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;\n IPV:NLI; SFV:NSPM; H:GV2PR09MB8755.eurprd09.prod.outlook.com; PTR:; CAT:NONE;\n SFS:(13230040)(366016)(376014)(1800799024)(18002099003)(38070700021)(22082099003)(56012099003);\n DIR:OUT; SFP:1102;","x-ms-exchange-antispam-messagedata-chunkcount":"1","x-ms-exchange-antispam-messagedata-0":"=?utf-8?q?xyMaOxrJPoxWNys1n+Kjml+pVOWi?=\n\t=?utf-8?q?s0W6YHSQCZkAqdzgcElZW0Gg/g06fQ6sSpHi3ExrkyvQ7F1wB1rj4tNxO6/UiQGMv?=\n\t=?utf-8?q?zhKd72wdKj1vY3676PH0A0bSBpkMo0TpNT4MSqJzPpHyAqALuCE9ICcn+ZCLXbxyZ?=\n\t=?utf-8?q?gRikkK4ycJYg3gvAg0NHKFwfrjeAXZY8U1AnG00z6VXnnHamgn1bH5rfEz4I82iyi?=\n\t=?utf-8?q?gTweWsfHo5df50/qvHy8oYrh3WdQPjvhohdNcXV4uBP9N1uY47GisF/kPQJwyyYrs?=\n\t=?utf-8?q?AaTLfxbEj6PPU1BdIvTvu7zhY0wvPqKEqISkDyQTgrlTWw7K7jC3AlQiPiqDP000x?=\n\t=?utf-8?q?+w4ouXTwq6/MVnZQclVlY9nea7LzpaAZQkXfL8Z61cSh7saeIFZRyI8sOdGaJwhYU?=\n\t=?utf-8?q?OcH1Z/AZwhpPOg+H1BWHIXD37b9w+VsDcRG5JfxH1W5Vvrj8Znc5U359n/a22VGyJ?=\n\t=?utf-8?q?iUSwIYxzu0CuyjLIqZmoDDQ7cfgCkUPZHVbsnh2PYDrX8gOLeL64AwIqMO0QmiM8/?=\n\t=?utf-8?q?/IVOd+W9pJLQAJlLrHM11A9Vj73cLUKXjBkfbELF39lAA/logF8zJuNqzAY8ll5Li?=\n\t=?utf-8?q?mnlbJIMCFjy9uhu6G4nP6pvA1hUfdTpcg400PhVV96y7bwOvQrGrNwEGRvMzcuVG/?=\n\t=?utf-8?q?MniuxDuIeP+67kiyUQe9ffP1Q1idfQ3s+FIw8PzrTuuaSv+ocRJEREfBpiEZR8f7P?=\n\t=?utf-8?q?TU4petKrf9M4/PUCqydY195ismWR1LItDDEpSVuw8Fdv7lC1pUdBBt9tnNZt+vXqX?=\n\t=?utf-8?q?LnQObkvAt2I3Dd999iBRGedemqwat/SvXwtshALJSwhd/jSQceJHZxWF1MalYodGN?=\n\t=?utf-8?q?4JE4/X9Jsfdmlid4NBbTkbgBDm0vzbtDdHngspwecPve8Fdx+pmYd5pnqdagm0/jL?=\n\t=?utf-8?q?+rpscuYBhMNpWnw3++wu7/PKeZBdex/8A7NiR/alouBY/A8RKslZ4lgGhzzwPW/S+?=\n\t=?utf-8?q?8TvhVsMemqEjMr+MJ3dkqLy5jspsLIgwvd1oehNtLZ+u/EEs4Qt7ZPOIqFm69Chqo?=\n\t=?utf-8?q?Z2DZq2pPUSUa9lmYG1h6ZggjYBJ69TKNT7g0ZSR6iOuB7SsDfhi9POASDXBuD7zug?=\n\t=?utf-8?q?NY23ks4kUPSxxoODI6oSNrsWtrW89hKJFUhG085Y9QkcgR6040pBSiMNylBKuWr0Z?=\n\t=?utf-8?q?K0QC+3BUFkRf1XHxA5w6xDOgFCNQ2nXVd5lq+Z4Apfwt/HpO66pT537BQcHsSwVz8?=\n\t=?utf-8?q?mmVcL6EyySwnWUR7HpRy5ah82CHu3NND/BL4+iU3cfMppRUweasgszTfdq9uNG3tq?=\n\t=?utf-8?q?w4lnaYPmyIMVg+6yjwI9PovKovM0BN3Vz/MSSSmsNEOhlrOLZeFp7esYx4ofaM+Pw?=\n\t=?utf-8?q?x5c8x0q69E1W13QjVLgwL1amYk5sP0+zovzccY6dzHAam8MGmsVcjHUZIiYqSBd6M?=\n\t=?utf-8?q?KF5Y4+6rgFF14wuioBv6p0THeHP45OxEc/Uo3zQR+05Si0VTY89N3TncLIzW3FOua?=\n\t=?utf-8?q?L8VxrfEkrV2q4Q0cdv6g6Q1Ssyvpv4QLgheLkA7e/a+p4WLHO7hyiAqIxSOoy7ECU?=\n\t=?utf-8?q?XN/gqYvMCC9DS0YSDEj5d4C8RlOkCm0jnHgmtY60mEUN8YqEO4Zz6RJ3pfyu+b/6D?=\n\t=?utf-8?q?tyTMbwTVigfUbNCnpX9xdCJTKrnjlAQnLIccJQ6xGz5DfEOReCEvh5r1OCvsTl9KL?=\n\t=?utf-8?q?BsCjW/pAUeh0jFPpivkPB7JQDHJ20/cO3hD8rkpnMH7S1EKKhsrQnnDRv6sDmtN+1?=\n\t=?utf-8?q?lZRlbzOaS?=","Content-Type":"text/plain; charset=\"utf-8\"","Content-ID":"<38ECEEB28EE1694497EBA60BAE2F0E3C@eurprd09.prod.outlook.com>","Content-Transfer-Encoding":"base64","MIME-Version":"1.0","X-OriginatorOrg":"htecgroup.com","X-MS-Exchange-CrossTenant-AuthAs":"Internal","X-MS-Exchange-CrossTenant-AuthSource":"GV2PR09MB8755.eurprd09.prod.outlook.com","X-MS-Exchange-CrossTenant-Network-Message-Id":"\n c70ab610-5457-410e-69a2-08de93f41f0b","X-MS-Exchange-CrossTenant-originalarrivaltime":"06 Apr 2026 15:49:42.7849 (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 JKbsZGYypgozre9bIZUfcvQWuggvu7rF2w2Twl4WB4ZpV99YB3uieBLXQcfHHGRE5WHKKUVSrq5iTAPu0vTgIcSKHz6+yAszca6eqBpGSyU=","X-MS-Exchange-Transport-CrossTenantHeadersStamped":"VI1PR09MB6903","Received-SPF":"pass client-ip=2a01:111:f403:c202::7;\n envelope-from=Djordje.Todorovic@htecgroup.com;\n helo=GVXPR05CU001.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, SPF_HELO_NONE=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 <qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<https://lists.nongnu.org/archive/html/qemu-devel>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"The page table walker reads PTEs using address_space_ldl/ldq which use\ncompile-time native endianness (always LE for RISC-V). However, when a\nbig-endian kernel writes PTEs via normal store instructions, they are\nstored in big-endian byte order. The walker then misinterprets the PTE\nvalues, causing page faults and a hang when the kernel enables the MMU.\n\nThe RISC-V privileged specification states that implicit data memory\naccesses to supervisor-level memory management data structures follow\nthe hart's endianness setting (MSTATUS SBE/MBE bits).\n\nFix both PTE reads and atomic A/D bit updates to use the explicit _le\nor _be memory access variants based on the hart's runtime endianness.\n\nSigned-off-by: Djordje Todorovic <djordje.todorovic@htecgroup.com>\nReviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>\n---\n target/riscv/cpu_helper.c | 28 ++++++++++++++++++++++------\n 1 file changed, 22 insertions(+), 6 deletions(-)","diff":"diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c\r\nindex c28832e0e3..b3d33da13e 100644\r\n--- a/target/riscv/cpu_helper.c\r\n+++ b/target/riscv/cpu_helper.c\r\n@@ -1365,9 +1365,13 @@ static int get_physical_address(CPURISCVState *env, hwaddr *physical,\r\n         }\r\n \r\n         if (riscv_cpu_mxl(env) == MXL_RV32) {\r\n-            pte = address_space_ldl_le(cs->as, pte_addr, attrs, &res);\r\n+            pte = riscv_cpu_data_is_big_endian(env)\r\n+                ? address_space_ldl_be(cs->as, pte_addr, attrs, &res)\r\n+                : address_space_ldl_le(cs->as, pte_addr, attrs, &res);\r\n         } else {\r\n-            pte = address_space_ldq_le(cs->as, pte_addr, attrs, &res);\r\n+            pte = riscv_cpu_data_is_big_endian(env)\r\n+                ? address_space_ldq_be(cs->as, pte_addr, attrs, &res)\r\n+                : address_space_ldq_le(cs->as, pte_addr, attrs, &res);\r\n         }\r\n \r\n         if (res != MEMTX_OK) {\r\n@@ -1566,12 +1570,24 @@ static int get_physical_address(CPURISCVState *env, hwaddr *physical,\r\n         if (memory_region_is_ram(mr)) {\r\n             target_ulong *pte_pa = qemu_map_ram_ptr(mr->ram_block, addr1);\r\n             target_ulong old_pte;\r\n+            bool be = riscv_cpu_data_is_big_endian(env);\r\n             if (riscv_cpu_sxl(env) == MXL_RV32) {\r\n-                old_pte = qatomic_cmpxchg((uint32_t *)pte_pa, cpu_to_le32(pte), cpu_to_le32(updated_pte));\r\n-                old_pte = le32_to_cpu(old_pte);\r\n+                uint32_t cmp = be ? cpu_to_be32(pte)\r\n+                                  : cpu_to_le32(pte);\r\n+                uint32_t val = be ? cpu_to_be32(updated_pte)\r\n+                                  : cpu_to_le32(updated_pte);\r\n+                old_pte = qatomic_cmpxchg((uint32_t *)pte_pa,\r\n+                                          cmp, val);\r\n+                old_pte = be ? be32_to_cpu(old_pte)\r\n+                             : le32_to_cpu(old_pte);\r\n             } else {\r\n-                old_pte = qatomic_cmpxchg(pte_pa, cpu_to_le64(pte), cpu_to_le64(updated_pte));\r\n-                old_pte = le64_to_cpu(old_pte);\r\n+                target_ulong cmp = be ? cpu_to_be64(pte)\r\n+                                      : cpu_to_le64(pte);\r\n+                target_ulong val = be ? cpu_to_be64(updated_pte)\r\n+                                      : cpu_to_le64(updated_pte);\r\n+                old_pte = qatomic_cmpxchg(pte_pa, cmp, val);\r\n+                old_pte = be ? be64_to_cpu(old_pte)\r\n+                             : le64_to_cpu(old_pte);\r\n             }\r\n             if (old_pte != pte) {\r\n                 goto restart;\r\n","prefixes":["v6","6/7"]}