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 A4C58C36017 for ; Tue, 1 Apr 2025 10:35:11 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tzYx9-0008Ua-J6; Tue, 01 Apr 2025 06:34:45 -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 1tzYwl-0008SB-TQ for qemu-riscv@nongnu.org; Tue, 01 Apr 2025 06:34:26 -0400 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tzYwj-0003qY-7v for qemu-riscv@nongnu.org; Tue, 01 Apr 2025 06:34:19 -0400 Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-2255003f4c6so96546185ad.0 for ; Tue, 01 Apr 2025 03:34:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1743503655; x=1744108455; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7NbUSum+DgGcGwGBoxVvU4PaK5B642fZ4CQdeAwgUjQ=; b=Bt4aXDpzmHiy25RjQT5zJg4nWsCntVm1TPuNB4/xy6U/BGrZZ3s05aHFbehal+Oai+ AASVv0Zq5MEoKiwWn5sguzVtHHtWRVmfNGzcxdp6NCuBDSfyZE80JYJAeJdnZ6KFKNlK 7g+dHb8UdJt/8TAozMyUJTda/BhkliLiJC5oEgqZbQvohJWvu3XActiZW6a6IouJ/5o3 +l9xiPTLLa8Fa4bC/19em5wmwCtLeCW1i8PAx1dxBCf6QVA1UMJnv2FA6OpAOo7+/Ru3 /HA9HDowwPTh7+2iXamMFqtI+/d64FBTDFe1BdQCA9rGHyVL4nbTW6SjiONyNjffNAJr Mh6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743503655; x=1744108455; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7NbUSum+DgGcGwGBoxVvU4PaK5B642fZ4CQdeAwgUjQ=; b=eupdsBVnfNT9DPUUoFmGy7OqiyrQ5d7nHREkOzCbKEVbPKmJBDW/9MrQnlXfogXQBY 7KvyVNgQkPjfo6Zn+JhmZAUo18ce2EF9MyWTZc289jBXgXUMXELwFkwxUOoF0mHjkXui okpA+w8kB4zjdIJ3vQZoQYE5VY6ODUoDJabp2hoWqPw9k0cGBTUZjU+wSIoEXtZIpd98 ajjc04Hj19p10IU+/27ERKw5/YT93UqYWUp7DfvafCghfxJRAuoQVBnteTcNwlLqnxRg h3YUB28OK04klD2qrnXQdD7O79ipCHR5wQGyZCb8qrVIjKPY7YHxobyXO22cYZZIs+n/ j4pw== X-Forwarded-Encrypted: i=1; AJvYcCWNT0C1irQSETja7w/iX5IjtIsrsnc3ft2K1rfevW2LFavlo3SziNQcEFH0k79ACSPdV7oEYkM3c9Os@nongnu.org X-Gm-Message-State: AOJu0YwuDdnC7m5lMe1YlbfD7EYREVRZsALAT7UjvDD2ZKx3Gkmo2MEH 4gZlmvmxsgziIee0+eH70YzA+vSzIT8afdFdVmwFYVeTlED48rCAFcbCPK9mPRI= X-Gm-Gg: ASbGnctfmONuZYqIDTmSJJ1yhKDqu7RG8qLGP3Ju7KaydhtryrLUgZIr5EHSfiLF7Kz qxy9uW8el3GcCvomT1Lbpz/MzMZCgoX0ksbmr5mWTxkj8lKBGdlzsvjHoK+3ZUoa+/B2lSKQ325 8+L1XuoqCd9x5Q7bkoMsuH9UjIGvq4zE+ZUgl79Tlq3oA6uussv9tiAdlqFrc5ljt+J4zV3ndtd vLs0KcgoaEdrYLVtttLPqNs++/Fgk1Kzy0nEiChJyAzSragbrBBVrHOwsMneZ6hOUNFqiM6uxYI Q3B2kTlLMUeoPVIOTYexzt94P4KWa7rrjMs+E0FZfOb4qywY91ihEFYAgk5FFfyhL5ZyKG7X44E cUnRPFPZ9 X-Google-Smtp-Source: AGHT+IGcr34i6AKbI+z9OGINU7yuSyTLNd3DA591DW7R+T34QYVNUnJih2Q7SrHaBVrEHkx52UeBHg== X-Received: by 2002:a17:902:cec4:b0:223:501c:7576 with SMTP id d9443c01a7336-2295be64dacmr43550085ad.12.1743503655561; Tue, 01 Apr 2025 03:34:15 -0700 (PDT) Received: from jchang-1875.internal.sifive.com ([136.226.240.172]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2291f1ded6asm85211795ad.184.2025.04.01.03.34.13 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 01 Apr 2025 03:34:15 -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 v2 2/2] target/riscv: Restrict midelegh access to S-mode harts Date: Tue, 1 Apr 2025 18:33:44 +0800 Message-ID: <20250401103344.84257-2-jay.chang@sifive.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250401103344.84257-1-jay.chang@sifive.com> References: <20250401103344.84257-1-jay.chang@sifive.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::635; envelope-from=jay.chang@sifive.com; helo=mail-pl1-x635.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-BeenThere: qemu-riscv@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-riscv-bounces+qemu-riscv=archiver.kernel.org@nongnu.org Sender: qemu-riscv-bounces+qemu-riscv=archiver.kernel.org@nongnu.org RISC-V AIA Spec states: "For a machine-level environment, extension Smaia encompasses all added CSRs and all modifications to interrupt response behavior that the AIA specifies for a hart, over all privilege levels. For a supervisor-level environment, extension Ssaia is essentially the same as Smaia except excluding the machine-level CSRs and behavior not directly visible to supervisor level." Since midelegh is an AIA machine-mode CSR, add Smaia extension check in aia_smode32 predicate. Reviewed-by: Frank Chang Signed-off-by: Jay Chang --- target/riscv/csr.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/target/riscv/csr.c b/target/riscv/csr.c index 975d6e307f..81a57249bf 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -372,8 +372,11 @@ static RISCVException aia_smode(CPURISCVState *env, int csrno) static RISCVException aia_smode32(CPURISCVState *env, int csrno) { int ret; + int csr_priv = get_field(csrno, 0x300); - if (!riscv_cpu_cfg(env)->ext_ssaia) { + if (csr_priv == PRV_M && !riscv_cpu_cfg(env)->ext_smaia) { + return RISCV_EXCP_ILLEGAL_INST; + } else if (!riscv_cpu_cfg(env)->ext_ssaia) { return RISCV_EXCP_ILLEGAL_INST; } @@ -5832,7 +5835,7 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { [CSR_MVIP] = { "mvip", aia_any, NULL, NULL, rmw_mvip }, /* Machine-Level High-Half CSRs (AIA) */ - [CSR_MIDELEGH] = { "midelegh", aia_any32, NULL, NULL, rmw_midelegh }, + [CSR_MIDELEGH] = { "midelegh", aia_smode32, NULL, NULL, rmw_midelegh }, [CSR_MIEH] = { "mieh", aia_any32, NULL, NULL, rmw_mieh }, [CSR_MVIENH] = { "mvienh", aia_any32, NULL, NULL, rmw_mvienh }, [CSR_MVIPH] = { "mviph", aia_any32, NULL, NULL, rmw_mviph }, -- 2.48.1