drop arm64 KVM patch requiring v4.9-rc1~172^2~22

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

2 files changed, 0 insertions, 74 deletions

diff --git a/queue/arm64-KVM-Fix-decoding-of-Rt-Rt2-when-trapping-AArch.patch b/queue/arm64-KVM-Fix-decoding-of-Rt-Rt2-when-trapping-AArch.patch
deleted file mode 100644
index 39435e6..0000000
--- a/queue/arm64-KVM-Fix-decoding-of-Rt-Rt2-when-trapping-AArch.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From a5d342c93497b30048e02a0ea03f8a98ae8c5f76 Mon Sep 17 00:00:00 2001
-From: Marc Zyngier <marc.zyngier@arm.com>
-Date: Thu, 27 Apr 2017 19:06:48 +0100
-Subject: [PATCH] arm64: KVM: Fix decoding of Rt/Rt2 when trapping AArch32 CP
- accesses
-
-commit c667186f1c01ca8970c785888868b7ffd74e51ee upstream.
-
-Our 32bit CP14/15 handling inherited some of the ARMv7 code for handling
-the trapped system registers, completely missing the fact that the
-fields for Rt and Rt2 are now 5 bit wide, and not 4...
-
-Let's fix it, and provide an accessor for the most common Rt case.
-
-Cc: stable@vger.kernel.org
-Reviewed-by: Christoffer Dall <cdall@linaro.org>
-Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
-Signed-off-by: Christoffer Dall <cdall@linaro.org>
-Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-
-diff --git a/arch/arm64/include/asm/kvm_emulate.h b/arch/arm64/include/asm/kvm_emulate.h
-index 948a9a8a9297..5cce45b6e5a6 100644
---- a/arch/arm64/include/asm/kvm_emulate.h
-+++ b/arch/arm64/include/asm/kvm_emulate.h
-@@ -229,6 +229,12 @@ static inline u8 kvm_vcpu_trap_get_fault_type(const struct kvm_vcpu *vcpu)
- 	return kvm_vcpu_get_hsr(vcpu) & ESR_ELx_FSC_TYPE;
- }
- 
-+static inline int kvm_vcpu_sys_get_rt(struct kvm_vcpu *vcpu)
-+{
-+	u32 esr = kvm_vcpu_get_hsr(vcpu);
-+	return (esr & ESR_ELx_SYS64_ISS_RT_MASK) >> ESR_ELx_SYS64_ISS_RT_SHIFT;
-+}
-+
- static inline unsigned long kvm_vcpu_get_mpidr_aff(struct kvm_vcpu *vcpu)
- {
- 	return vcpu_sys_reg(vcpu, MPIDR_EL1) & MPIDR_HWID_BITMASK;
-diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
-index 31c144f7339a..bc8a8921ee83 100644
---- a/arch/arm64/kvm/sys_regs.c
-+++ b/arch/arm64/kvm/sys_regs.c
-@@ -1578,8 +1578,8 @@ static int kvm_handle_cp_64(struct kvm_vcpu *vcpu,
- {
- 	struct sys_reg_params params;
- 	u32 hsr = kvm_vcpu_get_hsr(vcpu);
--	int Rt = (hsr >> 5) & 0xf;
--	int Rt2 = (hsr >> 10) & 0xf;
-+	int Rt = kvm_vcpu_sys_get_rt(vcpu);
-+	int Rt2 = (hsr >> 10) & 0x1f;
- 
- 	params.is_aarch32 = true;
- 	params.is_32bit = false;
-@@ -1630,7 +1630,7 @@ static int kvm_handle_cp_32(struct kvm_vcpu *vcpu,
- {
- 	struct sys_reg_params params;
- 	u32 hsr = kvm_vcpu_get_hsr(vcpu);
--	int Rt  = (hsr >> 5) & 0xf;
-+	int Rt  = kvm_vcpu_sys_get_rt(vcpu);
- 
- 	params.is_aarch32 = true;
- 	params.is_32bit = true;
-@@ -1745,7 +1745,7 @@ int kvm_handle_sys_reg(struct kvm_vcpu *vcpu, struct kvm_run *run)
- {
- 	struct sys_reg_params params;
- 	unsigned long esr = kvm_vcpu_get_hsr(vcpu);
--	int Rt = (esr >> 5) & 0x1f;
-+	int Rt = kvm_vcpu_sys_get_rt(vcpu);
- 	int ret;
- 
- 	trace_kvm_handle_sys_reg(esr);
--- 
-2.12.0
-
diff --git a/queue/series b/queue/series
index 020c57e..2eaed60 100644
--- a/queue/series
+++ b/queue/series
@@ -158,7 +158,6 @@ um-Fix-PTRACE_POKEUSER-on-x86_64.patch
 perf-x86-Fix-Broadwell-EP-DRAM-RAPL-events.patch
 KVM-x86-fix-user-triggerable-warning-in-kvm_apic_acc.patch
 KVM-arm-arm64-fix-races-in-kvm_psci_vcpu_on.patch
-arm64-KVM-Fix-decoding-of-Rt-Rt2-when-trapping-AArch.patch
 block-fix-blk_integrity_register-to-use-template-s-i.patch
 crypto-algif_aead-Require-setkey-before-accept-2.patch
 dm-era-save-spacemap-metadata-root-after-the-pre-com.patch