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: 9695171 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 2C4BD601E9 for ; Sun, 23 Apr 2017 17:34:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2B2BE209D8 for ; Sun, 23 Apr 2017 17:34:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1E9C2262F2; Sun, 23 Apr 2017 17:34:25 +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 8E1D6209D8 for ; Sun, 23 Apr 2017 17:34:24 +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=aOrThSWJ0Fpcs3oKmpvzB8onnDWlvkI0XQN+QSeXelM=; b=fPhMdc0+bQtsrDnDxmhAKm/X6e WVSFDDnWJCFYWzZb4JYttwAyv2nW7uBU48ORHubqhRIKXHZcYJXzk4oQN7lh6YZ4LGhyunG6GPGe0 IS1oblNnQ8h7KNmg7Z2q1K3quqhNIJtbLRNgTo3D8BKet1FHYy2Icbo189svF2PfC+kHzKKABRfE4 67FezhMkB0UA8JPfc8joLjggYdlqSCum04IskNx8NeUrUkLcKANSmPHHr9ZdrTzwR8GjQnlPYDZjz w8V313VhNtT4R92ulVCX65C6WMzTZnYZEA1KPLbq8ptjbgVh5eU40OOFxmUHkISJ5mURfXan5/kkJ gVkdyqlw==; 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 1d2LOx-0006fe-WA; Sun, 23 Apr 2017 17:34:24 +0000 Received: from merlin.infradead.org ([2001:4978:20e::2]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1d2LM4-0002ZO-T2 for linux-arm-kernel@bombadil.infradead.org; Sun, 23 Apr 2017 17:31:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=ZuE4J4l+G5LeqA4QeUCRbMvENfEfYLPBTQy+m3I606U=; b=jF32BvaZ95vYtpCvjjd1D4yZS b5Zjap5oafYCw9OF+0XsIyFR1Qxl+/Fewb+BbWH1D5D+7tha4g/4lfF1rBMnB0XERKQY21LLiKtaj HL//F7KALk+ySXiXdj3fgD7LBwxD+cIoavp1tVIcDP8xRhX/3slPWHFiTNq99hXHiF2I5u8CQ5jvK VRKXTqljbH6IzFgSpNmfc5xtl6ufvc+aQl24LsdfIgQeNB4UutQRY8b2nYsx8JZ4DXqmy7C8jmGk5 DAQjpePy6iO2kPOd8/5JXwW6bnYOUnMXsTDuaERbA6bJO6OycjFJTauI4FTQOJf4OiovJYiznb0e0 ZbzAs/luw==; Received: from mail-wm0-x234.google.com ([2a00:1450:400c:c09::234]) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1d2L3Z-0005LP-4p for linux-arm-kernel@lists.infradead.org; Sun, 23 Apr 2017 17:12:18 +0000 Received: by mail-wm0-x234.google.com with SMTP id u65so7502365wmu.1 for ; Sun, 23 Apr 2017 10:11:57 -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=btSrp1m8CD/bkMc3dWmHjoNvauYkWwbT+CGs4jsdkXOoJ8t7s/zxH1m1uY6HKBrucG GLJf7Eq9DlA+xeS1TfjqPh455gWcISK2rQ2Ab9lJUlEZAAjTME7QZCJ8ir42TYC+wTjE bsmbHO/iWs+rA/uXGs7cMVAA+3l1KnEM83yrY+Kgi4OrHg41U1d2ubCtMVeWxGA/onf9 tAWxWX2JrtblFEuug/O071PSnilpO1fXU8gKeV5hYduQvEEtSBh6gYlwauBjHZrkubfz cFUbandwb5FDr1eHeuxGEdTpUUuVpw/BI6PDVK0F83MpRzrZBylxorP0DC9NGXQ0OQ3o b6pA== X-Gm-Message-State: AN3rC/5XgXX0q5rnSz9ZHYNNeWzZPi+DJS43D4LDsjqWi4bkKnEEf6D6 scMS6xfNPskAMnzu 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?= 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170423_131217_350766_D9B87EC1 X-CRM114-Status: GOOD ( 10.08 ) 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 , Christoffer Dall , kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org 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. 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;