From patchwork Mon Mar 20 10:58:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 9633769 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2E151601E9 for ; Mon, 20 Mar 2017 11:00:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 20A3127F17 for ; Mon, 20 Mar 2017 11:00:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1591227F9F; Mon, 20 Mar 2017 11:00:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A25A727F17 for ; Mon, 20 Mar 2017 11:00:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=xR+ubNLmg+0ESwj41cfBqi8Na98x8A6MOOwesfDoQpg=; b=S8zDVH2c3Vst1k+9FGD7Mt2alB bVGdSFKb6F8h6JIMegcZGScoBdC67DbUot3NPPGRefmpXOHvVEmS3LDn59keAkvzNAcTRp12ichyT H+PG/S7PLNzvNyiiboIR1cMavrcVv2NRgsYDiApidAc0e4NDp+PRkqLBsz8Frd0WMAe2sulih6gZe zzF2BY9kTc9SsJdtRTnhnjhy0wjZlRRy76wS1gTf9PF3VOMyT31UpnJ/uuGFjOMtymKAwMOmgmCvm EqrWdq8IFEnldn4QEf1fPM7hO7KXqlXyOBq2jrJccIHGCAzxtsqqUSSJOig8eZPiljV0lnnSsTJuc i9HR3Xbw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cpv2t-0000mj-OU; Mon, 20 Mar 2017 11:00:15 +0000 Received: from mail-wr0-x22c.google.com ([2a00:1450:400c:c0c::22c]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cpv1Y-00067N-Tu for linux-arm-kernel@lists.infradead.org; Mon, 20 Mar 2017 10:59:01 +0000 Received: by mail-wr0-x22c.google.com with SMTP id u48so89501517wrc.0 for ; Mon, 20 Mar 2017 03:58:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=MbIuwWJ8UiC77uc0KL3zpe1kWqf78aYjYA9twuis6aA=; b=cRaAlncWNv1nVaHjrF8z8hw2ONqvmNPmIFa3Dxh7kNBjt20PScCOnFSHFmIZloQhap 7SfS02SPsFODfYFkeDdDjSCMYoY6pSDlabIYdyRWvIJNXcmWWNozS9aXQpwNWDrymihP C7h5aAemNvM0znAerNlHkVpY4WRHqg5hhIy0g= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=MbIuwWJ8UiC77uc0KL3zpe1kWqf78aYjYA9twuis6aA=; b=fNWjtwZ5KyMOq7dsck7fDdRTfZao1LOFqqPpWCFy53w17ufyz10Ow9gfdTkN37yHQk OU9cZhiD4HUhSLXMD7JbPN0SSxf84O74hO173uT8znI57vK6rq2XBickWIaE2PmMkUMj hV2riPSXwkQ9Q3H3njLYhBg4qCDuAHohjpp84PbtlW/3t7498pdLFgZwCI9vhu6kqxdX Uj1iYmhjuUCZVBBxHCbDn9Cauz5y/++TQpErbf565lba04ALXequsxr9jxoy3C+qdP0E ZlaSb8C6D6dTys5Jcomo70+XiZFxnxCEYXaR2vHt/BsNov5X7/e2K1XHegEysoxSmKqq aXxw== X-Gm-Message-State: AFeK/H0YuoVTkmYvtaxxv+DHmG4Rg2jfCEsYgBH0zM0AGsN2lwdLjCTa8H3ON9b/SfPmJUOG X-Received: by 10.223.175.238 with SMTP id y46mr23544460wrd.63.1490007511128; Mon, 20 Mar 2017 03:58:31 -0700 (PDT) Received: from localhost.localdomain (xd93ddc2d.cust.hiper.dk. [217.61.220.45]) by smtp.gmail.com with ESMTPSA id q1sm10372065wra.65.2017.03.20.03.58.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 20 Mar 2017 03:58:30 -0700 (PDT) From: Christoffer Dall To: kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org Subject: [PATCH 6/9] KVM: arm/arm64: vgic: Get rid of MISR and EISR fields Date: Mon, 20 Mar 2017 11:58:15 +0100 Message-Id: <20170320105818.20481-7-cdall@linaro.org> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170320105818.20481-1-cdall@linaro.org> References: <20170320105818.20481-1-cdall@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170320_035854_690201_4144A077 X-CRM114-Status: GOOD ( 10.34 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marc Zyngier , Andre Przywara , Christoffer Dall , kvm@vger.kernel.org, Eric Auger MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Christoffer Dall We don't use these fields anymore so let's nuke them completely. Signed-off-by: Christoffer Dall Acked-by: Marc Zyngier --- include/kvm/arm_vgic.h | 4 ---- virt/kvm/arm/hyp/vgic-v2-sr.c | 2 -- virt/kvm/arm/hyp/vgic-v3-sr.c | 2 -- 3 files changed, 8 deletions(-) diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h index fa12d99..581a59e 100644 --- a/include/kvm/arm_vgic.h +++ b/include/kvm/arm_vgic.h @@ -225,8 +225,6 @@ struct vgic_dist { struct vgic_v2_cpu_if { u32 vgic_hcr; u32 vgic_vmcr; - u32 vgic_misr; /* Saved only */ - u64 vgic_eisr; /* Saved only */ u64 vgic_elrsr; /* Saved only */ u32 vgic_apr; u32 vgic_lr[VGIC_V2_MAX_LRS]; @@ -236,8 +234,6 @@ struct vgic_v3_cpu_if { u32 vgic_hcr; u32 vgic_vmcr; u32 vgic_sre; /* Restored only, change ignored */ - u32 vgic_misr; /* Saved only */ - u32 vgic_eisr; /* Saved only */ u32 vgic_elrsr; /* Saved only */ u32 vgic_ap0r[4]; u32 vgic_ap1r[4]; diff --git a/virt/kvm/arm/hyp/vgic-v2-sr.c b/virt/kvm/arm/hyp/vgic-v2-sr.c index a4c3bb0..a3f18d3 100644 --- a/virt/kvm/arm/hyp/vgic-v2-sr.c +++ b/virt/kvm/arm/hyp/vgic-v2-sr.c @@ -77,9 +77,7 @@ void __hyp_text __vgic_v2_save_state(struct kvm_vcpu *vcpu) writel_relaxed(0, base + GICH_HCR); } else { - cpu_if->vgic_eisr = 0; cpu_if->vgic_elrsr = ~0UL; - cpu_if->vgic_misr = 0; cpu_if->vgic_apr = 0; } } diff --git a/virt/kvm/arm/hyp/vgic-v3-sr.c b/virt/kvm/arm/hyp/vgic-v3-sr.c index 41bbbb0..3d0b1dd 100644 --- a/virt/kvm/arm/hyp/vgic-v3-sr.c +++ b/virt/kvm/arm/hyp/vgic-v3-sr.c @@ -170,8 +170,6 @@ void __hyp_text __vgic_v3_save_state(struct kvm_vcpu *vcpu) cpu_if->vgic_ap1r[0] = read_gicreg(ICH_AP1R0_EL2); } } else { - cpu_if->vgic_misr = 0; - cpu_if->vgic_eisr = 0; cpu_if->vgic_elrsr = 0xffff; cpu_if->vgic_ap0r[0] = 0; cpu_if->vgic_ap0r[1] = 0;