From nobody Sat Nov 15 12:43:53 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=reject dis=none) header.from=sifive.com ARC-Seal: i=1; a=rsa-sha256; t=1751338897; cv=none; d=zohomail.com; s=zohoarc; b=DGesvlYue5S3WhovRFCfYpemverRZxSYs8YUNExB30L2E2BOv8AcVNdwh2FEO0XOJWNGMUj7O2StChQI8IFYMf8mwk/eV6HkpPn6wNr0ZDtEgiGoQ2ZdaI8Zz++4iJL6pwESMTAdsiIDrP4LHHFSuq63CwzNm+eKIdp/MfdFaaM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751338897; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=uXt4Jrv087bIm45/0i+HVz4emArqdBrfNkEJHVcdbto=; b=hb7wKiVqLDTHg2JqHlCb/UCMlfNMsVn9UU9svXxiL195brVkv4tCNCVmgWq+Ee1902/weHjn1xc67b6Hyk+7cPU1FtoLS2PpH28+UvkgEgrlsZbk5HquG8TB3QbsnLztR6Ejtz2TetkxbBZ7qs4OiShQ854GtOZm0fviKY+MP/0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1751338897430986.4423002004548; Mon, 30 Jun 2025 20:01:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uWREf-00009W-9E; Mon, 30 Jun 2025 23:00:41 -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 1uWREd-00008q-AF for qemu-devel@nongnu.org; Mon, 30 Jun 2025 23:00:39 -0400 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uWREX-0003RU-Mp for qemu-devel@nongnu.org; Mon, 30 Jun 2025 23:00:39 -0400 Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-23636167b30so24531355ad.1 for ; Mon, 30 Jun 2025 20:00:32 -0700 (PDT) Received: from jchang-1875.internal.sifive.com ([136.226.240.187]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-23acb3bf1f6sm95966565ad.204.2025.06.30.20.00.29 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 30 Jun 2025 20:00:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1751338831; x=1751943631; 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=uXt4Jrv087bIm45/0i+HVz4emArqdBrfNkEJHVcdbto=; b=Q3LuMaJZ6MSGBaPsuujHNLKV/yOjUmPDHR7Chr1fM7JX2HDBxpHWV/XQtUemPc/FVt TtQfwSLp3qHsms0E7PbxUcY5KzOtusdTbnPrFdX0blz3oO3L99AVSBIQlCDYr+gfAgHN /o3oyg40Q0EbbUdTvH6UwvuaqaXJ3csDsbSe5PkxX0NekX/+0MizrbQ25exxWDGUEOrw h2tP9rvnR8Xtdd4upHpJy7E9EoLrFDJdjlZhSFwTARn0jf+brRQmbNcNX/XpmUcQrUmA 73v11VaOZvpiYWJ5V6IFX97zijVyOYP7H8zBRSp40RTSm213rvSHYhKonzFKZQVSgvs9 mjog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751338831; x=1751943631; 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=uXt4Jrv087bIm45/0i+HVz4emArqdBrfNkEJHVcdbto=; b=kzyfUNZfp032HYLovx8R1JodTPCtGO7cdJ/fLypY9qMNDcSvmdUe3HpsK9oNfHJtjj VSPWT+aqMOtrzGTUpN9x2h1tgzjepjqqLkvMQCW9t53qVek+q1lEK8S4L/pKzai77IJq J0/hSDBWhdHF74PEqoQrN3kz7f9sDqti1V8Jt4g/aAUx5w0jMY/dA3qj7BCokPac9cVb mv7ZDqwnm4d8VKcHVY5viEaRjPlP0/yfVQGGl8dzUjY4edfagcMLblsDMUBNE37fhzai 1MWX0FPwvvvyVsEKtaDlgzAou+G46gYZtFfZ7YWWcthlnVZyH+zKsg1A5Zn9yd/MTBJQ yR0Q== X-Gm-Message-State: AOJu0YxUglHdYSs8SOAOtnf3Roi+AqJSN15cwuJSzC1/exhgACHe66+F TC9vHf8C+AqFIjeNJXA990hCFAewv16CIFefDfe5ueBNs1p8AbKCMlFFAuhWLHzQIt6x54bWmEs ozYxr4GGI+AURb7Q9bO/4Gnls3X3ZU7FUWep8dlASdg5tHw9gECTvTsanNeS89o5VRtINnRsJ7g wfVzRjSwIVaTiYinZTzyEthSQ/C+qB1qfQmLq3xAp3jUw= X-Gm-Gg: ASbGncu9NtfWhA9ilp0C0b6HcisvIBym+cP0l6E0NsMbYJGiFM/pHrSXWr/ROaN4yby GVauZGeK1Wg1NeAI1HbHc5XvJ1F3phe6jxMLxELz/0z5/KuOAphrvNUSW6MH2jbpVKc9rfuyiU3 TJerp7SI4Dhkm8OV9XoOfXg09WUd3AZgUCMYjafO6ZDRaihEsn3W1XRyWnhRBQ0jGxfSqgKGYkq P0prIzLLQ7t1oepZBrVQ6zJRrF9Eb4KNuO7l+9fy4SATZhX+fMYxjX3Ye27NUnTqsRqvtZHNj66 RQDjTqUui9E+cr0EAxZvqqY53QIUmrL5pgshBdMoKYZ+jCWZJ3nqvZO8/HSQpI3tYKhL23rEwO/ e3uKTCu0a8myFsPbkEHAjCwiNnA== X-Google-Smtp-Source: AGHT+IHgxBzRwXqaP1mYhaaxp7WMQkXDJ2L16++zC/XXQMfio9mq/cTkrgtVKTXPcw2oiDotHOkOIg== X-Received: by 2002:a17:902:db07:b0:234:ef42:5d48 with SMTP id d9443c01a7336-23ac4634b8emr257547185ad.38.1751338830952; Mon, 30 Jun 2025 20:00:30 -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 v3 1/2] target/riscv: Restrict mideleg/medeleg/medelegh access to S-mode harts Date: Tue, 1 Jul 2025 11:00:20 +0800 Message-ID: <20250701030021.99218-2-jay.chang@sifive.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250701030021.99218-1-jay.chang@sifive.com> References: <20250701030021.99218-1-jay.chang@sifive.com> 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=2607:f8b0:4864:20::62e; envelope-from=jay.chang@sifive.com; helo=mail-pl1-x62e.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-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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @sifive.com) X-ZM-MESSAGEID: 1751338899256116600 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Alistair Francis Signed-off-by: Jay Chang Reviewed-by: Nutty Liu --- 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 6296ecd1e1..0e0ad37654 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -5862,8 +5862,8 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] =3D { NULL, read_mstatus_i128 = }, [CSR_MISA] =3D { "misa", any, read_misa, write_misa, NULL, read_misa_i128 = }, - [CSR_MIDELEG] =3D { "mideleg", any, NULL, NULL, rmw_mideleg= }, - [CSR_MEDELEG] =3D { "medeleg", any, read_medeleg, write_medel= eg }, + [CSR_MIDELEG] =3D { "mideleg", smode, NULL, NULL, rmw_midel= eg }, + [CSR_MEDELEG] =3D { "medeleg", smode, read_medeleg, write_med= eleg }, [CSR_MIE] =3D { "mie", any, NULL, NULL, rmw_mie = }, [CSR_MTVEC] =3D { "mtvec", any, read_mtvec, write_mtvec= }, [CSR_MCOUNTEREN] =3D { "mcounteren", umode, read_mcounteren, @@ -5871,7 +5871,7 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] =3D { =20 [CSR_MSTATUSH] =3D { "mstatush", any32, read_mstatush, write_mstatush = }, - [CSR_MEDELEGH] =3D { "medelegh", any32, read_zero, write_ignore, + [CSR_MEDELEGH] =3D { "medelegh", smode32, read_zero, write_ignore, .min_priv_ver =3D PRIV_VERSION_1_13_0 = }, [CSR_HEDELEGH] =3D { "hedelegh", hmode32, read_hedelegh, write_he= delegh, .min_priv_ver =3D PRIV_VERSION_1_13_0 = }, --=20 2.48.1 From nobody Sat Nov 15 12:43:53 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=reject dis=none) header.from=sifive.com ARC-Seal: i=1; a=rsa-sha256; t=1751338907; cv=none; d=zohomail.com; s=zohoarc; b=c6Js8pWCfM2jTZjIVpxd33jvACtUZzoNZ2iykwMSd8BfnRZvPXnBrI1HMKcCf+K1lZrscHcNHQ/DqtsJA8De+pFV1J7howa0YPI3347QBmquwMDCQpVEq2XU4cQeSZeSzf80xWOs3Usuoqddf13vtU1PBY7sGm1V6yDr7+irPc8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751338907; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=hLHPoqlgGFTwjTolk2Arh7C0UBrzj9GZbdLJ3xnnHEQ=; b=jmSVarlLjroqfBkV77C6TMBqy/oYRBIw4WQ0548WDLqbinajL5P5ELADyMoyw9gnBizp+UhLvKCJXFrtllQzbcPY4rVXtDGYZz6o4MtivevRaVM/+PLd+OJPBdugYW9oztOUb/ZU6wExnVwDSf6mn5ab/tzid0a7yFQHktzJdCQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1751338907738449.74462505902466; Mon, 30 Jun 2025 20:01:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uWREo-0000BP-VK; Mon, 30 Jun 2025 23:00:50 -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 1uWREl-0000Aq-Pg for qemu-devel@nongnu.org; Mon, 30 Jun 2025 23:00:48 -0400 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uWREc-0003Rx-Bp for qemu-devel@nongnu.org; Mon, 30 Jun 2025 23:00:45 -0400 Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-234d366e5f2so33943505ad.1 for ; Mon, 30 Jun 2025 20:00:37 -0700 (PDT) Received: from jchang-1875.internal.sifive.com ([136.226.240.187]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-23acb3bf1f6sm95966565ad.204.2025.06.30.20.00.33 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 30 Jun 2025 20:00:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1751338835; x=1751943635; 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=hLHPoqlgGFTwjTolk2Arh7C0UBrzj9GZbdLJ3xnnHEQ=; b=HDpbHLpLOevj4RYKO0NTU9LyLSnnjkXxcWInSwH1ee/b7zMO122mTJFQc4/M0q8/86 2RZ7/kHu8qtWO2q0Yujk9EZTPLRBUcqqctZ9tWTjQEaWQ+6W9gldC3sFhoUHOXdf2/rZ GA8/4X493aBpiiEp8EvfC9p0U9iR0jDlYyMeLBH9sxQGQJ2ziHazsWf/C4mJHRSEklf3 ssCrsqqLXZyk2GibHJiC2vWkuc2nR0/2v+2qV7G+l8qB8+l5JxZ3hD52z/XUDs98Z8SS bNMWO22MXEVsuRp3yZYGutEEwYK53lIxRBKHyvr90gFykj0aGpvGv228HC67EWR66eK2 XYrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751338835; x=1751943635; 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=hLHPoqlgGFTwjTolk2Arh7C0UBrzj9GZbdLJ3xnnHEQ=; b=fYZYM1WfOT8QqK3ucQpdkBVu1Bro7tvqPLkzuL1OgVIjNeJ98g/uOfhqN6WjcFU2fb CG67XFBxt1y8MQKHpDb/dbCYl0vaMHe6aFVs35KyDuyrimm3fEbU9hGdjwZ+ZsaGkx3C YeQet22fUsGxg+bnlAsti3o3SYq/Gges0Y8zYdxtyy4FJDT4liO+UImvvW715lZwj93x +e4qLVosgfGtjUN0gO2GYgWL1/b0USllXWqVhqS+jz/WJ8dtux8ircUIFnb6SmIvC4rP yI5tRI5HyJx6ZBJdFA4fXSxW1mcjsB5sTNGlYvbg4YG4pjNd6rtjN4w0g053E2RtbN/h 0EXQ== X-Gm-Message-State: AOJu0YzZ2ZHHuhMtPaXFQqMZVL272MfiwOlzmjbIIz6x8jOPI+TX+Szm zO3vyD5P9gjEwfMgS//gStiLmwwhFJDXfCZQBd3zqwm+lO/0KwyWmZwWm/1JC/L9K/kDX50vl57 c9X67CJYlH+wj4QzmtPyc559/S0IQWUtfJCp2sNL461YjobkNn9fwYBbeTbkbINnZaLNu1vYTri e51diX+zFOnC9pPMJKgurte+FVgK+RdjRY7InNobzVtUs= X-Gm-Gg: ASbGncs440hlKqVkvCXezAK+K9y9B/zdPYdkNKOhVv2D+o4M+Fm+OJinPxlP4W056ib ViQO2PUhZWWyNZkhT5pzpv120mq/EwcYRuJtupd1oY0xGPJBHNeKgU/biv+mcWxESWMuZczin0i M4f8H30psD8qfl/mQZ2CtGKk6WyiCR0wRJJJmz3axaCmeNI/s8n/YVrde2SmkC4c139HfuMVyND rCkxwkzEV13UbKEgnvNoITaXLn6lWXbWgJBdGbBYO/xw5wVOSGm0oApCVbPcc0fA0ytH5D+H/HX VJ9fO2PPcpTWwaG8D9pbNYKvtIeefLQUrA9wmrlUDwmpjcLub4uFWZqSrM8byP1lKjoDXbkEzNx L71yHAA4kz4hJ/pWULtDYG3E8+g== X-Google-Smtp-Source: AGHT+IHKoBoC/g8VpOnseI0712lhr0SFVcxdXokMQBf0cOnT19OFykNrc/vygcwvV2tBgEBxssLM8w== X-Received: by 2002:a17:902:f64f:b0:223:619e:71da with SMTP id d9443c01a7336-23ac4880725mr234753815ad.49.1751338835311; Mon, 30 Jun 2025 20:00:35 -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 v3 2/2] target/riscv: Restrict midelegh access to S-mode harts Date: Tue, 1 Jul 2025 11:00:21 +0800 Message-ID: <20250701030021.99218-3-jay.chang@sifive.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250701030021.99218-1-jay.chang@sifive.com> References: <20250701030021.99218-1-jay.chang@sifive.com> 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=2607:f8b0:4864:20::62a; envelope-from=jay.chang@sifive.com; helo=mail-pl1-x62a.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=unavailable autolearn_force=no X-Spam_action: no action 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @sifive.com) X-ZM-MESSAGEID: 1751338909141116600 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Alistair Francis Signed-off-by: Jay Chang Reviewed-by: Nutty Liu --- 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 0e0ad37654..74ec0e1c60 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -374,8 +374,11 @@ static RISCVException aia_smode(CPURISCVState *env, in= t csrno) static RISCVException aia_smode32(CPURISCVState *env, int csrno) { int ret; + int csr_priv =3D get_field(csrno, 0x300); =20 - if (!riscv_cpu_cfg(env)->ext_ssaia) { + if (csr_priv =3D=3D 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; } =20 @@ -5911,7 +5914,7 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] =3D { [CSR_MVIP] =3D { "mvip", aia_any, NULL, NULL, rmw_mvip }, =20 /* Machine-Level High-Half CSRs (AIA) */ - [CSR_MIDELEGH] =3D { "midelegh", aia_any32, NULL, NULL, rmw_midelegh }, + [CSR_MIDELEGH] =3D { "midelegh", aia_smode32, NULL, NULL, rmw_midelegh= }, [CSR_MIEH] =3D { "mieh", aia_any32, NULL, NULL, rmw_mieh }, [CSR_MVIENH] =3D { "mvienh", aia_any32, NULL, NULL, rmw_mvienh }, [CSR_MVIPH] =3D { "mviph", aia_any32, NULL, NULL, rmw_mviph }, --=20 2.48.1