Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Suchanek <msuchanek@suse.de>2018-10-31 13:27:38 +0100
committerMichal Suchanek <msuchanek@suse.de>2018-10-31 23:28:43 +0100
commit3b76f4a63266a541ee91f2de87e15573a48affad (patch)
treedfa69172e8ba9eb69bc56abdbe913d3d57feeef8
parent767c61224e4ea1ed852e2924ae7ca58eb0261561 (diff)
KVM: PPC: Book3S HV: Fix constant size warning (bsc#1061840).
-rw-r--r--patches.arch/KVM-PPC-Book3S-HV-Fix-constant-size-warning.patch63
-rw-r--r--series.conf1
2 files changed, 64 insertions, 0 deletions
diff --git a/patches.arch/KVM-PPC-Book3S-HV-Fix-constant-size-warning.patch b/patches.arch/KVM-PPC-Book3S-HV-Fix-constant-size-warning.patch
new file mode 100644
index 0000000000..a73a1218e5
--- /dev/null
+++ b/patches.arch/KVM-PPC-Book3S-HV-Fix-constant-size-warning.patch
@@ -0,0 +1,63 @@
+From 0abb75b7a16d21e2fb0d98634df44c37c184f186 Mon Sep 17 00:00:00 2001
+From: Nicholas Mc Guire <hofrat@osadl.org>
+Date: Sat, 7 Jul 2018 11:07:25 +0200
+Subject: [PATCH] KVM: PPC: Book3S HV: Fix constant size warning
+
+References: bsc#1061840
+Patch-mainline: v4.19-rc1
+Git-commit: 0abb75b7a16d21e2fb0d98634df44c37c184f186
+
+The constants are 64bit but not explicitly declared UL resulting
+in sparse warnings. Fix this by declaring the constants UL.
+
+Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
+Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
+Acked-by: Michal Suchanek <msuchanek@suse.de>
+---
+ arch/powerpc/include/asm/reg.h | 2 +-
+ arch/powerpc/kvm/book3s_hv.c | 16 ++++++++--------
+ 2 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
+index 562568414cf4..858aa7984ab0 100644
+--- a/arch/powerpc/include/asm/reg.h
++++ b/arch/powerpc/include/asm/reg.h
+@@ -161,7 +161,7 @@
+ #define PSSCR_ESL 0x00200000 /* Enable State Loss */
+ #define PSSCR_SD 0x00400000 /* Status Disable */
+ #define PSSCR_PLS 0xf000000000000000 /* Power-saving Level Status */
+-#define PSSCR_GUEST_VIS 0xf0000000000003ff /* Guest-visible PSSCR fields */
++#define PSSCR_GUEST_VIS 0xf0000000000003ffUL /* Guest-visible PSSCR fields */
+ #define PSSCR_FAKE_SUSPEND 0x00000400 /* Fake-suspend bit (P9 DD2.2) */
+ #define PSSCR_FAKE_SUSPEND_LG 10 /* Fake-suspend bit position */
+
+diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
+index fba21c91b2ff..d73b29b6aaa1 100644
+--- a/arch/powerpc/kvm/book3s_hv.c
++++ b/arch/powerpc/kvm/book3s_hv.c
+@@ -128,14 +128,14 @@ static int kvmppc_hv_setup_htab_rma(struct kvm_vcpu *vcpu);
+ * and SPURR count and should be set according to the number of
+ * online threads in the vcore being run.
+ */
+-#define RWMR_RPA_P8_1THREAD 0x164520C62609AECA
+-#define RWMR_RPA_P8_2THREAD 0x7FFF2908450D8DA9
+-#define RWMR_RPA_P8_3THREAD 0x164520C62609AECA
+-#define RWMR_RPA_P8_4THREAD 0x199A421245058DA9
+-#define RWMR_RPA_P8_5THREAD 0x164520C62609AECA
+-#define RWMR_RPA_P8_6THREAD 0x164520C62609AECA
+-#define RWMR_RPA_P8_7THREAD 0x164520C62609AECA
+-#define RWMR_RPA_P8_8THREAD 0x164520C62609AECA
++#define RWMR_RPA_P8_1THREAD 0x164520C62609AECAUL
++#define RWMR_RPA_P8_2THREAD 0x7FFF2908450D8DA9UL
++#define RWMR_RPA_P8_3THREAD 0x164520C62609AECAUL
++#define RWMR_RPA_P8_4THREAD 0x199A421245058DA9UL
++#define RWMR_RPA_P8_5THREAD 0x164520C62609AECAUL
++#define RWMR_RPA_P8_6THREAD 0x164520C62609AECAUL
++#define RWMR_RPA_P8_7THREAD 0x164520C62609AECAUL
++#define RWMR_RPA_P8_8THREAD 0x164520C62609AECAUL
+
+ static unsigned long p8_rwmr_values[MAX_SMT_THREADS + 1] = {
+ RWMR_RPA_P8_1THREAD,
+--
+2.13.7
+
diff --git a/series.conf b/series.conf
index 08a525471a..b25239dd0b 100644
--- a/series.conf
+++ b/series.conf
@@ -17780,6 +17780,7 @@
patches.drivers/Input-atmel_mxt_ts-only-use-first-T9-instance.patch
patches.arch/KVM-PPC-Book3S-Fix-matching-of-hardware-and-emulated.patch
patches.arch/KVM-PPC-Book3S-HV-Add-of_node_put-in-success-path.patch
+ patches.arch/KVM-PPC-Book3S-HV-Fix-constant-size-warning.patch
patches.fixes/kvm-s390-add-etoken-support-for-guests.patch
patches.arch/kvm-nvmx-fix-fault-vector-for-vmx-operation-at-cpl-0
patches.arch/kvm-vmx-track-host_state-loaded-using-a-loaded_vmcs-pointer