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

Commit d9db5910 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP2+: Fix wait_dll_lock_timed for rodata 



We don't want to be writing to .text so it can be set rodata.
Fix error "Unable to handle kernel paging request at virtual address
c012396c" in wait_dll_lock_timed if CONFIG_DEBUG_RODATA is selected.

As these counters are for debugging only and unused, we can just
remove them.

Cc: Kees Cook <keescook@chromium.org>
Cc: Laura Abbott <labbott@redhat.com>
Cc: Nishanth Menon <nm@ti.com>
Cc: Richard Woodruff <r-woodruff2@ti.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Tero Kristo <t-kristo@ti.com>
Acked-by: default avatarNicolas Pitre <nico@linaro.org>
Cc: stable@vger.kernel.org # v4.0+
Fixes: 1e6b4811 ("ARM: mm: allow non-text sections to be
non-executable")
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 4850d431

arch/arm/mach-omap2/sleep34xx.S

+0 −22
Original line number Diff line number Diff line
@@ -289,12 +289,6 @@ wait_sdrc_ready: 
	bic	r5, r5, #0x40

	str	r5, [r4]



/*

 * PC-relative stores lead to undefined behaviour in Thumb-2: use a r7 as a

 * base instead.

 * Be careful not to clobber r7 when maintaing this code.

 */



is_dll_in_lock_mode:

	/* Is dll in lock mode? */

	ldr	r4, sdrc_dlla_ctrl
@@ -302,11 +296,7 @@ is_dll_in_lock_mode: 
	tst	r5, #0x4

	bne	exit_nonoff_modes	@ Return if locked

	/* wait till dll locks */

	adr	r7, kick_counter

wait_dll_lock_timed:

	ldr	r4, wait_dll_lock_counter

	add	r4, r4, #1

	str	r4, [r7, #wait_dll_lock_counter - kick_counter]

	ldr	r4, sdrc_dlla_status

	/* Wait 20uS for lock */

	mov	r6, #8
@@ -330,9 +320,6 @@ kick_dll: 
	orr	r6, r6, #(1<<3)		@ enable dll

	str	r6, [r4]

	dsb

	ldr	r4, kick_counter

	add	r4, r4, #1

	str	r4, [r7]		@ kick_counter

	b	wait_dll_lock_timed



exit_nonoff_modes:
@@ -360,15 +347,6 @@ sdrc_dlla_status: 
	.word	SDRC_DLLA_STATUS_V

sdrc_dlla_ctrl:

	.word	SDRC_DLLA_CTRL_V

	/*

	 * When exporting to userspace while the counters are in SRAM,

	 * these 2 words need to be at the end to facilitate retrival!

	 */

kick_counter:

	.word	0

wait_dll_lock_counter:

	.word	0



ENTRY(omap3_do_wfi_sz)

	.word	. - omap3_do_wfi