Commit 39d08e83 authored by Catalin Marinas's avatar Catalin Marinas
Browse files

arm64: mte: Restore the GCR_EL1 register after a suspend 



The CPU resume/suspend routines only take care of the common system
registers. Restore GCR_EL1 in addition via the __cpu_suspend_exit()
function.

Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Reviewed-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
parent af5ce952

arch/arm64/include/asm/mte.h

+4 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ void mte_sync_tags(pte_t *ptep, pte_t pte); 
void mte_copy_page_tags(void *kto, const void *kfrom);

void flush_mte_state(void);

void mte_thread_switch(struct task_struct *next);

void mte_suspend_exit(void);

long set_mte_ctrl(unsigned long arg);

long get_mte_ctrl(void);
@@ -42,6 +43,9 @@ static inline void flush_mte_state(void) 
static inline void mte_thread_switch(struct task_struct *next)

{

}

static inline void mte_suspend_exit(void)

{

}

static inline long set_mte_ctrl(unsigned long arg)

{

	return 0;

arch/arm64/kernel/mte.c

+8 −0
Original line number Diff line number Diff line
@@ -116,6 +116,14 @@ void mte_thread_switch(struct task_struct *next) 
	update_gcr_el1_excl(next->thread.gcr_user_incl);

}



void mte_suspend_exit(void)

{

	if (!system_supports_mte())

		return;



	update_gcr_el1_excl(current->thread.gcr_user_incl);

}



long set_mte_ctrl(unsigned long arg)

{

	u64 tcf0;

arch/arm64/kernel/suspend.c

+4 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <asm/daifflags.h>

#include <asm/debug-monitors.h>

#include <asm/exec.h>

#include <asm/mte.h>

#include <asm/memory.h>

#include <asm/mmu_context.h>

#include <asm/smp_plat.h>
@@ -74,6 +75,9 @@ void notrace __cpu_suspend_exit(void) 
	 */

	if (arm64_get_ssbd_state() == ARM64_SSBD_FORCE_DISABLE)

		arm64_set_ssbd_mitigation(false);



	/* Restore additional MTE-specific configuration */

	mte_suspend_exit();

}



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE