| Message ID | 20170805205222.19868-13-ard.biesheuvel@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | ARM: add and use convenience macros for PC relative references | expand |
* Ard Biesheuvel <ard.biesheuvel@linaro.org> [170805 13:54]: > This replaces a couple of open coded calculations to obtain the > physical address of a far symbol with calls to the new adr_l etc > macros. I gave this series a quick test and omap3 no longer boots it seems. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 9 August 2017 at 20:05, Tony Lindgren <tony@atomide.com> wrote: > * Ard Biesheuvel <ard.biesheuvel@linaro.org> [170805 13:54]: >> This replaces a couple of open coded calculations to obtain the >> physical address of a far symbol with calls to the new adr_l etc >> macros. > > I gave this series a quick test and omap3 no longer boots it seems. > Thanks Tony. I will investigate -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
* Ard Biesheuvel <ard.biesheuvel@linaro.org> [170809 12:24]: > On 9 August 2017 at 20:05, Tony Lindgren <tony@atomide.com> wrote: > > * Ard Biesheuvel <ard.biesheuvel@linaro.org> [170805 13:54]: > >> This replaces a couple of open coded calculations to obtain the > >> physical address of a far symbol with calls to the new adr_l etc > >> macros. > > > > I gave this series a quick test and omap3 no longer boots it seems. > > > > Thanks Tony. I will investigate Thanks. Looks like omap4 still boots with all your patches, but omap3 won't boot even with patch 12 left out. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 9 August 2017 at 22:05, Tony Lindgren <tony@atomide.com> wrote: > * Ard Biesheuvel <ard.biesheuvel@linaro.org> [170809 12:24]: >> On 9 August 2017 at 20:05, Tony Lindgren <tony@atomide.com> wrote: >> > * Ard Biesheuvel <ard.biesheuvel@linaro.org> [170805 13:54]: >> >> This replaces a couple of open coded calculations to obtain the >> >> physical address of a far symbol with calls to the new adr_l etc >> >> macros. >> > >> > I gave this series a quick test and omap3 no longer boots it seems. >> > >> >> Thanks Tony. I will investigate > > Thanks. Looks like omap4 still boots with all your patches, but > omap3 won't boot even with patch 12 left out. > Are you using the same image on both? Which .config? -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
* Ard Biesheuvel <ard.biesheuvel@linaro.org> [170810 02:23]: > On 9 August 2017 at 22:05, Tony Lindgren <tony@atomide.com> wrote: > > * Ard Biesheuvel <ard.biesheuvel@linaro.org> [170809 12:24]: > >> On 9 August 2017 at 20:05, Tony Lindgren <tony@atomide.com> wrote: > >> > * Ard Biesheuvel <ard.biesheuvel@linaro.org> [170805 13:54]: > >> >> This replaces a couple of open coded calculations to obtain the > >> >> physical address of a far symbol with calls to the new adr_l etc > >> >> macros. > >> > > >> > I gave this series a quick test and omap3 no longer boots it seems. > >> > > >> > >> Thanks Tony. I will investigate > > > > Thanks. Looks like omap4 still boots with all your patches, but > > omap3 won't boot even with patch 12 left out. > > > > Are you using the same image on both? Which .config? Yes it's the same image compiled with omap2plus_defconfig. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 10 August 2017 at 15:03, Tony Lindgren <tony@atomide.com> wrote: > * Ard Biesheuvel <ard.biesheuvel@linaro.org> [170810 02:23]: >> On 9 August 2017 at 22:05, Tony Lindgren <tony@atomide.com> wrote: >> > * Ard Biesheuvel <ard.biesheuvel@linaro.org> [170809 12:24]: >> >> On 9 August 2017 at 20:05, Tony Lindgren <tony@atomide.com> wrote: >> >> > * Ard Biesheuvel <ard.biesheuvel@linaro.org> [170805 13:54]: >> >> >> This replaces a couple of open coded calculations to obtain the >> >> >> physical address of a far symbol with calls to the new adr_l etc >> >> >> macros. >> >> > >> >> > I gave this series a quick test and omap3 no longer boots it seems. >> >> > >> >> >> >> Thanks Tony. I will investigate >> > >> > Thanks. Looks like omap4 still boots with all your patches, but >> > omap3 won't boot even with patch 12 left out. >> > >> >> Are you using the same image on both? Which .config? > > Yes it's the same image compiled with omap2plus_defconfig. > Unfortunately, I am failing to reproduce this on beaglebone white or QEMU's beagle-xm emulation. Anything you can share regarding the failure mode? Do you get any output at all? -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
* Ard Biesheuvel <ard.biesheuvel@linaro.org> [170811 06:48]: > On 10 August 2017 at 15:03, Tony Lindgren <tony@atomide.com> wrote: > > * Ard Biesheuvel <ard.biesheuvel@linaro.org> [170810 02:23]: > >> On 9 August 2017 at 22:05, Tony Lindgren <tony@atomide.com> wrote: > >> > * Ard Biesheuvel <ard.biesheuvel@linaro.org> [170809 12:24]: > >> >> On 9 August 2017 at 20:05, Tony Lindgren <tony@atomide.com> wrote: > >> >> > * Ard Biesheuvel <ard.biesheuvel@linaro.org> [170805 13:54]: > >> >> >> This replaces a couple of open coded calculations to obtain the > >> >> >> physical address of a far symbol with calls to the new adr_l etc > >> >> >> macros. > >> >> > > >> >> > I gave this series a quick test and omap3 no longer boots it seems. > >> >> > > >> >> > >> >> Thanks Tony. I will investigate > >> > > >> > Thanks. Looks like omap4 still boots with all your patches, but > >> > omap3 won't boot even with patch 12 left out. > >> > > >> > >> Are you using the same image on both? Which .config? > > > > Yes it's the same image compiled with omap2plus_defconfig. > > > > Unfortunately, I am failing to reproduce this on beaglebone white or > QEMU's beagle-xm emulation. > > Anything you can share regarding the failure mode? Do you get any output at all? No output at all, I've tried omap3-evm, logicpd torpedo and n900. We do copy some of the PM code to SRAM on omap3 though that's not done on am335x. But as it's not caused by this patch, I'll try to narrow it down to the patch causing it. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/mach-omap2/sleep34xx.S b/arch/arm/mach-omap2/sleep34xx.S index 1b9f0520dea9..418a4478622d 100644 --- a/arch/arm/mach-omap2/sleep34xx.S +++ b/arch/arm/mach-omap2/sleep34xx.S @@ -86,9 +86,7 @@ ENTRY(enable_omap3630_toggle_l2_on_restore) stmfd sp!, {lr} @ save registers on stack /* Setup so that we will disable and enable l2 */ mov r1, #0x1 - adrl r3, l2dis_3630_offset @ may be too distant for plain adr - ldr r2, [r3] @ value for offset - str r1, [r2, r3] @ write to l2dis_3630 + str_l r1, l2dis_3630, r2 @ write to l2dis_3630 ldmfd sp!, {pc} @ restore regs and return ENDPROC(enable_omap3630_toggle_l2_on_restore) @@ -422,9 +420,7 @@ ENTRY(omap3_restore) cmp r2, #0x0 @ Check if target power state was OFF or RET bne logic_l1_restore - adr r1, l2dis_3630_offset @ address for offset - ldr r0, [r1] @ value for offset - ldr r0, [r1, r0] @ value at l2dis_3630 + ldr_l r0, l2dis_3630 @ value at l2dis_3630 cmp r0, #0x1 @ should we disable L2 on 3630? bne skipl2dis mrc p15, 0, r0, c1, c0, 1 @@ -436,9 +432,7 @@ 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 + adr_l r3, l2_inv_api_params @ 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 @@ -476,9 +470,6 @@ skipl2dis: #endif b logic_l1_restore - .align -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 @@ -495,9 +486,7 @@ l2_inv_gp: mov r12, #0x2 smc #0 @ Call SMI monitor (smieq) logic_l1_restore: - adr r0, l2dis_3630_offset @ adress for offset - ldr r1, [r0] @ value for offset - ldr r1, [r0, r1] @ value at l2dis_3630 + ldr_l r1, l2dis_3630 @ value at l2dis_3630 cmp r1, #0x1 @ Test if L2 re-enable needed on 3630 bne skipl2reen mrc p15, 0, r1, c1, c0, 1 @@ -526,8 +515,6 @@ control_stat: .word CONTROL_STAT control_mem_rta: .word CONTROL_MEM_RTA_CTRL -l2dis_3630_offset: - .long l2dis_3630 - . .data l2dis_3630: diff --git a/arch/arm/mach-omap2/sleep44xx.S b/arch/arm/mach-omap2/sleep44xx.S index c7a3b4aab4b5..274fbb91f08f 100644 --- a/arch/arm/mach-omap2/sleep44xx.S +++ b/arch/arm/mach-omap2/sleep44xx.S @@ -260,9 +260,7 @@ ENTRY(omap4_cpu_resume) beq skip_ns_smp_enable ppa_actrl_retry: mov r0, #OMAP4_PPA_CPU_ACTRL_SMP_INDEX - adr r1, ppa_zero_params_offset - ldr r3, [r1] - add r3, r3, r1 @ Pointer to ppa_zero_params + adr_l r3, ppa_zero_params @ Pointer to ppa_zero_params mov r1, #0x0 @ Process ID mov r2, #0x4 @ Flag mov r6, #0xff @@ -299,9 +297,7 @@ 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 r1, ppa_por_params_offset - ldr r3, [r1] - add r3, r3, r1 @ Pointer to ppa_por_params + adr_l r3, ppa_por_params @ Pointer to ppa_por_params str r4, [r3, #0x04] mov r1, #0x0 @ Process ID mov r2, #0x4 @ Flag @@ -326,8 +322,6 @@ 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,8 +374,6 @@ ENTRY(omap_do_wfi) nop ldmfd sp!, {pc} -ppa_zero_params_offset: - .long ppa_zero_params - . ENDPROC(omap_do_wfi) .data
This replaces a couple of open coded calculations to obtain the physical address of a far symbol with calls to the new adr_l etc macros. Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> --- arch/arm/mach-omap2/sleep34xx.S | 21 ++++---------------- arch/arm/mach-omap2/sleep44xx.S | 12 ++--------- 2 files changed, 6 insertions(+), 27 deletions(-) -- 2.11.0 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html