KVM: MIPS: Fix build errors for 32bit kernel
PATCH 1/1 KVM: MIPS: Fix build errors for 32bit kernel
Commit dc6d95b153e78ed70b1b2c04a ("KVM: MIPS: Add more MMIO load/store instructions emulation") introduced some 64bit load/store instructions emulation which are unavailable on 32bit platform, and it causes build errors:
arch/mips/kvm/emulate.c: In function 'kvm_mips_emulate_store':arch/mips/kvm/emulate.c:1734:6: error: right shift count >= width of type [-Werror]
((vcpu->arch.gprs[rt] >> 56) & 0xff);
^
arch/mips/kvm/emulate.c:1738:6: error: right shift count >= width of type [-Werror]
((vcpu->arch.gprs[rt] >> 48) & 0xffff);
^
arch/mips/kvm/emulate.c:1742:6: error: right shift count >= width of type [-Werror]
((vcpu->arch.gprs[rt] >> 40) & 0xffffff);
^
arch/mips/kvm/emulate.c:1746:6: error: right shift count >= width of type [-Werror]
((vcpu->arch.gprs[rt] >> 32) & 0xffffffff);
^
arch/mips/kvm/emulate.c:1796:6: error: left shift count >= width of type [-Werror]
(vcpu->arch.gprs[rt] << 32);
^
arch/mips/kvm/emulate.c:1800:6: error: left shift count >= width of type [-Werror]
(vcpu->arch.gprs[rt] << 40);
^
arch/mips/kvm/emulate.c:1804:6: error: left shift count >= width of type [-Werror]
(vcpu->arch.gprs[rt] << 48);
^
arch/mips/kvm/emulate.c:1808:6: error: left shift count >= width of type [-Werror]
(vcpu->arch.gprs[rt] << 56);
^cc1: all warnings being treated as errors
make[3]: *** [arch/mips/kvm/emulate.o] Error 1
So, use #if defined(CONFIG_64BIT) && defined(CONFIG_KVM_MIPS_VZ) to guard the 64bit load/store instructions emulation.
--- arch/mips/kvm/emulate.c | 4 ++++ 1 file changed, 4 insertions(+)
arch/mips/kvm/emulate.c +4 -0
@@ -1722,6 +1722,7 @@ enum emulation_result kvm_mips_emulate_store(union mips_instruction inst, vcpu->arch.gprs[rt], *(u32 *)data);break ; +#if defined(CONFIG_64BIT ) && defined(CONFIG_KVM_MIPS_VZ )case sdl_op: run->mmio.phys_addr = kvm_mips_callbacks->gva_to_gpa ( vcpu->arch.host_cp0_badvaddr) & (~0x7 );
@@ -1815,6 +1816,7 @@ enum emulation_result kvm_mips_emulate_store(union mips_instruction inst, vcpu->arch.pc, vcpu->arch.host_cp0_badvaddr, vcpu->arch.gprs[rt], *(u64 *)data);break ; +#endif #ifdef CONFIG_CPU_LOONGSON64 case sdc2_op:
@@ -2002,6 +2004,7 @@ enum emulation_result kvm_mips_emulate_load(union mips_instruction inst, }break ; +#if defined(CONFIG_64BIT ) && defined(CONFIG_KVM_MIPS_VZ )case ldl_op: run->mmio.phys_addr = kvm_mips_callbacks->gva_to_gpa ( vcpu->arch.host_cp0_badvaddr) & (~0x7 );
@@ -2073,6 +2076,7 @@ enum emulation_result kvm_mips_emulate_load(union mips_instruction inst, break; }break ; +#endif #ifdef CONFIG_CPU_LOONGSON64 case ldc2_op:
Signature · 1 line
2.7.0
Quoted 73 lines · Huacai Chen
Commit
dc6d95b153e78ed70b1b2c04a("KVM: MIPS: Add more MMIO load/store instructions emulation") introduced some 64bit load/store instructions emulation which are unavailable on 32bit platform, and it causes build errors:
arch/mips/kvm/emulate.c: In function 'kvm_mips_emulate_store':arch/mips/kvm/emulate.c:1734:6: error: right shift count >= width of type [-Werror]((vcpu->arch.gprs[rt] >> 56) & 0xff); ^ arch/mips/kvm/emulate.c:1738:6: error: right shift count >= width of type [-Werror] ((vcpu->arch.gprs[rt] >> 48) & 0xffff); ^ arch/mips/kvm/emulate.c:1742:6: error: right shift count >= width of type [-Werror] ((vcpu->arch.gprs[rt] >> 40) & 0xffffff); ^ arch/mips/kvm/emulate.c:1746:6: error: right shift count >= width of type [-Werror] ((vcpu->arch.gprs[rt] >> 32) & 0xffffffff); ^ arch/mips/kvm/emulate.c:1796:6: error: left shift count >= width of type [-Werror] (vcpu->arch.gprs[rt] << 32); ^ arch/mips/kvm/emulate.c:1800:6: error: left shift count >= width of type [-Werror] (vcpu->arch.gprs[rt] << 40); ^ arch/mips/kvm/emulate.c:1804:6: error: left shift count >= width of type [-Werror] (vcpu->arch.gprs[rt] << 48); ^ arch/mips/kvm/emulate.c:1808:6: error: left shift count >= width of type [-Werror] (vcpu->arch.gprs[rt] << 56); ^cc1: all warnings being treated as errors
make[3]: *** [arch/mips/kvm/emulate.o] Error 1So, use #if
defined(CONFIG_64BIT)&&defined(CONFIG_KVM_MIPS_VZ)to guard the 64bit load/store instructions emulation.Reported-by kernel test robot <[email protected]>Fixes dc6d95b153e78ed70b1b2c04a ("KVM: MIPS: Add more MMIO load/store instructions emulation")Signed-off-by Huacai Chen <[email protected]>--- arch/mips/kvm/emulate.c | 4 ++++ 1 file changed, 4 insertions(+)arch/mips/kvm/emulate.c +3
-0@@ -1722,6 +1722,7 @@ enum emulation_result kvm_mips_emulate_store(union mips_instruction inst, vcpu->arch.gprs[rt], *(u32 *)data);break ; +#if defined(CONFIG_64BIT ) && defined(CONFIG_KVM_MIPS_VZ )case sdl_op: run->mmio.phys_addr = kvm_mips_callbacks->gva_to_gpa ( vcpu->arch.host_cp0_badvaddr) & (~0x7 );@@ -1815,6 +1816,7 @@ enum emulation_result kvm_mips_emulate_store(union mips_instruction inst, vcpu->arch.pc, vcpu->arch.host_cp0_badvaddr, vcpu->arch.gprs[rt], *(u64 *)data);break ; +#endif #ifdef CONFIG_CPU_LOONGSON64 case sdc2_op:@@ -2002,6 +2004,7 @@ enum emulation_result kvm_mips_emulate_load(union mips_instruction inst, }break ; +#if defined(CONFIG_64BIT ) && defined(CONFIG_KVM_MIPS_VZ )case ldl_op: run->mmio.phys_addr = kvm_mips_callbacks->gva_to_gpa ( vcpu->arch.host_cp0_badvaddr) & (~0x7 );
arch/mips/kvm/emulate.c enum emulation_result kvm_mips_emulate_load(union mips_instruction inst, · line 2082
Quoted 7 lines
arch/mips/kvm/emulate.c +1
-0@@ -2073,6 +2076,7 @@ enum emulation_result kvm_mips_emulate_load(union mips_instruction inst, break; }break ; +#endif #ifdef CONFIG_CPU_LOONGSON64 case ldc2_op:
Queued, thanks.
Paolo