diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-03 22:34:52 -0400 |
---|---|---|
committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-03 22:34:52 -0400 |
commit | a6cbc605fb894c284b89faa167ff66aedbd6d016 (patch) | |
tree | 1ec959a61d9c252313a2996b2fe33b0c63d79267 | |
parent | 9559758c7862b74bd81f7ec754c7be896f251772 (diff) | |
download | longterm-queue-4.12-a6cbc605fb894c284b89faa167ff66aedbd6d016.tar.gz |
arm: drop more KVM patches n/a for 4.12
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
4 files changed, 0 insertions, 116 deletions
diff --git a/queue/KVM-arm-arm64-Fix-broken-GICH_ELRSR-big-endian-conve.patch b/queue/KVM-arm-arm64-Fix-broken-GICH_ELRSR-big-endian-conve.patch deleted file mode 100644 index 85a6029..0000000 --- a/queue/KVM-arm-arm64-Fix-broken-GICH_ELRSR-big-endian-conve.patch +++ /dev/null @@ -1,36 +0,0 @@ -From fc396e066318c0a02208c1d3f0b62950a7714999 Mon Sep 17 00:00:00 2001 -From: Christoffer Dall <christoffer.dall@linaro.org> -Date: Sun, 3 Dec 2017 23:54:41 +0100 -Subject: [PATCH] KVM: arm/arm64: Fix broken GICH_ELRSR big endian conversion - -commit fc396e066318c0a02208c1d3f0b62950a7714999 upstream. - -We are incorrectly rearranging 32-bit words inside a 64-bit typed value -for big endian systems, which would result in never marking a virtual -interrupt as inactive on big endian systems (assuming 32 or fewer LRs on -the hardware). Fix this by not doing any word order manipulation for -the typed values. - -Cc: <stable@vger.kernel.org> -Acked-by: Christoffer Dall <christoffer.dall@linaro.org> -Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org> - -diff --git a/virt/kvm/arm/hyp/vgic-v2-sr.c b/virt/kvm/arm/hyp/vgic-v2-sr.c -index a3f18d362366..d7fd46fe9efb 100644 ---- a/virt/kvm/arm/hyp/vgic-v2-sr.c -+++ b/virt/kvm/arm/hyp/vgic-v2-sr.c -@@ -34,11 +34,7 @@ static void __hyp_text save_elrsr(struct kvm_vcpu *vcpu, void __iomem *base) - else - elrsr1 = 0; - --#ifdef CONFIG_CPU_BIG_ENDIAN -- cpu_if->vgic_elrsr = ((u64)elrsr0 << 32) | elrsr1; --#else - cpu_if->vgic_elrsr = ((u64)elrsr1 << 32) | elrsr0; --#endif - } - - static void __hyp_text save_lrs(struct kvm_vcpu *vcpu, void __iomem *base) --- -2.15.0 - diff --git a/queue/KVM-arm-arm64-vgic-Preserve-the-revious-read-from-th.patch b/queue/KVM-arm-arm64-vgic-Preserve-the-revious-read-from-th.patch deleted file mode 100644 index e1b32c5..0000000 --- a/queue/KVM-arm-arm64-vgic-Preserve-the-revious-read-from-th.patch +++ /dev/null @@ -1,44 +0,0 @@ -From ddb4b0102cb9cdd2398d98b3e1e024e08a2f4239 Mon Sep 17 00:00:00 2001 -From: Marc Zyngier <marc.zyngier@arm.com> -Date: Thu, 16 Nov 2017 17:58:16 +0000 -Subject: [PATCH] KVM: arm/arm64: vgic: Preserve the revious read from the - pending table - -commit ddb4b0102cb9cdd2398d98b3e1e024e08a2f4239 upstream. - -The current pending table parsing code assumes that we keep the -previous read of the pending bits, but keep that variable in -the current block, making sure it is discarded on each loop. - -We end-up using whatever is on the stack. Who knows, it might -just be the right thing... - -Fixes: 280771252c1ba ("KVM: arm64: vgic-v3: KVM_DEV_ARM_VGIC_SAVE_PENDING_TABLES") -Cc: stable@vger.kernel.org # 4.12 -Reported-by: AKASHI Takahiro <takahiro.akashi@linaro.org> -Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org> -Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> -Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org> - -diff --git a/virt/kvm/arm/vgic/vgic-v3.c b/virt/kvm/arm/vgic/vgic-v3.c -index 2f05f732d3fd..f47e8481fa45 100644 ---- a/virt/kvm/arm/vgic/vgic-v3.c -+++ b/virt/kvm/arm/vgic/vgic-v3.c -@@ -327,13 +327,13 @@ int vgic_v3_save_pending_tables(struct kvm *kvm) - int last_byte_offset = -1; - struct vgic_irq *irq; - int ret; -+ u8 val; - - list_for_each_entry(irq, &dist->lpi_list_head, lpi_list) { - int byte_offset, bit_nr; - struct kvm_vcpu *vcpu; - gpa_t pendbase, ptr; - bool stored; -- u8 val; - - vcpu = irq->target_vcpu; - if (!vcpu) --- -2.15.0 - diff --git a/queue/KVM-arm-arm64-vgic-its-Check-result-of-allocation-be.patch b/queue/KVM-arm-arm64-vgic-its-Check-result-of-allocation-be.patch deleted file mode 100644 index 2eea081..0000000 --- a/queue/KVM-arm-arm64-vgic-its-Check-result-of-allocation-be.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 686f294f2f1ae40705283dd413ca1e4c14f20f93 Mon Sep 17 00:00:00 2001 -From: Marc Zyngier <marc.zyngier@arm.com> -Date: Thu, 16 Nov 2017 17:58:18 +0000 -Subject: [PATCH] KVM: arm/arm64: vgic-its: Check result of allocation before - use - -commit 686f294f2f1ae40705283dd413ca1e4c14f20f93 upstream. - -We miss a test against NULL after allocation. - -Fixes: 6d03a68f8054 ("KVM: arm64: vgic-its: Turn device_id validation into generic ID validation") -Cc: stable@vger.kernel.org # 4.8 -Reported-by: AKASHI Takahiro <takahiro.akashi@linaro.org> -Acked-by: Christoffer Dall <christoffer.dall@linaro.org> -Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> -Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org> - -diff --git a/virt/kvm/arm/vgic/vgic-its.c b/virt/kvm/arm/vgic/vgic-its.c -index cb2d0a2dbe5a..8e633bd9cc1e 100644 ---- a/virt/kvm/arm/vgic/vgic-its.c -+++ b/virt/kvm/arm/vgic/vgic-its.c -@@ -821,6 +821,8 @@ static int vgic_its_alloc_collection(struct vgic_its *its, - return E_ITS_MAPC_COLLECTION_OOR; - - collection = kzalloc(sizeof(*collection), GFP_KERNEL); -+ if (!collection) -+ return -ENOMEM; - - collection->collection_id = coll_id; - collection->target_addr = COLLECTION_NOT_MAPPED; --- -2.15.0 - diff --git a/queue/series b/queue/series index deb7840..2ea0c86 100644 --- a/queue/series +++ b/queue/series @@ -51,9 +51,6 @@ kdb-Fix-handling-of-kallsyms_symbol_next-return-valu.patch drm-bridge-analogix-dp-Fix-runtime-PM-state-in-get_m.patch drm-exynos-gem-Drop-NONCONTIG-flag-for-buffers-alloc.patch media-dvb-i2c-transfers-over-usb-cannot-be-done-from.patch -KVM-arm-arm64-Fix-broken-GICH_ELRSR-big-endian-conve.patch -KVM-arm-arm64-vgic-Preserve-the-revious-read-from-th.patch -KVM-arm-arm64-vgic-its-Check-result-of-allocation-be.patch arm64-fpsimd-Prevent-registers-leaking-from-dead-tas.patch arm64-SW-PAN-Point-saved-ttbr0-at-the-zero-page-when.patch arm64-SW-PAN-Update-saved-ttbr0-value-on-enter_lazy_.patch |