From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2FA1FC3A5A2 for ; Fri, 23 Aug 2019 23:56:17 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id EF7C420674 for ; Fri, 23 Aug 2019 23:56:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b="iB099Dht" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EF7C420674 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:35124 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i1JPj-0006cG-Kw for qemu-devel@archiver.kernel.org; Fri, 23 Aug 2019 19:56:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49652) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i1JC9-0000ye-9V for qemu-devel@nongnu.org; Fri, 23 Aug 2019 19:42:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i1JC8-0000Ef-9Y for qemu-devel@nongnu.org; Fri, 23 Aug 2019 19:42:13 -0400 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:30783) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i1JC8-0000Dt-0g; Fri, 23 Aug 2019 19:42:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1566603774; x=1598139774; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ExO6CmSXFUcMYCNVROhGdWjTm1HudMDa7YW2yf4a/Q8=; b=iB099DhtaAwGA330D4FLyyCJRdGYlTuIS+1IWrvkIHz2cXS0qjCkwdGA acWKYsThN4HpTu2xmtDzrUfl9B4VFggbKH2FK0QkZ/56OZxmoIFFmtfTK g3zwgxHAy/+UwFFu5OvFt6W1F/mI26288JQLJjtbrMw4TmK+YdaUbg2h/ Et9pNKXeHyw0+HiLzYq0UVq8BFX4v87etymqDHk4LM1btqzyeidKKkI0n mBLKfqqWouhGYrYnEApR78nELSapqqM5q/ur9dRkM/uAUzOj0rXSZbVy7 qZw3Hy27aVEO19zU5uNmHmQbycX2JHCFRGrldr2NK4DSeTnVWVhztSrHN A==; IronPort-SDR: MP1b4MEVAqg2vmxOfpJCeAISTPYLtQT+iqIv3yT8YqVj8nrIZU/l0Xm4p1x3kVW180EI98Dqrv HVOTe9DbX0gCMSfsty4NP+iYHoa/CCv/4QkWO9PBKvnj0LLECAk4E0D88HEnr1fwoVffFrbBAT o2z8BlFen+/55R+SOH1En8Zhpmeit6fsuzPFx/sO8M7NDu+J3MmUOK0njKFPeedzb69MvVTIrc E2DJ01+5Vlvw+5d6uC4E6A45rsM8nKZYd9R/U5OMqSNCD+6mcjgujItZCsvO0f8hLRhhfct6dW zY4= X-IronPort-AV: E=Sophos;i="5.64,422,1559491200"; d="scan'208";a="217013903" Received: from h199-255-45-15.hgst.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 24 Aug 2019 07:42:50 +0800 IronPort-SDR: HlP922HmFfO/AlVsSrEbdojUyZr12AKJuy6Asp1Gd6YgY1kLjCNUBNl9yXIp3zg2qklgYHPJAF ModLJRApLFsGlkQEHcEqrjJQrXvhIa73zeK8mDp4w+W/Rexmu5Bb3Z8W7aGE1zdVtWYVoU+Tg8 YL+UI65HfRBEUfpFdsbU7qJ6WWACRwIySZsVJgBUgFR/jbCVAfK1mXCPgFLhaDLs41/tsoJc9v sFpyx0ETIPTKRX2yTTx+jUrBOdPsqJeO82YUUokm4+E4R8wYb6A87dzyf5IG3ofaOoO/a1LrH1 xJBSE2lJpK6vaCRpPL6ed/wG Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Aug 2019 16:39:26 -0700 IronPort-SDR: 3InY7wHPz+FSqXd0aNwyQbE7Yoej8RrFJTUigQqQ2RC3nFTzlgetjxw/vZhJDF9ScoepPPtNWj CSOV/CAWt3kn2O4k8Y0pW56o5VJVSNCoSVvPXLFbWEvJQSU/ZlJzrCuyXS+mp2w6aALXeGc3je JYVsPACB82qZIuNXHevDJszPfjmGxG/s9/evt2rsGinrhNDx9zDqQiluH/NkXrddgOTzXW3NAr UGgH8ykEBhCEcgvU+6D21JDuz0vf/qqasAJ0W8/c5VQqJ9xdWe96WIO+eoOWvevP8rgJJKFzbi 8Pk= WDCIronportException: Internal Received: from risc6-mainframe.sdcorp.global.sandisk.com (HELO risc6-mainframe.int.fusionio.com) ([10.196.157.58]) by uls-op-cesaip02.wdc.com with ESMTP; 23 Aug 2019 16:42:09 -0700 From: Alistair Francis To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Date: Fri, 23 Aug 2019 16:38:29 -0700 Message-Id: <2b2e042b3c80d4f37cf150853a0a040581feb403.1566603412.git.alistair.francis@wdc.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x X-Received-From: 68.232.143.124 Subject: [Qemu-devel] [PATCH v1 15/28] riscv: plic: Always set sip.SEIP bit for HS 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: alistair23@gmail.com, Anup.Patel@wdc.com, palmer@sifive.com, alistair.francis@wdc.com, Atish.Patra@wdc.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Archived-At: List-Archive: When the PLIC generates an interrupt ensure we always set it for the SIP CSR that corresponds to the HS (V=0) register. Signed-off-by: Alistair Francis --- hw/riscv/sifive_plic.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/hw/riscv/sifive_plic.c b/hw/riscv/sifive_plic.c index 98e4304b66..8309e96f64 100644 --- a/hw/riscv/sifive_plic.c +++ b/hw/riscv/sifive_plic.c @@ -150,7 +150,17 @@ static void sifive_plic_update(SiFivePLICState *plic) riscv_cpu_update_mip(RISCV_CPU(cpu), MIP_MEIP, BOOL_TO_MASK(level)); break; case PLICMode_S: - riscv_cpu_update_mip(RISCV_CPU(cpu), MIP_SEIP, BOOL_TO_MASK(level)); + if (riscv_cpu_virt_enabled(env)) { + if (level) { + atomic_or(&env->mip_novirt, MIP_SEIP); + g_assert(riscv_cpu_virt_enabled(env)); + } else { + atomic_and(&env->mip_novirt, ~MIP_SEIP); + g_assert(riscv_cpu_virt_enabled(env)); + } + } else { + riscv_cpu_update_mip(RISCV_CPU(cpu), MIP_SEIP, BOOL_TO_MASK(level)); + } break; default: break; -- 2.22.0