From patchwork Tue Mar 3 00:48:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Palmer Dabbelt X-Patchwork-Id: 11416961 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4FB7F930 for ; Tue, 3 Mar 2020 00:56:16 +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 26B8C21D56 for ; Tue, 3 Mar 2020 00:56:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Q9sgsuvs" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 26B8C21D56 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:40392 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8vr5-0006Gd-Cc for patchwork-qemu-devel@patchwork.kernel.org; Mon, 02 Mar 2020 19:56:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45098) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8vkX-0001h0-4j for qemu-devel@nongnu.org; Mon, 02 Mar 2020 19:49:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j8vkW-0004KD-7K for qemu-devel@nongnu.org; Mon, 02 Mar 2020 19:49:29 -0500 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]:38709) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j8vkW-0004Ju-0x for qemu-devel@nongnu.org; Mon, 02 Mar 2020 19:49:28 -0500 Received: by mail-pf1-x442.google.com with SMTP id q9so559790pfs.5 for ; Mon, 02 Mar 2020 16:49:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding:cc:from:to; bh=hAAUR4dPAibd3SLsn6SGvmO9nmVlprmLnfKwBIyEUvk=; b=Q9sgsuvsl/4kVFQPDMPcDftXCgps2OBKUq789Sq3kMydY011cxlJ7Yz6pRZ6Cimodu 933e0SlLml+ZGniORT/d63cg3aNKkiCBf+QAt1bAF3WLdUc8vy4IpAklbYzD7XXvaFsV KooD4zLYuTmszpsUO26YJa+mnrHrpQCyaAwvaydzniXvb/qWawhZmGatspootpRAyLuj EDRTdDwHNQNJZ7zVmHdI49C95wzVcvG08rkO8/09mxL1zdN2GrfXzy1rGfdTd+k3Nbwa mc0TauyHSfHPYC21Tq61YxBy0rfgUfXensnBfuTnb+7hdCIU61k7ZSYtRsQFG7Bgm3d3 iM7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding:cc:from:to; bh=hAAUR4dPAibd3SLsn6SGvmO9nmVlprmLnfKwBIyEUvk=; b=Qv6OVzv65vSAo57R2wo2IeI6AMYoZY/GlwQR7rZhh3MW32GHM86+JKRycP6R8vBBXk dnZRp1tB866lRgy/cvRv7WiZxjYZxqzSKowIX8Fu9qdRp7XyOI/62GPjmK9DhaKmX3wK Cv9otPm9dH8mr1ZdtgRlYNjFOxQzAQdZPhgHqg08LFAHDtU9ISlsRFfxqsnP+2sfMaPc UKzkRfwnxk79ke0NwUBDR3X/neZ3+UV4kaS/1OANpSuopf/gfdjZjucrss8/LegYq7iB HPH/R3Pih0zrBvRR4SP8UE+KM1fWa8lNg4DIEJC20e+uoUpKl8tTnkpyVkornhZqpkVD t2tw== X-Gm-Message-State: ANhLgQ0er7OlYXcYzmxT0W/92KWNX/f6mNgPyYgbmfmk63OuuMTuR1yy ININ+k9AiJYqqanT5OLFjIj+Yg== X-Google-Smtp-Source: ADFU+vtCS5lc6yNToqSUIQYdAekktJUtyfWM1uKzM7yXWm1CUsqjgVBAJKAoqIGcKWLHnsBQizRd8A== X-Received: by 2002:a63:c811:: with SMTP id z17mr1490798pgg.41.1583196566962; Mon, 02 Mar 2020 16:49:26 -0800 (PST) Received: from localhost ([2620:0:1000:2514:23a5:d584:6a92:3e3c]) by smtp.gmail.com with ESMTPSA id r8sm102234pjo.22.2020.03.02.16.49.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Mar 2020 16:49:26 -0800 (PST) Subject: [PULL 17/38] target/riscv: Extend the SIP CSR to support virtulisation Date: Mon, 2 Mar 2020 16:48:27 -0800 Message-Id: <20200303004848.136788-18-palmerdabbelt@google.com> X-Mailer: git-send-email 2.25.0.265.gbab2e86ba0-goog In-Reply-To: <20200303004848.136788-1-palmerdabbelt@google.com> References: <20200303004848.136788-1-palmerdabbelt@google.com> MIME-Version: 1.0 Cc: qemu-riscv@nongnu.org, qemu-devel@nongnu.org, Alistair Francis , Palmer Dabbelt From: Palmer Dabbelt To: Peter Maydell X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::442 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: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Alistair Francis Signed-off-by: Alistair Francis Reviewed-by: Palmer Dabbelt Signed-off-by: Palmer Dabbelt --- target/riscv/csr.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/target/riscv/csr.c b/target/riscv/csr.c index 918678789a..2e6700bbeb 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -743,8 +743,19 @@ static int write_sbadaddr(CPURISCVState *env, int csrno, target_ulong val) static int rmw_sip(CPURISCVState *env, int csrno, target_ulong *ret_value, target_ulong new_value, target_ulong write_mask) { - int ret = rmw_mip(env, CSR_MSTATUS, ret_value, new_value, + int ret; + + if (riscv_cpu_virt_enabled(env)) { + /* Shift the new values to line up with the VS bits */ + ret = rmw_mip(env, CSR_MSTATUS, ret_value, new_value << 1, + (write_mask & sip_writable_mask) << 1 & env->mideleg); + ret &= vsip_writable_mask; + ret >>= 1; + } else { + ret = rmw_mip(env, CSR_MSTATUS, ret_value, new_value, write_mask & env->mideleg & sip_writable_mask); + } + *ret_value &= env->mideleg; return ret; }