From patchwork Tue Mar 18 07:01:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jay Chang X-Patchwork-Id: 14020936 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1C6E4C282EC for ; Tue, 18 Mar 2025 12:50:19 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tuWMF-0004JD-0j; Tue, 18 Mar 2025 08:47:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tuQxd-0000Jw-SC for qemu-devel@nongnu.org; Tue, 18 Mar 2025 03:02:02 -0400 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tuQxc-0002kv-7S for qemu-devel@nongnu.org; Tue, 18 Mar 2025 03:02:01 -0400 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-22403cbb47fso95773635ad.0 for ; Tue, 18 Mar 2025 00:01:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1742281318; x=1742886118; darn=nongnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=0edgTYoWHKRu92ltgEpm8dVjfH0ldEKXvt5V/yx46BU=; b=B0LKkIPs3BIrJn+7BNlRg0BaBbzk22NeDiJocaz5WUzoxChBBC8t9oHJKnZvMgij3q 5KYHX4CTR6P6GBXUEB11D1QnjqbIz8sIQay25pp0AEMN+7yd0+2yfKtUXw/x4V0w/yTN dOliCOL0E6nvhDdcqJqf9UUai+kt7HkUKzXauhSDZa+jryvp46gxhIgHiQq9XVL9zDpK 0391ph879U3UY8+vUBV8syPQB40SUTN//SBkvQKVh+UfcuZn18fgv5rR2yQ4vm3Ja1UA V813FRquXqi0YJS9feUI1Kd2/v/KiC/zHo4du2VLuSytGM+GIEA91AzVs4gWNlIZ/Fqi TIsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742281318; x=1742886118; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=0edgTYoWHKRu92ltgEpm8dVjfH0ldEKXvt5V/yx46BU=; b=vtKd7vyg3gGLFGdIW5/61a2X+eqGPYyKT+x4N41aYpzaLF87d6TEQvFB2eoRv5AS0E jDCIsgZzsgz9ZRZ3LDewlzmwCVmY2DPX/5d7vLMEUb3jEvLJGCsxbFafdnH4RkNoP57z M45xzpcSi8XuaThbbzWYm0u/5XVyea50FowNKoxJtL7FMYIWCdJtSWYyLGxG2Dz02ygd 2FnrEv/hzLed0fQONnZ1bAWVzU137IIfV9Xi3PsHyQRk6QcRk/9pOMHAeVoykfFTG+Ls D49+Q6Z/iZWOVHaYMHvYNs/BGy6XDLbODRsqY1EASD6Nkt5fBsT1EJOtWdKXvL08Vnl3 W+gQ== X-Gm-Message-State: AOJu0YxFLIpDcZz91R9GETlyjJkXvoqZygmg+Lcjo/0wrP8tPvBnImUe wcaxEVRFRVAPnCDzIKaiLUWmG2COw3cgNvY9M+1Cl0isyhNSznLuwQ7xE8WRH0WGUamMQ3/znjF buh5BIrDwZmwsSY1wuTeOnLtVOZL4Qr85Wf43/RWny7FUDoUW2EjrCM2cRPJ5eS6FSqVm9fuvP8 d0sdYuddV8rIxpwzzxx8gyRlN9q5JyLfHKU8VwHkw= X-Gm-Gg: ASbGnctFKl4Du8878NHexCSQu2tCsp1vFC+ZqfJ0UHliC3u8l1QomJVWdRJGjmgBO01 p5WOGhDT1xRnKYJl8K32t4MotWArIJ19F8f9YvkL+syTj6k1AkB5j0URkAvFj4ZM0J5KKF3Nu0X BSxVZGC/JMHKUrq6loW2cuMUCx3W6/0v4wHbCw14wKfE05QGE4fR6Bgt068bLKVhSq8MjwWtu4v EJgV9xgJpjMvezpfH36jQiZ3pCfQxWfJycw/EhctQWuALzRUVup2b2AeQNE0xWb4pTA1/Z8nTo+ qcSK3uqqQIgP5GoDJ9WaAyd+hFqAD5RotYWbR1aLTpB3zBdbNov1FiPGepawqRAPQ/TYEm2vUlR M/0jsMdpx X-Google-Smtp-Source: AGHT+IGWifLnYVuRbqWUZyfMBtkq3CXs7fAs6peqoxMK/fCdcqHir/J6V82jUNm12Xja0X92WeP3Sw== X-Received: by 2002:a17:902:c944:b0:223:54aa:6d15 with SMTP id d9443c01a7336-225e0a6c3bdmr188429355ad.12.1742281318146; Tue, 18 Mar 2025 00:01:58 -0700 (PDT) Received: from jchang-1875.internal.sifive.com ([136.226.240.172]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c68885a1sm86966235ad.13.2025.03.18.00.01.56 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 18 Mar 2025 00:01:57 -0700 (PDT) From: Jay Chang To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Cc: Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , Jay Chang , Frank Chang Subject: [PATCH 1/2] target/riscv: Restrict mideleg/medeleg/medelegh access to S-mode harts Date: Tue, 18 Mar 2025 15:01:35 +0800 Message-ID: <20250318070136.38898-1-jay.chang@sifive.com> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::636; envelope-from=jay.chang@sifive.com; helo=mail-pl1-x636.google.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, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Tue, 18 Mar 2025 08:44:54 -0400 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org RISC-V Privileged Spec states: "In harts with S-mode, the medeleg and mideleg registers must exist, and setting a bit in medeleg or mideleg will delegate the corresponding trap , when occurring in S-mode or U-mode, to the S-mode trap handler. In harts without S-mode, the medeleg and mideleg registers should not exist." Add smode predicate to ensure these CSRs are only accessible when S-mode is supported. Reviewed-by: Frank Chang Signed-off-by: Jay Chang --- target/riscv/csr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target/riscv/csr.c b/target/riscv/csr.c index 7948188356..975d6e307f 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -5783,8 +5783,8 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { NULL, read_mstatus_i128 }, [CSR_MISA] = { "misa", any, read_misa, write_misa, NULL, read_misa_i128 }, - [CSR_MIDELEG] = { "mideleg", any, NULL, NULL, rmw_mideleg }, - [CSR_MEDELEG] = { "medeleg", any, read_medeleg, write_medeleg }, + [CSR_MIDELEG] = { "mideleg", smode, NULL, NULL, rmw_mideleg }, + [CSR_MEDELEG] = { "medeleg", smode, read_medeleg, write_medeleg }, [CSR_MIE] = { "mie", any, NULL, NULL, rmw_mie }, [CSR_MTVEC] = { "mtvec", any, read_mtvec, write_mtvec }, [CSR_MCOUNTEREN] = { "mcounteren", umode, read_mcounteren, @@ -5792,7 +5792,7 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { [CSR_MSTATUSH] = { "mstatush", any32, read_mstatush, write_mstatush }, - [CSR_MEDELEGH] = { "medelegh", any32, read_zero, write_ignore, + [CSR_MEDELEGH] = { "medelegh", smode32, read_zero, write_ignore, .min_priv_ver = PRIV_VERSION_1_13_0 }, [CSR_HEDELEGH] = { "hedelegh", hmode32, read_hedelegh, write_hedelegh, .min_priv_ver = PRIV_VERSION_1_13_0 },