Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Suchanek <msuchanek@suse.de>2018-10-31 12:36:54 +0100
committerMichal Suchanek <msuchanek@suse.de>2018-10-31 23:28:38 +0100
commit895afc0938a1c248b401ba90e73aa6fb9d91deb2 (patch)
tree7bcaca7cda79c19baacb780f85566f1369a9f3ab
parent6a01346d5a8d42d1289794033b3bbd7aa258410d (diff)
powerpc/kvm/booke: Fix altivec related build break
(bsc#1061840).
-rw-r--r--patches.arch/powerpc-kvm-booke-Fix-altivec-related-build-break.patch44
-rw-r--r--series.conf1
2 files changed, 45 insertions, 0 deletions
diff --git a/patches.arch/powerpc-kvm-booke-Fix-altivec-related-build-break.patch b/patches.arch/powerpc-kvm-booke-Fix-altivec-related-build-break.patch
new file mode 100644
index 0000000000..c9d818debf
--- /dev/null
+++ b/patches.arch/powerpc-kvm-booke-Fix-altivec-related-build-break.patch
@@ -0,0 +1,44 @@
+From b2d7ecbe355698010a6b7a15eb179e09eb3d6a34 Mon Sep 17 00:00:00 2001
+From: Laurentiu Tudor <laurentiu.tudor@nxp.com>
+Date: Thu, 26 Apr 2018 15:33:19 +0300
+Subject: [PATCH] powerpc/kvm/booke: Fix altivec related build break
+
+References: bsc#1061840
+Patch-mainline: v4.17-rc3
+Git-commit: b2d7ecbe355698010a6b7a15eb179e09eb3d6a34
+
+Add missing "altivec unavailable" interrupt injection helper
+thus fixing the linker error below:
+
+ arch/powerpc/kvm/emulate_loadstore.o: In function `kvmppc_check_altivec_disabled':
+ arch/powerpc/kvm/emulate_loadstore.c: undefined reference to `.kvmppc_core_queue_vec_unavail'
+
+Fixes: 09f984961c137c4b ("KVM: PPC: Book3S: Add MMIO emulation for VMX instructions")
+Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
+Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+Acked-by: Michal Suchanek <msuchanek@suse.de>
+---
+ arch/powerpc/kvm/booke.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c
+index 6038e2e7aee0..876d4f294fdd 100644
+--- a/arch/powerpc/kvm/booke.c
++++ b/arch/powerpc/kvm/booke.c
+@@ -305,6 +305,13 @@ void kvmppc_core_queue_fpunavail(struct kvm_vcpu *vcpu)
+ kvmppc_booke_queue_irqprio(vcpu, BOOKE_IRQPRIO_FP_UNAVAIL);
+ }
+
++#ifdef CONFIG_ALTIVEC
++void kvmppc_core_queue_vec_unavail(struct kvm_vcpu *vcpu)
++{
++ kvmppc_booke_queue_irqprio(vcpu, BOOKE_IRQPRIO_ALTIVEC_UNAVAIL);
++}
++#endif
++
+ void kvmppc_core_queue_dec(struct kvm_vcpu *vcpu)
+ {
+ kvmppc_booke_queue_irqprio(vcpu, BOOKE_IRQPRIO_DECREMENTER);
+--
+2.13.7
+
diff --git a/series.conf b/series.conf
index 339c43155d..ee0d19485a 100644
--- a/series.conf
+++ b/series.conf
@@ -15349,6 +15349,7 @@
patches.fixes/libceph-validate-con-state-at-the-top-of-try_write.patch
patches.arch/powerpc-powernv-npu-Do-a-PID-GPU-TLB-flush-when-inva.patch
patches.fixes/cpufreq-powernv-Fix-hardlockup-due-to-synchronous-sm.patch
+ patches.arch/powerpc-kvm-booke-Fix-altivec-related-build-break.patch
patches.drivers/crypto-drbg-set-freed-buffers-to-NULL
patches.fixes/ext4-prevent-right-shifting-extents-beyond-EXT_MAX_B.patch
patches.fixes/ext4-set-h_journal-if-there-is-a-failure-starting-a-.patch