From patchwork Sun Apr 23 17:08:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 9694943 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 72C3860245 for ; Sun, 23 Apr 2017 17:11:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5AC0526530 for ; Sun, 23 Apr 2017 17:11:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4E5BE265B9; Sun, 23 Apr 2017 17:11:08 +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=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D428826530 for ; Sun, 23 Apr 2017 17:11:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1162570AbdDWRLG (ORCPT ); Sun, 23 Apr 2017 13:11:06 -0400 Received: from mail-wm0-f44.google.com ([74.125.82.44]:36664 "EHLO mail-wm0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1162562AbdDWRKB (ORCPT ); Sun, 23 Apr 2017 13:10:01 -0400 Received: by mail-wm0-f44.google.com with SMTP id u65so7502367wmu.1 for ; Sun, 23 Apr 2017 10:10:01 -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=ZuE4J4l+G5LeqA4QeUCRbMvENfEfYLPBTQy+m3I606U=; b=bmpLrrXQXVRo+TgHCXKQk9UWuT7zHk36deVXiX/VzmXn874RJulaQq1LQZQhmVc8Ps OEtDCp6AULGCR2nnpG3STHciqpik5zjNDTiqeel9cWc0BUWxlCpn8W3hk8WL5uhVuFtW fJ9YthWWBDS7p4LGIf1Du0rSLVbHMrQhtgncQ= 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=ZuE4J4l+G5LeqA4QeUCRbMvENfEfYLPBTQy+m3I606U=; b=eFdXjm6iZL+goIx55sL0EBxtSZLBHbAN8pQh8h/1/V8uzJSieyFyclxDqbZWKQRqIQ 2HyPymCwFjhfEUL7K/qjREjelQ0yUha2Sufl9hpd2O5iPGRQjv2e3xM/Slgc4OeM/fk3 xOSk3+Tr8GN+AERRfoxXKUgjmA1d3LAr+Qn8NhMHdE9Y0+NQnhktP/7qdKpjN90g+N8N j9RkJXEOGl8DDLn76+ZY6OFCVCkNdlW2mLV64NS4Nc7rypD5Muvg/IEPMlcVmJXU3fSC zvf9SS5uMF2YfoC5y7o7Pr1dr77MQVPmUqYSZTfg2MOjS7ibAoCtPSy6ydw9GRAT/nl8 M+mw== X-Gm-Message-State: AN3rC/6Ccv0CtWGucQuJOImpOpWTwNWMTCH47pQORhdnwOFakNy7rHTk AnPnT+N613SsuADCVhhLGg== X-Received: by 10.80.142.93 with SMTP id 29mr134213edx.150.1492967395400; Sun, 23 Apr 2017 10:09:55 -0700 (PDT) Received: from localhost.localdomain (xd93ddc2d.cust.hiper.dk. [217.61.220.45]) by smtp.gmail.com with ESMTPSA id 58sm2803521edz.2.2017.04.23.10.09.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 23 Apr 2017 10:09:54 -0700 (PDT) From: Christoffer Dall To: Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= Cc: Marc Zyngier , kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Christoffer Dall Subject: [PULL 23/79] KVM: arm/arm64: vgic: Get rid of MISR and EISR fields Date: Sun, 23 Apr 2017 19:08:33 +0200 Message-Id: <20170423170929.27334-24-cdall@linaro.org> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170423170929.27334-1-cdall@linaro.org> References: <20170423170929.27334-1-cdall@linaro.org> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Christoffer Dall We don't use these fields anymore so let's nuke them completely. Acked-by: Marc Zyngier Signed-off-by: Christoffer Dall --- 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 ea940db..26ed4fb 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;