From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:50075 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755958AbcBXDoG (ORCPT ); Tue, 23 Feb 2016 22:44:06 -0500 Subject: Patch "ARM: OMAP2+: Fix l2_inv_api_params for rodata" has been added to the 4.4-stable tree To: tony@atomide.com, gregkh@linuxfoundation.org, keescook@chromium.org, labbott@redhat.com, linux@arm.linux.org.uk, nico@linaro.org, nm@ti.com, r-woodruff2@ti.com, t-kristo@ti.com Cc: , From: Date: Tue, 23 Feb 2016 19:24:06 -0800 Message-ID: <1456284246118161@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled ARM: OMAP2+: Fix l2_inv_api_params 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-l2_inv_api_params-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 know about it. >>From 0a0b13275558c32bbf6241464a7244b1ffd5afb3 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Thu, 14 Jan 2016 12:20:47 -0800 Subject: ARM: OMAP2+: Fix l2_inv_api_params for rodata From: Tony Lindgren commit 0a0b13275558c32bbf6241464a7244b1ffd5afb3 upstream. We don't want to write to .text, so let's move l2_inv_api_params to .data and access it via a pointer. Cc: Kees Cook Cc: Laura Abbott Cc: Nishanth Menon Cc: Richard Woodruff Cc: Russell King Cc: Tero Kristo Acked-by: Nicolas Pitre Fixes: 1e6b48116a95 ("ARM: mm: allow non-text sections to be non-executable") Signed-off-by: Tony Lindgren Signed-off-by: Greg Kroah-Hartman --- arch/arm/mach-omap2/sleep34xx.S | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) --- a/arch/arm/mach-omap2/sleep34xx.S +++ b/arch/arm/mach-omap2/sleep34xx.S @@ -427,12 +427,14 @@ skipl2dis: and r1, #0x700 cmp r1, #0x300 beq l2_inv_gp + adr r0, l2_inv_api_params_offset + ldr r3, [r0] + add r3, r3, r0 @ r3 points to dummy parameters mov r0, #40 @ set service ID for PPA mov r12, r0 @ copy secure Service ID in r12 mov r1, #0 @ set task id for ROM code in r1 mov r2, #4 @ set some flags in r2, r6 mov r6, #0xff - adr r3, l2_inv_api_params @ r3 points to dummy parameters dsb @ data write barrier dmb @ data memory barrier smc #1 @ call SMI monitor (smi #1) @@ -466,8 +468,8 @@ skipl2dis: b logic_l1_restore .align -l2_inv_api_params: - .word 0x1, 0x00 +l2_inv_api_params_offset: + .long l2_inv_api_params - . l2_inv_gp: /* Execute smi to invalidate L2 cache */ mov r12, #0x1 @ set up to invalidate L2 @@ -516,6 +518,10 @@ control_mem_rta: l2dis_3630: .word 0 + .data +l2_inv_api_params: + .word 0x1, 0x00 + /* * Internal functions */ Patches currently in stable-queue which might be from tony@atomide.com 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