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

Commit 16a6d3e0 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "soc: qcom: enable QHEE kernel memory protection"

parents 53722b95 2ee75729

arch/arm64/kernel/smp.c

+3 −0
Original line number Diff line number Diff line
@@ -62,6 +62,8 @@ 
#include <asm/system_misc.h>

#include <soc/qcom/minidump.h>



#include <soc/qcom/scm.h>



#define CREATE_TRACE_POINTS

#include <trace/events/ipi.h>
@@ -404,6 +406,7 @@ void __init smp_cpus_done(unsigned int max_cpus) 
	setup_cpu_features();

	hyp_mode_check();

	apply_alternatives_all();

	scm_enable_mem_protection();

	mark_linear_text_alias_ro();

}

drivers/soc/qcom/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -758,6 +758,15 @@ config QCOM_CDSP_RM 
	  to improve RPC latency. The driver also registers cooling devices for

	  CDSP subsystem and implements Cx ipeak limit management.



config QCOM_QHEE_ENABLE_MEM_PROTECTION

	bool "QHEE enable kernel memory protection"

	depends on QCOM_SCM

	help

	  When this option is enabled, an SCM call will be invoked to enable

	  kernel memory protection in stage 2 memory mappings on kernel boot.

	  This is part of a security feature in QHEE and need to be enabled by

	  default.



endmenu



config QCOM_HYP_CORE_CTL