Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1281f56 authored by James Morse's avatar James Morse Committed by Catalin Marinas
Browse files

arm64: uaccess: Add PAN helper 



Add __uaccess_{en,dis}able_hw_pan() helpers to set/clear the PSTATE.PAN
bit.

Signed-off-by: default avatarJames Morse <james.morse@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent ed8b20d4

arch/arm64/include/asm/uaccess.h

+12 −0
Original line number Diff line number Diff line
@@ -168,6 +168,18 @@ static inline bool uaccess_ttbr0_enable(void) 
}

#endif



static inline void __uaccess_disable_hw_pan(void)

{

	asm(ALTERNATIVE("nop", SET_PSTATE_PAN(0), ARM64_HAS_PAN,

			CONFIG_ARM64_PAN));

}



static inline void __uaccess_enable_hw_pan(void)

{

	asm(ALTERNATIVE("nop", SET_PSTATE_PAN(1), ARM64_HAS_PAN,

			CONFIG_ARM64_PAN));

}



#define __uaccess_disable(alt)						\

do {									\

	if (!uaccess_ttbr0_disable())					\

arch/arm64/kernel/suspend.c

+2 −2
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#include <linux/ftrace.h>

#include <linux/percpu.h>

#include <linux/slab.h>

#include <linux/uaccess.h>

#include <asm/alternative.h>

#include <asm/cacheflush.h>

#include <asm/cpufeature.h>
@@ -51,8 +52,7 @@ void notrace __cpu_suspend_exit(void) 
	 * PSTATE was not saved over suspend/resume, re-enable any detected

	 * features that might not have been set correctly.

	 */

	asm(ALTERNATIVE("nop", SET_PSTATE_PAN(1), ARM64_HAS_PAN,

			CONFIG_ARM64_PAN));

	__uaccess_enable_hw_pan();

	uao_thread_switch(current);



	/*