lkml.org 
[lkml]   [2016]   [Mar]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.2.y-ckt 028/273] ARM: OMAP2+: Fix save_secure_ram_context for rodata
    Date
    4.2.8-ckt5 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    From: Tony Lindgren <tony@atomide.com>

    commit a5311d4d13df80bd71a9e47f9ecaf327f478fab1 upstream.

    We don't want to write to .text and we can move save_secure_ram_context
    into .data as it all gets copied into SRAM anyways.

    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: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
    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: Kamal Mostafa <kamal@canonical.com>
    ---
    arch/arm/mach-omap2/sleep34xx.S | 10 ++++++++--
    1 file changed, 8 insertions(+), 2 deletions(-)

    diff --git a/arch/arm/mach-omap2/sleep34xx.S b/arch/arm/mach-omap2/sleep34xx.S
    index 5659d96..8e2a7ac 100644
    --- a/arch/arm/mach-omap2/sleep34xx.S
    +++ b/arch/arm/mach-omap2/sleep34xx.S
    @@ -92,8 +92,12 @@ ENTRY(enable_omap3630_toggle_l2_on_restore)
    ldmfd sp!, {pc} @ restore regs and return
    ENDPROC(enable_omap3630_toggle_l2_on_restore)

    - .text
    -/* Function to call rom code to save secure ram context */
    +/*
    + * Function to call rom code to save secure ram context. This gets
    + * relocated to SRAM, so it can be all in .data section. Otherwise
    + * we need to initialize api_params separately.
    + */
    + .data
    .align 3
    ENTRY(save_secure_ram_context)
    stmfd sp!, {r4 - r11, lr} @ save registers on stack
    @@ -127,6 +131,8 @@ ENDPROC(save_secure_ram_context)
    ENTRY(save_secure_ram_context_sz)
    .word . - save_secure_ram_context

    + .text
    +
    /*
    * ======================
    * == Idle entry point ==
    --
    2.7.0
    \
     
     \ /
      Last update: 2016-03-08 02:21    [W:2.256 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site