openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

powerpc/64: Add macros for annotating the destination of rfid/hrfid 

The rfid/hrfid ((Hypervisor) Return From Interrupt) instruction is
used for switching from the kernel to userspace, and from the
hypervisor to the guest kernel. However it can and is also used for
other transitions, eg. from real mode kernel code to virtual mode
kernel code, and it's not always clear from the code what the
destination context is.

To make it clearer when reading the code, add macros which encode the
expected destination context.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Nicholas Piggin 2018-01-10 03:07:15 +11:00 committed by Michael Ellerman
parent a6978f405d
commit 50e51c13b3
2 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/powerpc/include/asm/exception-64e.h
View File

@ -209,5 +209,11 @@ exc_##label##_book3e:
ori r3,r3,vector_offset@l; \ ori r3,r3,vector_offset@l; \
mtspr SPRN_IVOR##vector_number,r3; mtspr SPRN_IVOR##vector_number,r3;
#define RFI_TO_KERNEL \
rfi
#define RFI_TO_USER \
rfi
#endif /* _ASM_POWERPC_EXCEPTION_64E_H */ #endif /* _ASM_POWERPC_EXCEPTION_64E_H */

29
arch/powerpc/include/asm/exception-64s.h
View File

@ -74,6 +74,35 @@
*/ */
#define EX_R3 EX_DAR #define EX_R3 EX_DAR
/* Macros for annotating the expected destination of (h)rfid */
#define RFI_TO_KERNEL \
rfid
#define RFI_TO_USER \
rfid
#define RFI_TO_USER_OR_KERNEL \
rfid
#define RFI_TO_GUEST \
rfid
#define HRFI_TO_KERNEL \
hrfid
#define HRFI_TO_USER \
hrfid
#define HRFI_TO_USER_OR_KERNEL \
hrfid
#define HRFI_TO_GUEST \
hrfid
#define HRFI_TO_UNKNOWN \
hrfid
#ifdef CONFIG_RELOCATABLE #ifdef CONFIG_RELOCATABLE
#define __EXCEPTION_RELON_PROLOG_PSERIES_1(label, h) \ #define __EXCEPTION_RELON_PROLOG_PSERIES_1(label, h) \
mfspr r11,SPRN_##h##SRR0; /* save SRR0 */ \ mfspr r11,SPRN_##h##SRR0; /* save SRR0 */ \