Commit 735703da authored Jan 08, 2018 by Todd Poynor Committed by Channagoud Kadabi Jan 09, 2018

ANDROID: arm64: kaslr: fixup Falkor workaround for 4.9



android-4.9 port of upstream commit
6c27c4082f4f70b9f41df4d0adf51128b40351df
"arm64: kaslr: Put kernel vectors address in separate data page"
failed to fixup code that does not omcpile when CONFIG_RANDOMIZE_BASE=y.

Port fixup for earlier kernels from ghackmann@google.com to
android-4.9:
  - replace ARM64_WORKAROUND_QCOM_FALKOR_E1003 alternative with
     compile-time CONFIG_ARCH_MSM8996 check]

Change-Id: Idc4bb255db830029093ea0d948a9e5066e2c13f8
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Git-commit: b328e524
Git-repo: https://android.googlesource.com/kernel/common/


[ckadabi@codeaurora.org: Remove ARM64_WORKAROUND_QCOM_FALKOR_E1003
macro]
Signed-off-by: Channagoud Kadabi <ckadabi@codeaurora.org>

parent 5beb2e02

arch/arm64/include/asm/cpucaps.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -36,8 +36,7 @@
		#define ARM64_MISMATCHED_CACHE_LINE_SIZE 15

		#define ARM64_UNMAP_KERNEL_AT_EL0 16
		#define ARM64_WORKAROUND_QCOM_FALKOR_E1003 17

		#define ARM64_NCAPS 18
		#define ARM64_NCAPS 17

		#endif /* __ASM_CPUCAPS_H */

arch/arm64/kernel/entry.S

+3 −1

Original line number	Diff line number	Diff line
		@@ -953,7 +953,9 @@ __ni_sys_trace:
		tramp_map_kernel x30
		#ifdef CONFIG_RANDOMIZE_BASE
		adr x30, tramp_vectors + PAGE_SIZE
		alternative_insn isb, nop, ARM64_WORKAROUND_QCOM_FALKOR_E1003
		#ifndef CONFIG_ARCH_MSM8996
		isb
		#endif
		ldr x30, [x30]
		#else
		ldr x30, =vectors