From patchwork Tue Oct 31 18:48:20 2023
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Oliver Upton <oliver.upton@linux.dev>
X-Patchwork-Id: 13442174
Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net
 [23.128.96.19])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 42513208B2
	for <kvm@vger.kernel.org>; Tue, 31 Oct 2023 18:48:32 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev
 header.b="xEhJ4no/"
Received: from out-178.mta1.migadu.com (out-178.mta1.migadu.com
 [IPv6:2001:41d0:203:375::b2])
	by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E66D1A6
	for <kvm@vger.kernel.org>; Tue, 31 Oct 2023 11:48:29 -0700 (PDT)
Date: Tue, 31 Oct 2023 11:48:20 -0700
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1;
	t=1698778107;
	h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
	 to:to:cc:cc:mime-version:mime-version:content-type:content-type;
	bh=F52dpzxQTPPk/FaCOWtBXUXkQp0gcrrYXYChduY6NvI=;
	b=xEhJ4no/xpHh1E7x2rGc8KVPqJqNHC6p7lvG5dtQyHFojFjOa9ZofLU38I7re2nFTkvtmI
	Y8ISoiSYMTcQQIv+Z3hLLxKtJxVW644xrIuc8mooSVaOgbhGWUYQb+Z4Ew2r0LuLJO+xZG
	ndXNu4y5qGLPrK7ggHCBM1EBztK4Yvg=
X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and
 include these headers.
From: Oliver Upton <oliver.upton@linux.dev>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: kvm@vger.kernel.org, kvmarm@lists.linux.dev,
	Marc Zyngier <maz@kernel.org>, James Morse <james.morse@arm.com>,
	Suzuki K Poulose <suzuki.poulose@arm.com>,
	Zenghui Yu <yuzenghui@huawei.com>,
	linux-arm-kernel@lists.infradead.org,
	Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will@kernel.org>, Jing Zhang <jingzhangos@google.com>,
	Raghavendra Rao Ananta <rananta@google.com>,
	Vincent Donnefort <vdonnefort@google.com>,
	Kristina Martsenko <kristina.martsenko@arm.com>,
	Miguel Luis <miguel.luis@oracle.com>
Subject: [GIT PULL] KVM/arm64 updates for 6.7
Message-ID: <ZUFL9AUV36xHGaBE@thinky-boi>
Precedence: bulk
X-Mailing-List: kvm@vger.kernel.org
List-Id: <kvm.vger.kernel.org>
List-Subscribe: <mailto:kvm+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:kvm+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Disposition: inline
X-Migadu-Flow: FLOW_OUT

Hi Paolo,

Here's the pile of KVM/arm64 changes for 6.7.

Almost all of these changes have been baking in -next for a while, although
I did need to rebase to back out a broken change last minute.

I'm only aware of a single (trivial) conflict with the arm64 tree resulting
from a moved cpucap check, resolution below.

Please pull.

diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
index 49ce32d3d6f7..e5f75f1f1085 100644
--- a/arch/arm64/kvm/arm.c
+++ b/arch/arm64/kvm/arm.c
@@ -1298,12 +1298,6 @@ static int kvm_vcpu_init_check_features(struct kvm_vcpu *vcpu,
 	if (!test_bit(KVM_ARM_VCPU_EL1_32BIT, &features))
 		return 0;
 
-<<<<<<< HEAD
-=======
-	if (!cpus_have_final_cap(ARM64_HAS_32BIT_EL1))
-		return -EINVAL;
-
->>>>>>> arm64-upstream
 	/* MTE is incompatible with AArch32 */
 	if (kvm_has_mte(vcpu->kvm))
 		return -EINVAL;