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

Commit 32777fa2 authored by Ruchi Kandoi's avatar Ruchi Kandoi
Browse files

Revert "arm64: optionally set CP15BEN in SCTLR" 

This reverts commit 2ec6f254.
parent b91b580b

arch/arm64/Kconfig

+0 −11
Original line number Diff line number Diff line
@@ -376,17 +376,6 @@ config ARCH_WANT_HUGE_PMD_SHARE 
config HAVE_ARCH_TRANSPARENT_HUGEPAGE

	def_bool y



config ARMV7_COMPAT_CP15_BARRIER

	bool "Allow applications to use the CP15 barrier operations"

	depends on ARMV7_COMPAT

	default y

	help

	 This option allows applications to use deprecated CP15 barrier

	 instructions. This is useful because this was the only way to create

	 a barrier on older ARM processors.



	 If you want to execute ARMv7 applications, say Y



config ARCH_HAS_CACHE_LINE_SIZE

	def_bool y

arch/arm64/mm/proc.S

+0 −15
Original line number Diff line number Diff line
@@ -243,20 +243,6 @@ ENTRY(__cpu_setup) 
	ret					// return to head.S

ENDPROC(__cpu_setup)



#ifdef CONFIG_ARMV7_COMPAT_CP15_BARRIER

	/*

	 *                 n n            T

	 *       U E      WT T UD     US IHBS

	 *       CE0      XWHW CZ     ME TEEA S

	 * .... .IEE .... NEAI TE.I ..AD DEN0 ACAM

	 * 0011 0... 1101 ..0. ..0. 10.. .... .... < hardware reserved

	 * .... .100 .... 01.1 11.1 ..01 0011 1101 < software settings

	 */

	.type	crval, #object

crval:

	.word	0x030802e2			// clear

	.word	0x0405d13d			// set

#else

	/*

	 *                 n n            T

	 *       U E      WT T UD     US IHBS
@@ -269,4 +255,3 @@ crval: 
crval:

	.word	0x000802e2			// clear

	.word	0x0405d11d			// set
 
#endif