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

Commit 4da597d1 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP2+: Fix ppa_zero_params and ppa_por_params for rodata 



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: 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 0a0b1327

arch/arm/mach-omap2/sleep44xx.S

+17 −8
Original line number Diff line number Diff line
@@ -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