From nobody Wed Feb 5 15:50:04 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=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1737093996; cv=none; d=zohomail.com; s=zohoarc; b=fohCn9NTLjWwu0JOLYq0X1uGKtg0uObUMT4bu7+hIsZTIbeOvz8hTr/3/yyoCvECpT/4RymFhsMjLLaP7icCamJlDLAGq1SMtgFbAi8EsuFmkZo1Zj5qqgMsaB8/qNIsv0W/oAdFEXvkEeb4N76cfw3cegr5FHPlDf5wFzKSF+U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1737093996; h=Content-Type: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=+VRfwf/f3l/VIzxVXHJMTOKa6E5uf06+ovvADrZ9bgY=; b=k1fBXstaIbfSQqPehMGM/Lt4V3k1soV9UX00MKa+8rPOuw8T4Gez0dRZE36qA7eGcbIp4c9Zegfk3OGPfM/hM+dkNtbyXI7k9dTTJzCju0o316sSZshE0jkDA+dlwdDQy8AFvllJo4WRoPjteer5ZoSDUEfYDFrXOv2iJzJ+lQw= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1737093996829553.900576396625; Thu, 16 Jan 2025 22:06:36 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tYfNc-0001HR-2K; Fri, 17 Jan 2025 00:58:52 -0500 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 1tYfNM-0008T9-Pc for qemu-devel@nongnu.org; Fri, 17 Jan 2025 00:58:40 -0500 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tYfNL-0006BV-Bw for qemu-devel@nongnu.org; Fri, 17 Jan 2025 00:58:36 -0500 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-216281bc30fso39731645ad.0 for ; Thu, 16 Jan 2025 21:58:34 -0800 (PST) Received: from toolbox.alistair23.me (2403-580b-97e8-0-321-6fb2-58f1-a1b1.ip6.aussiebb.net. [2403:580b:97e8:0:321:6fb2:58f1:a1b1]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21c2d3d6fbbsm8563595ad.168.2025.01.16.21.58.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jan 2025 21:58:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737093514; x=1737698314; 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=+VRfwf/f3l/VIzxVXHJMTOKa6E5uf06+ovvADrZ9bgY=; b=l7GVlE2bgye+CenfWQBeG3qNYnrzlWekvkidJ1Qq8qBl1VTEwwW33fJegkGgnU7HMs RRnqiOWBxJ2+dRcA39lzh7VUngAOV9bZl+zaSt2RcCLvZhSkfgPkxFrjzB4/7tPqQQTK XOasmMQXdpZWrvt9zTdUJVzXMGQ1jm6J5n+un7ToOPZ5EVwbMA7E0HRKlisHEuOySCFU RvwVvox5l0ucMzpMlk6ua7ryuUBYD+9L8zGhaIOCqz5CgIMwHGt4raU/M0FJbg6CfsIC y+YoHWqkgodw39s8isij+DMcRI57x/pHGkJplZlXrgUgu42B9kkdMP2GOXTEAFIwJ9We jw3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737093514; x=1737698314; 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=+VRfwf/f3l/VIzxVXHJMTOKa6E5uf06+ovvADrZ9bgY=; b=WGIbCoRM2hygYmUr7Yx7tguWufjnZbsOXZ2VgMd9NaV9lbMSEP/apQyFD3wyWxNu5g aW/Nl8+OqKk//XOWBoYoweEJ0E3kFLYBTBrlX459sKlKuru4ECBQ98rw9NG9gGWpj7Md u1MbIf9JVV8/CIPXztJbwCPynqKp12pNU56XCsxhiCpQox9P9FQCLntFRXn/Yrn/dVuI OD0iO5BJxYaa9b1bh27VvFQ8Mrcp/wrogWeb6opiVQyunAl76/FYxeryiQunfOzTjvkm bGXm6pmSTHJcC37IaLo/zuMvmDPNPbivtrHSq1YC7ioKcTnRgMp4MtREb0iVRtaNbMAB EwSw== X-Gm-Message-State: AOJu0Yyy+fbUw/U+iASIoVkFcGIHcXAr4hMsfK8i5uqrJOCFt3T3zYzU zzPJHMUwEiiUBF4mJRu/Xsaenfbfl5i1DCjxMByOmGW6FlosCNvE7aUX+g== X-Gm-Gg: ASbGncuk5qLW+ojd82KyMuqhhgAjsMQdwlyrfU5pt3PAOIuxaLGhFJvVDefVDae+DcF IRl2B4c8bj8eeo6oZstrEJanfh8S40UCJQvATaVhoEl/BDK7pFY/AzOAmUvAitCK2vXSWLA6Yzn CodGIBepFn492EVmrzno0B8QuVyq5BD7Na4SqkTHU/FFejJrh6nbA21jvypj961haTW7lFyd0Yt 9vuyYvLLhRkmdHJyWFzwQhVxm3u/MSFSW9xTJfCHEVanJcCurhrB7zOEo9el3IhJADITXfWRKtE ljJxGc3/adBTdhjPz4FjjkcECrVcKxg4GkSTZI+6jzJ6xogHgZoXISKGm/e0 X-Google-Smtp-Source: AGHT+IEQdcY3da+1AKD5yF88FEAzPyvEnzsNypMeW843i5w1AULabrExmpamurP9bEizeLd7zmijfg== X-Received: by 2002:a17:903:32cf:b0:216:5af7:5a8e with SMTP id d9443c01a7336-21c355ec9c0mr22160045ad.26.1737093513863; Thu, 16 Jan 2025 21:58:33 -0800 (PST) From: Alistair Francis X-Google-Original-From: Alistair Francis To: qemu-devel@nongnu.org Cc: alistair23@gmail.com, =?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?= , Alistair Francis Subject: [PULL 45/50] target/riscv: Implement Smdbltrp sret, mret and mnret behavior Date: Fri, 17 Jan 2025 15:55:47 +1000 Message-ID: <20250117055552.108376-46-alistair.francis@wdc.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250117055552.108376-1-alistair.francis@wdc.com> References: <20250117055552.108376-1-alistair.francis@wdc.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::62f; envelope-from=alistair23@gmail.com; helo=mail-pl1-x62f.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, 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 @gmail.com) X-ZM-MESSAGEID: 1737093997773019000 From: Cl=C3=A9ment L=C3=A9ger When the Ssdbltrp extension is enabled, SSTATUS.MDT field is cleared when executing sret if executed in M-mode. When executing mret/mnret, SSTATUS.MDT is cleared. Signed-off-by: Cl=C3=A9ment L=C3=A9ger Reviewed-by: Alistair Francis Message-ID: <20250110125441.3208676-8-cleger@rivosinc.com> Signed-off-by: Alistair Francis --- target/riscv/op_helper.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/target/riscv/op_helper.c b/target/riscv/op_helper.c index 59c4bf28ed..ce1256f439 100644 --- a/target/riscv/op_helper.c +++ b/target/riscv/op_helper.c @@ -306,6 +306,9 @@ target_ulong helper_sret(CPURISCVState *env) } mstatus =3D set_field(mstatus, MSTATUS_SDT, 0); } + if (riscv_cpu_cfg(env)->ext_smdbltrp && env->priv >=3D PRV_M) { + mstatus =3D set_field(mstatus, MSTATUS_MDT, 0); + } if (env->priv_ver >=3D PRIV_VERSION_1_12_0) { mstatus =3D set_field(mstatus, MSTATUS_MPRV, 0); } @@ -391,6 +394,9 @@ target_ulong helper_mret(CPURISCVState *env) if (riscv_cpu_cfg(env)->ext_ssdbltrp) { mstatus =3D ssdbltrp_mxret(env, mstatus, prev_priv, prev_virt); } + if (riscv_cpu_cfg(env)->ext_smdbltrp) { + mstatus =3D set_field(mstatus, MSTATUS_MDT, 0); + } if ((env->priv_ver >=3D PRIV_VERSION_1_12_0) && (prev_priv !=3D PRV_M)= ) { mstatus =3D set_field(mstatus, MSTATUS_MPRV, 0); } @@ -436,6 +442,12 @@ target_ulong helper_mnret(CPURISCVState *env) env->mstatus =3D ssdbltrp_mxret(env, env->mstatus, prev_priv, prev= _virt); } =20 + if (riscv_cpu_cfg(env)->ext_smdbltrp) { + if (prev_priv < PRV_M) { + env->mstatus =3D set_field(env->mstatus, MSTATUS_MDT, 0); + } + } + if (riscv_has_ext(env, RVH) && prev_virt) { riscv_cpu_swap_hypervisor_regs(env); } --=20 2.47.1