From nobody Thu Apr 25 01:08:33 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631583574875375.0361639212963; Mon, 13 Sep 2021 18:39:34 -0700 (PDT) Received: from localhost ([::1]:43240 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPxQ5-0001rF-EC for importer@patchew.org; Mon, 13 Sep 2021 21:39:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38470) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPxO4-0000SR-Pg for qemu-devel@nongnu.org; Mon, 13 Sep 2021 21:37:29 -0400 Received: from mail-pg1-x529.google.com ([2607:f8b0:4864:20::529]:36601) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mPxO3-00038c-0Y for qemu-devel@nongnu.org; Mon, 13 Sep 2021 21:37:28 -0400 Received: by mail-pg1-x529.google.com with SMTP id t1so11180624pgv.3 for ; Mon, 13 Sep 2021 18:37:25 -0700 (PDT) Received: from localhost.localdomain (123-193-74-252.dynamic.kbronet.com.tw. [123.193.74.252]) by smtp.gmail.com with ESMTPSA id k25sm8006750pfa.213.2021.09.13.18.37.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 18:37:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=jO+23q7Z+Ba1xs513jaA8qRCr6b3K8wAWX9oqFv11Kc=; b=S+MfX9DQ0gWzSM0tJk7sSag2Qz1tEuSYkNyW6BHofnbHSg4X55GnlGsHpF5TMZtxqP mrGaolTJgIl9VvaA/DAuz1cx1yeAuB2EzlDTTFa3Ag92Ws8N1FAs4kc2s2nEHNeErrgd Qju5Ok9bdZYKoSguPVPtCq0DF+AedIrlnOXrwcfe4iXF3h0FvZ66bWHJZmkMyYDZ0RII MwEiYUeHwtmY5yYjdxlMyI49+ERAUI9ykkuDPPWxB5ZFQE2gegSbKDlrBtS97NCY1nS+ b8R5gX4hyte0rro6Ky+sAf33+cUmSAAitRnmCYq/mwxiFsrqhCZ8cj/uHdgoKf2ByctH d5mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=jO+23q7Z+Ba1xs513jaA8qRCr6b3K8wAWX9oqFv11Kc=; b=o85toD97G64O3kFuoDytxgT++hvWUUmqO327amNIa6imjxvLhAR6AOmqlpUo5c33v4 obWjC6SgJCZbNK76BojLyUBV6v6TkFD3nKczIEmn4cfgHNKmha1PIk8iu031BfsveEtl Khr8zACNqGsfZzzJxfRnzvfnTLMt70gBvsvdOCly2N7VnvXA2ZHxpop684eK+smH3hUg 1KRA2l2YaKEDYAadPct6VI9L5rN4nVD6XdbKUcZ37PdNMBbAp8/uTjtzCrvAYOfbCQ16 9Zoyki0e61HDcFCWRiYQeiE3LF2yQhDom9AWTHa58QSHFRxDBMcM9bxWx8/gzObsAQra N5SQ== X-Gm-Message-State: AOAM532ehKk2adiSpVZUZ5XdTaPUGcWnVbE4tE1mYr7BR6DMPZSyF6Br RAFx7ScYNa6e0nh9pp7AbAffqw3h0BPWYg== X-Google-Smtp-Source: ABdhPJz/vfjF8wgdQgFNj2py2/VJX1jVmRgyG7dbLVExDuwC99XPzGM46jVmOXiSRjPelakJxwBkvA== X-Received: by 2002:a63:1d25:: with SMTP id d37mr13372786pgd.52.1631583444607; Mon, 13 Sep 2021 18:37:24 -0700 (PDT) From: frank.chang@sifive.com To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH] target/riscv: Backup/restore mstatus.SD bit when virtual register swapped Date: Tue, 14 Sep 2021 09:37:15 +0800 Message-Id: <20210914013717.881430-1-frank.chang@sifive.com> X-Mailer: git-send-email 2.25.1 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::529; envelope-from=frank.chang@sifive.com; helo=mail-pg1-x529.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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Frank Chang , Vincent Chen , Alistair Francis , Bin Meng , Palmer Dabbelt Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1631583576252100004 Content-Type: text/plain; charset="utf-8" From: Frank Chang When virtual registers are swapped, mstatus.SD bit should also be backed up/restored. Otherwise, mstatus.SD bit will be incorrectly kept across the world switches. Signed-off-by: Frank Chang Reviewed-by: Vincent Chen Reviewed-by: Alistair Francis --- target/riscv/cpu_helper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c index 968cb8046f4..488867b59eb 100644 --- a/target/riscv/cpu_helper.c +++ b/target/riscv/cpu_helper.c @@ -111,9 +111,10 @@ bool riscv_cpu_fp_enabled(CPURISCVState *env) =20 void riscv_cpu_swap_hypervisor_regs(CPURISCVState *env) { + target_ulong sd =3D riscv_cpu_is_32bit(env) ? MSTATUS32_SD : MSTATUS64= _SD; uint64_t mstatus_mask =3D MSTATUS_MXR | MSTATUS_SUM | MSTATUS_FS | MSTATUS_SPP | MSTATUS_SPIE | MSTATUS_SIE | - MSTATUS64_UXL; + MSTATUS64_UXL | sd; bool current_virt =3D riscv_cpu_virt_enabled(env); =20 g_assert(riscv_has_ext(env, RVH)); --=20 2.25.1