From patchwork Thu Jan 7 11:20:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Zyngier X-Patchwork-Id: 1423253 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=Ju3Pe3WK; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DBP2s4GM2z9sWC for ; Thu, 7 Jan 2021 22:22:13 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version: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:In-Reply-To:References:List-Owner; bh=vI1zGLMl0dZ/r4Ew00p7coyw9Ov9TufYQvXdbAOXwpA=; b=Ju3Pe3WKKEtghOLEOyuhl2VLVP 2wu57uYm2oWSHpXgDaNyLnK9Q2DV37wDKLl8dxkqdlhIWjIsu2GBXvp5pVjqs3w78Is+olmFcSzcS HjoITVfZ6lvYNE31SeXD85CaDpBVLhW467k3xyxB7tdH5Y+e06Ta4SrAt3JPiXWLfgxnczB4m/k7f j0VnJ1PCx7lDEm05FKO5ss8h3OVgyQKsRGNwxlIOkZN37x5iw9zwos2HP/RMzEr2SXtfvxHU/QFTr B+7gR0+46ize4MJzLP1UlYdpW8UkpAlAyubvTAznmKpVgWxM332U325eoN5775zzic26T3PRmR82Y 9/h6S0IQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kxTM3-0001g3-K1; Thu, 07 Jan 2021 11:21:23 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kxTLy-0001eh-Rf for linux-arm-kernel@lists.infradead.org; Thu, 07 Jan 2021 11:21:19 +0000 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 E3407221E9; Thu, 7 Jan 2021 11:21:17 +0000 (UTC) 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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94) (envelope-from ) id 1kxTLv-005p1o-Sg; Thu, 07 Jan 2021 11:21:16 +0000 From: Marc Zyngier To: Paolo Bonzini Subject: [GIT PULL] KVM/arm64 fixes for 5.11, take #1 Date: Thu, 7 Jan 2021 11:20:43 +0000 Message-Id: <20210107112101.2297944-1-maz@kernel.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-SA-Exim-Connect-IP: 62.31.163.78 X-SA-Exim-Rcpt-To: pbonzini@redhat.com, alexandru.elisei@arm.com, catalin.marinas@arm.com, dbrazdil@google.com, eric.auger@redhat.com, mark.rutland@arm.com, natechancellor@gmail.com, qcai@redhat.com, shannon.zhao@linux.alibaba.com, james.morse@arm.com, julien.thierry.kdev@gmail.com, suzuki.poulose@arm.com, kernel-team@android.com, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210107_062119_080813_74AD43BA X-CRM114-Status: GOOD ( 12.02 ) X-Spam-Score: -5.0 (-----) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-5.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at https://www.dnswl.org/, high trust [198.145.29.99 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , kernel-team@android.com, kvm@vger.kernel.org, Suzuki K Poulose , Qian Cai , Catalin Marinas , Shannon Zhao , Eric Auger , James Morse , linux-arm-kernel@lists.infradead.org, Nathan Chancellor , David Brazdil , Alexandru Elisei , kvmarm@lists.cs.columbia.edu, Julien Thierry Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org Hi Paolo, Happy New Year! Here's a first set of fixes for 5.11, most of which are just cleanups. I may have some more meaty stuff next week, but let's ease back into it as gently as possible... Please pull, M. The following changes since commit 3a514592b698588326924625b6948a10c35fadd5: Merge remote-tracking branch 'origin/kvm-arm64/psci-relay' into kvmarm-master/next (2020-12-09 10:00:24 +0000) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git tags/kvmarm-fixes-5.11-1 for you to fetch changes up to 45ba7b195a369f35cb39094fdb32efe5908b34ad: arm64: cpufeature: remove non-exist CONFIG_KVM_ARM_HOST (2021-01-05 13:22:07 +0000) ---------------------------------------------------------------- KVM/arm64 fixes for 5.11, take #1 - VM init cleanups - PSCI relay cleanups - Kill CONFIG_KVM_ARM_PMU - Fixup __init annotations - Fixup reg_to_encoding() - Fix spurious PMCR_EL0 access ---------------------------------------------------------------- Alexandru Elisei (5): KVM: Documentation: Add arm64 KVM_RUN error codes KVM: arm64: arch_timer: Remove VGIC initialization check KVM: arm64: Move double-checked lock to kvm_vgic_map_resources() KVM: arm64: Update comment in kvm_vgic_map_resources() KVM: arm64: Remove redundant call to kvm_pmu_vcpu_reset() David Brazdil (6): KVM: arm64: Prevent use of invalid PSCI v0.1 function IDs KVM: arm64: Use lm_alias in nVHE-only VA conversion KVM: arm64: Skip computing hyp VA layout for VHE KVM: arm64: Minor cleanup of hyp variables used in host KVM: arm64: Remove unused includes in psci-relay.c KVM: arm64: Move skip_host_instruction to adjust_pc.h Marc Zyngier (6): KVM: arm64: Don't access PMCR_EL0 when no PMU is available KVM: arm64: Declutter host PSCI 0.1 handling KVM: arm64: Consolidate dist->ready setting into kvm_vgic_map_resources() KVM: arm64: Fix hyp_cpu_pm_{init,exit} __init annotation KVM: arm64: Remove spurious semicolon in reg_to_encoding() KVM: arm64: Replace KVM_ARM_PMU with HW_PERF_EVENTS Shannon Zhao (1): arm64: cpufeature: remove non-exist CONFIG_KVM_ARM_HOST Documentation/virt/kvm/api.rst | 9 ++++- arch/arm64/include/asm/kvm_host.h | 23 ++++++++++++ arch/arm64/kernel/cpufeature.c | 2 +- arch/arm64/kernel/smp.c | 2 +- arch/arm64/kvm/Kconfig | 8 ---- arch/arm64/kvm/Makefile | 2 +- arch/arm64/kvm/arch_timer.c | 7 ++-- arch/arm64/kvm/arm.c | 32 +++++++++------- arch/arm64/kvm/hyp/include/hyp/adjust_pc.h | 9 +++++ arch/arm64/kvm/hyp/nvhe/hyp-main.c | 12 +----- arch/arm64/kvm/hyp/nvhe/hyp-smp.c | 6 +-- arch/arm64/kvm/hyp/nvhe/psci-relay.c | 59 +++++++++++------------------- arch/arm64/kvm/pmu-emul.c | 2 - arch/arm64/kvm/sys_regs.c | 6 ++- arch/arm64/kvm/va_layout.c | 7 ++-- arch/arm64/kvm/vgic/vgic-init.c | 11 +++++- arch/arm64/kvm/vgic/vgic-v2.c | 20 +++------- arch/arm64/kvm/vgic/vgic-v3.c | 21 +++-------- include/kvm/arm_pmu.h | 2 +- 19 files changed, 122 insertions(+), 118 deletions(-)