Patch "ARM: OMAP2+: Fix wait_dll_lock_timed for rodata" has been added to the 4.4-stable tree

This is a note to let you know that I've just added the patch titled

ARM: OMAP2+: Fix wait_dll_lock_timed for rodata

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
arm-omap2-fix-wait_dll_lock_timed-for-rodata.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Tony Lindgren <[email protected]>
Date: Thu, 14 Jan 2016 12:20:47 -0800
Subject: ARM: OMAP2+: Fix wait_dll_lock_timed for rodata

From: Tony Lindgren <[email protected]>

commit d9db59103305eb5ec2a86369f32063e9921b6ac5 upstream.

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.

non-executable")

---
 arch/arm/mach-omap2/sleep34xx.S |   22 ----------------------
 1 file changed, 22 deletions(-)

@@ -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
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/phy-twl4030-usb-relase-usb-phy-on-unload.patch queue-4.4/arm-omap2-fix-wait_dll_lock_timed-for-rodata.patch queue-4.4/arm-dts-fix-omap5-pmic-control-lines-for-rtc-writes.patch queue-4.4/arm-omap2-fix-l2_inv_api_params-for-rodata.patch queue-4.4/arm-omap2-fix-ppa_zero_params-and-ppa_por_params-for-rodata.patch queue-4.4/arm-omap2-fix-l2dis_3630-for-rodata.patch queue-4.4/arm-omap2-fix-save_secure_ram_context-for-rodata.patch queue-4.4/phy-twl4030-usb-fix-unbalanced-pm_runtime_enable-on-module-reload.patch queue-4.4/arm-dts-omap5-board-common-enable-rtc-and-charging-of-backup-battery.patch queue-4.4/arm-dts-fix-wl12xx-missing-clocks-that-cause-hangs.patch