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: 9633749 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 A7968601E9 for ; Mon, 20 Mar 2017 10:59:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9AFD427F17 for ; Mon, 20 Mar 2017 10:59:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8FAA127F94; Mon, 20 Mar 2017 10:59:29 +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 1F25827F17 for ; Mon, 20 Mar 2017 10:59:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754030AbdCTK6s (ORCPT ); Mon, 20 Mar 2017 06:58:48 -0400 Received: from mail-wr0-f181.google.com ([209.85.128.181]:36397 "EHLO mail-wr0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753732AbdCTK6d (ORCPT ); Mon, 20 Mar 2017 06:58:33 -0400 Received: by mail-wr0-f181.google.com with SMTP id u108so89460006wrb.3 for ; Mon, 20 Mar 2017 03:58:31 -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=dkEPoziejqUXvWQD39laejFNnf2qgU8g4TuGm8htDTbIpajNUNE3bWFyT2Vi+AeFsy +BeKBhzCV0U8MPlrRLH4ktUHtCYGMVUtswWiCh1qTt88wGos6r+r0eIaX1GGOi8bdHOq HL7vecw3TxQ4kU414S3ZT0qED0x00LAIB6j9WR9DLg0PbIoU8BDkTjRg65c/0awswJQC Zw9cZO0VlMG9rWA0TIS/DH4lP7zo9gMuWmS7mjBOiVHGDDqLUpzHPNJGMFMBvPh20lPf /j6bXW13swdzTxGTtdi8hhLXdgDacVB7AySgl5gSPbWtwz8ut4slIrJtZaYJfLG3nGl5 bc5w== X-Gm-Message-State: AFeK/H3wf9/EYTA+7oJ6KkM8D0AJ4lHR0mx2OBHnoGCP1A2/KEXug1eh8qahB1VJkAr1Wm27 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 Cc: kvm@vger.kernel.org, Marc Zyngier , Andre Przywara , Eric Auger , Christoffer Dall 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> 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. 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;