1 files changed, 14 insertions, 11 deletions

diff --git a/arch/s390/kvm/kvm-s390.h b/arch/s390/kvm/kvm-s390.h
index 3e05deff21b6..4d89d64a8161 100644
--- a/arch/s390/kvm/kvm-s390.h
+++ b/arch/s390/kvm/kvm-s390.h
@@ -67,8 +67,8 @@ static inline void kvm_s390_set_prefix(struct kvm_vcpu *vcpu, u32 prefix)
 
 static inline u64 kvm_s390_get_base_disp_s(struct kvm_vcpu *vcpu)
 {
-        int base2 = vcpu->arch.sie_block->ipb >> 28;
-        int disp2 = ((vcpu->arch.sie_block->ipb & 0x0fff0000) >> 16);
+        u32 base2 = vcpu->arch.sie_block->ipb >> 28;
+        u32 disp2 = ((vcpu->arch.sie_block->ipb & 0x0fff0000) >> 16);
 
         return (base2 ? vcpu->run->s.regs.gprs[base2] : 0) + disp2;
 }
@@ -76,10 +76,10 @@ static inline u64 kvm_s390_get_base_disp_s(struct kvm_vcpu *vcpu)
 static inline void kvm_s390_get_base_disp_sse(struct kvm_vcpu *vcpu,
                                               u64 *address1, u64 *address2)
 {
-        int base1 = (vcpu->arch.sie_block->ipb & 0xf0000000) >> 28;
-        int disp1 = (vcpu->arch.sie_block->ipb & 0x0fff0000) >> 16;
-        int base2 = (vcpu->arch.sie_block->ipb & 0xf000) >> 12;
-        int disp2 = vcpu->arch.sie_block->ipb & 0x0fff;
+        u32 base1 = (vcpu->arch.sie_block->ipb & 0xf0000000) >> 28;
+        u32 disp1 = (vcpu->arch.sie_block->ipb & 0x0fff0000) >> 16;
+        u32 base2 = (vcpu->arch.sie_block->ipb & 0xf000) >> 12;
+        u32 disp2 = vcpu->arch.sie_block->ipb & 0x0fff;
 
         *address1 = (base1 ? vcpu->run->s.regs.gprs[base1] : 0) + disp1;
         *address2 = (base2 ? vcpu->run->s.regs.gprs[base2] : 0) + disp2;
@@ -87,17 +87,20 @@ static inline void kvm_s390_get_base_disp_sse(struct kvm_vcpu *vcpu,
 
 static inline u64 kvm_s390_get_base_disp_rsy(struct kvm_vcpu *vcpu)
 {
-        int base2 = vcpu->arch.sie_block->ipb >> 28;
-        int disp2 = ((vcpu->arch.sie_block->ipb & 0x0fff0000) >> 16) +
+        u32 base2 = vcpu->arch.sie_block->ipb >> 28;
+        u32 disp2 = ((vcpu->arch.sie_block->ipb & 0x0fff0000) >> 16) +
                         ((vcpu->arch.sie_block->ipb & 0xff00) << 4);
+        /* The displacement is a 20bit _SIGNED_ value */
+        if (disp2 & 0x80000)
+                disp2+=0xfff00000;
 
-        return (base2 ? vcpu->run->s.regs.gprs[base2] : 0) + disp2;
+        return (base2 ? vcpu->run->s.regs.gprs[base2] : 0) + (long)(int)disp2;
 }
 
 static inline u64 kvm_s390_get_base_disp_rs(struct kvm_vcpu *vcpu)
 {
-        int base2 = vcpu->arch.sie_block->ipb >> 28;
-        int disp2 = ((vcpu->arch.sie_block->ipb & 0x0fff0000) >> 16);
+        u32 base2 = vcpu->arch.sie_block->ipb >> 28;
+        u32 disp2 = ((vcpu->arch.sie_block->ipb & 0x0fff0000) >> 16);
 
         return (base2 ? vcpu->run->s.regs.gprs[base2] : 0) + disp2;
 }