lkml.org 
[lkml]   [2016]   [Feb]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 085/137] ARM: OMAP2+: Fix ppa_zero_params and ppa_por_params for rodata
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Tony Lindgren <tony@atomide.com>

    commit 4da597d16602d14405b71a18d45e1c59f28f0fd2 upstream.

    We don't want to write to .text so let's move ppa_zero_params and
    ppa_por_params to .data and access them via pointers.

    Note that I have not been able to test as we I don't have a HS
    omap4 to test with. The code has been changed in similar way as
    for omap3 though.

    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: Nicolas Pitre <nico@linaro.org>
    Fixes: 1e6b48116a95 ("ARM: mm: allow non-text sections to be
    non-executable")
    Signed-off-by: Tony Lindgren <tony@atomide.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/arm/mach-omap2/sleep44xx.S | 25 +++++++++++++++++--------
    1 file changed, 17 insertions(+), 8 deletions(-)

    --- a/arch/arm/mach-omap2/sleep44xx.S
    +++ b/arch/arm/mach-omap2/sleep44xx.S
    @@ -29,12 +29,6 @@
    dsb
    .endm

    -ppa_zero_params:
    - .word 0x0
    -
    -ppa_por_params:
    - .word 1, 0
    -
    #ifdef CONFIG_ARCH_OMAP4

    /*
    @@ -266,7 +260,9 @@ ENTRY(omap4_cpu_resume)
    beq skip_ns_smp_enable
    ppa_actrl_retry:
    mov r0, #OMAP4_PPA_CPU_ACTRL_SMP_INDEX
    - adr r3, ppa_zero_params @ Pointer to parameters
    + adr r1, ppa_zero_params_offset
    + ldr r3, [r1]
    + add r3, r3, r1 @ Pointer to ppa_zero_params
    mov r1, #0x0 @ Process ID
    mov r2, #0x4 @ Flag
    mov r6, #0xff
    @@ -303,7 +299,9 @@ skip_ns_smp_enable:
    ldr r0, =OMAP4_PPA_L2_POR_INDEX
    ldr r1, =OMAP44XX_SAR_RAM_BASE
    ldr r4, [r1, #L2X0_PREFETCH_CTRL_OFFSET]
    - adr r3, ppa_por_params
    + adr r1, ppa_por_params_offset
    + ldr r3, [r1]
    + add r3, r3, r1 @ Pointer to ppa_por_params
    str r4, [r3, #0x04]
    mov r1, #0x0 @ Process ID
    mov r2, #0x4 @ Flag
    @@ -328,6 +326,8 @@ skip_l2en:
    #endif

    b cpu_resume @ Jump to generic resume
    +ppa_por_params_offset:
    + .long ppa_por_params - .
    ENDPROC(omap4_cpu_resume)
    #endif /* CONFIG_ARCH_OMAP4 */

    @@ -380,4 +380,13 @@ ENTRY(omap_do_wfi)
    nop

    ldmfd sp!, {pc}
    +ppa_zero_params_offset:
    + .long ppa_zero_params - .
    ENDPROC(omap_do_wfi)
    +
    + .data
    +ppa_zero_params:
    + .word 0
    +
    +ppa_por_params:
    + .word 1, 0

    \
     
     \ /
      Last update: 2016-02-24 06:01    [W:2.176 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site