Message ID | 20200320182406.23465-23-maz@kernel.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <SRS0=CcrQ=5F=vger.kernel.org=kvm-owner@kernel.org> 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 E21361864 for <patchwork-kvm@patchwork.kernel.org>; Fri, 20 Mar 2020 18:51:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C05F820789 for <patchwork-kvm@patchwork.kernel.org>; Fri, 20 Mar 2020 18:51:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584730295; bh=4pBENODxr3ANhTe0H16WnjlHGQ38VhljFhn884C7S+g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=1cOOX+mDR7DcnVstRRVpF9DV+M15jprJYiI4NdF8/LIJSIgurtspo4mEVAZCMNvdB V/s2nrwNWZuBtKZ44qLlu5p7c3POTuHQdLLtef4+//6Ppy/goGhwXeZrIXJdn7W6jx FbxL6XrjjFOqBhx+m1D8M+sYGslqnHhQUcCHPkHQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727544AbgCTSv0 (ORCPT <rfc822;patchwork-kvm@patchwork.kernel.org>); Fri, 20 Mar 2020 14:51:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:45600 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727529AbgCTSv0 (ORCPT <rfc822;kvm@vger.kernel.org>); Fri, 20 Mar 2020 14:51:26 -0400 Received: from disco-boy.misterjones.org (disco-boy.misterjones.org [51.254.78.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 385E1207FC; Fri, 20 Mar 2020 18:51:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584730285; bh=4pBENODxr3ANhTe0H16WnjlHGQ38VhljFhn884C7S+g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nXUlz9o0dMUdqDcVuWyZfr+H+B0Q2R47vwpRon4PRCaxxuqf76l1HvTRx0IoNPW47 SsuM+n5Q6ISTZKhUPwvkaKscaxgMwf6h8xWGAw2ClI2RfBVz7mHnCmZU1y81hZx5ps 4n/juaJY9H6VsdfmB9DOse1l99vEnHIZbyIDbKt0= Received: from 78.163-31-62.static.virginmediabusiness.co.uk ([62.31.163.78] helo=why.lan) by disco-boy.misterjones.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from <maz@kernel.org>) id 1jFMKB-00EKAx-LV; Fri, 20 Mar 2020 18:24:51 +0000 From: Marc Zyngier <maz@kernel.org> To: linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>, Jason Cooper <jason@lakedaemon.net>, Thomas Gleixner <tglx@linutronix.de>, Zenghui Yu <yuzenghui@huawei.com>, Eric Auger <eric.auger@redhat.com>, James Morse <james.morse@arm.com>, Julien Thierry <julien.thierry.kdev@gmail.com>, Suzuki K Poulose <suzuki.poulose@arm.com> Subject: [PATCH v6 22/23] KVM: arm64: GICv4.1: Allow non-trapping WFI when using HW SGIs Date: Fri, 20 Mar 2020 18:24:05 +0000 Message-Id: <20200320182406.23465-23-maz@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200320182406.23465-1-maz@kernel.org> References: <20200320182406.23465-1-maz@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 62.31.163.78 X-SA-Exim-Rcpt-To: linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, lorenzo.pieralisi@arm.com, jason@lakedaemon.net, tglx@linutronix.de, yuzenghui@huawei.com, eric.auger@redhat.com, james.morse@arm.com, julien.thierry.kdev@gmail.com, suzuki.poulose@arm.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: <kvm.vger.kernel.org> X-Mailing-List: kvm@vger.kernel.org |
Series |
irqchip/gic-v4: GICv4.1 architecture support
|
expand
|
diff --git a/arch/arm64/include/asm/kvm_emulate.h b/arch/arm64/include/asm/kvm_emulate.h index f658dda12364..a30b4eec7cb4 100644 --- a/arch/arm64/include/asm/kvm_emulate.h +++ b/arch/arm64/include/asm/kvm_emulate.h @@ -89,7 +89,8 @@ static inline unsigned long *vcpu_hcr(struct kvm_vcpu *vcpu) static inline void vcpu_clear_wfx_traps(struct kvm_vcpu *vcpu) { vcpu->arch.hcr_el2 &= ~HCR_TWE; - if (atomic_read(&vcpu->arch.vgic_cpu.vgic_v3.its_vpe.vlpi_count)) + if (atomic_read(&vcpu->arch.vgic_cpu.vgic_v3.its_vpe.vlpi_count) || + vcpu->kvm->arch.vgic.nassgireq) vcpu->arch.hcr_el2 &= ~HCR_TWI; else vcpu->arch.hcr_el2 |= HCR_TWI;