Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

KVM: PPC: Remove shared defines for SPE and AltiVec interrupts

We currently decide at compile-time which of the SPE or AltiVec units to
support exclusively. Guard kernel defines with CONFIG_SPE_POSSIBLE and
CONFIG_PPC_E500MC and remove shared defines.

Signed-off-by: Mihai Caraman <mihai.caraman@freescale.com>
Signed-off-by: Alexander Graf <agraf@suse.de>

authored by

Mihai Caraman and committed by
Alexander Graf
e9a94832 d02d4d15

+10 -10
+10 -10
arch/powerpc/include/asm/kvm_asm.h
··· 53 53 #define BOOKE_INTERRUPT_DEBUG 15 54 54 55 55 /* E500 */ 56 - #define BOOKE_INTERRUPT_SPE_ALTIVEC_UNAVAIL 32 57 - #define BOOKE_INTERRUPT_SPE_FP_DATA_ALTIVEC_ASSIST 33 58 - /* 59 - * TODO: Unify 32-bit and 64-bit kernel exception handlers to use same defines 60 - */ 61 - #define BOOKE_INTERRUPT_SPE_UNAVAIL BOOKE_INTERRUPT_SPE_ALTIVEC_UNAVAIL 62 - #define BOOKE_INTERRUPT_SPE_FP_DATA BOOKE_INTERRUPT_SPE_FP_DATA_ALTIVEC_ASSIST 63 - #define BOOKE_INTERRUPT_ALTIVEC_UNAVAIL BOOKE_INTERRUPT_SPE_ALTIVEC_UNAVAIL 64 - #define BOOKE_INTERRUPT_ALTIVEC_ASSIST \ 65 - BOOKE_INTERRUPT_SPE_FP_DATA_ALTIVEC_ASSIST 56 + #ifdef CONFIG_SPE_POSSIBLE 57 + #define BOOKE_INTERRUPT_SPE_UNAVAIL 32 58 + #define BOOKE_INTERRUPT_SPE_FP_DATA 33 66 59 #define BOOKE_INTERRUPT_SPE_FP_ROUND 34 60 + #endif 61 + 62 + #ifdef CONFIG_PPC_E500MC 63 + #define BOOKE_INTERRUPT_ALTIVEC_UNAVAIL 32 64 + #define BOOKE_INTERRUPT_ALTIVEC_ASSIST 33 65 + #endif 66 + 67 67 #define BOOKE_INTERRUPT_PERFORMANCE_MONITOR 35 68 68 #define BOOKE_INTERRUPT_DOORBELL 36 69 69 #define BOOKE_INTERRUPT_DOORBELL_CRITICAL 37