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

This project is archived. Its data is read-only.

Commit f6d2d681 authored Mar 09, 2017 by Runmin Wang

arm64: Update correct config option for TLB handler



Update the config option to "CONFIG_QCOM_TLB_HANDLER" so el1_sync
will call into EL2 TLB fault handler. Default TLB handler in EL1
is changed into a dummy handler.

Change-Id: Id4008d03002928bd24affeba0ef4250664ea3a48
Signed-off-by: Runmin Wang <runminw@codeaurora.org>

parent 647076b6

arch/arm64/kernel/entry.S

+1 −1

Original line number	Diff line number	Diff line
		@@ -411,7 +411,7 @@ ENDPROC(el1_error_invalid)
		*/
		.align 6
		el1_sync:
		#ifdef CONFIG_TLB_EL2_HANDLER
		#ifdef CONFIG_QCOM_TLB_EL2_HANDLER
		smc #0xffff
		#endif
		kernel_entry 1

arch/arm64/mm/fault.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -457,7 +457,7 @@ no_context:
		* so that, do_mem_abort would not crash kernel thinking TLB conflict not
		* handled.
		*/
		#ifdef QCOM_TLB_EL2_HANDLER
		#ifdef CONFIG_QCOM_TLB_EL2_HANDLER
		static int do_tlb_conf_fault(unsigned long addr,
		unsigned int esr,
		struct pt_regs *regs)
		@@ -556,7 +556,7 @@ static const struct fault_info {
		{ do_bad, SIGBUS, 0, "unknown 45" },
		{ do_bad, SIGBUS, 0, "unknown 46" },
		{ do_bad, SIGBUS, 0, "unknown 47" },
		#ifdef QCOM_TLB_EL2_HANDLER
		#ifdef CONFIG_QCOM_TLB_EL2_HANDLER
		{ do_tlb_conf_fault, SIGBUS, 0, "TLB conflict abort" },
		#else
		{ do_bad, SIGBUS, 0, "TLB conflict abort" },