* [PATCH] ARM: omap2: fix am43xx build without L2X0
@ 2018-04-04 10:25 ` Arnd Bergmann
0 siblings, 0 replies; 7+ messages in thread
From: Arnd Bergmann @ 2018-04-04 10:25 UTC (permalink / raw)
To: Tony Lindgren
Cc: Arnd Bergmann, Dave Gerlach, Russell King, linux-kernel,
Santosh Shilimkar, linux-omap, linux-arm-kernel
When CONFIG_CACHE_L2X0 is disabled, the am43xx specific suspend
implemnentation fails to link:
arch/arm/mach-omap2/sleep43xx.o: In function `get_l2cache_base':
(.text+0x180): undefined reference to `omap4_get_l2cache_base'
This adds an #ifdef protection around the code, like we do for am44xx.
Fixes: 41d37e61372f ("ARM: OMAP2+: Introduce low-level suspend code for AM43XX")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/arm/mach-omap2/sleep43xx.S | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/sleep43xx.S b/arch/arm/mach-omap2/sleep43xx.S
index 59770a69396b..b24be624e8b9 100644
--- a/arch/arm/mach-omap2/sleep43xx.S
+++ b/arch/arm/mach-omap2/sleep43xx.S
@@ -52,10 +52,12 @@
ENTRY(am43xx_do_wfi)
stmfd sp!, {r4 - r11, lr} @ save registers on stack
+#ifdef CONFIG_CACHE_L2X0
/* Retrieve l2 cache virt address BEFORE we shut off EMIF */
ldr r1, get_l2cache_base
blx r1
mov r8, r0
+#endif
/*
* Flush all data from the L1 and L2 data cache before disabling
@@ -334,8 +336,6 @@ ENDPROC(am43xx_resume_from_deep_sleep)
.align
resume_addr:
.word cpu_resume - PAGE_OFFSET + 0x80000000
-get_l2cache_base:
- .word omap4_get_l2cache_base
kernel_flush:
.word v7_flush_dcache_all
ddr_start:
@@ -354,7 +354,10 @@ am43xx_phys_emif_clkctrl:
.word (AM43XX_CM_BASE + AM43XX_CM_PER_INST + \
AM43XX_CM_PER_EMIF_CLKCTRL_OFFSET)
+#ifdef CONFIG_CACHE_L2X0
/* L2 cache related defines for AM437x */
+get_l2cache_base:
+ .word omap4_get_l2cache_base
l2_cache_base:
.word OMAP44XX_L2CACHE_BASE
l2_smc1:
@@ -365,6 +368,7 @@ l2_smc3:
.word OMAP4_MON_L2X0_CTRL_INDEX
l2_val:
.word 0xffff
+#endif
.align 3
/* DDR related defines */
--
2.9.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH] ARM: omap2: fix am43xx build without L2X0
@ 2018-04-04 10:25 ` Arnd Bergmann
0 siblings, 0 replies; 7+ messages in thread
From: Arnd Bergmann @ 2018-04-04 10:25 UTC (permalink / raw)
To: Tony Lindgren
Cc: Arnd Bergmann, Russell King, Dave Gerlach, Santosh Shilimkar,
linux-arm-kernel, linux-omap, linux-kernel
When CONFIG_CACHE_L2X0 is disabled, the am43xx specific suspend
implemnentation fails to link:
arch/arm/mach-omap2/sleep43xx.o: In function `get_l2cache_base':
(.text+0x180): undefined reference to `omap4_get_l2cache_base'
This adds an #ifdef protection around the code, like we do for am44xx.
Fixes: 41d37e61372f ("ARM: OMAP2+: Introduce low-level suspend code for AM43XX")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/arm/mach-omap2/sleep43xx.S | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/sleep43xx.S b/arch/arm/mach-omap2/sleep43xx.S
index 59770a69396b..b24be624e8b9 100644
--- a/arch/arm/mach-omap2/sleep43xx.S
+++ b/arch/arm/mach-omap2/sleep43xx.S
@@ -52,10 +52,12 @@
ENTRY(am43xx_do_wfi)
stmfd sp!, {r4 - r11, lr} @ save registers on stack
+#ifdef CONFIG_CACHE_L2X0
/* Retrieve l2 cache virt address BEFORE we shut off EMIF */
ldr r1, get_l2cache_base
blx r1
mov r8, r0
+#endif
/*
* Flush all data from the L1 and L2 data cache before disabling
@@ -334,8 +336,6 @@ ENDPROC(am43xx_resume_from_deep_sleep)
.align
resume_addr:
.word cpu_resume - PAGE_OFFSET + 0x80000000
-get_l2cache_base:
- .word omap4_get_l2cache_base
kernel_flush:
.word v7_flush_dcache_all
ddr_start:
@@ -354,7 +354,10 @@ am43xx_phys_emif_clkctrl:
.word (AM43XX_CM_BASE + AM43XX_CM_PER_INST + \
AM43XX_CM_PER_EMIF_CLKCTRL_OFFSET)
+#ifdef CONFIG_CACHE_L2X0
/* L2 cache related defines for AM437x */
+get_l2cache_base:
+ .word omap4_get_l2cache_base
l2_cache_base:
.word OMAP44XX_L2CACHE_BASE
l2_smc1:
@@ -365,6 +368,7 @@ l2_smc3:
.word OMAP4_MON_L2X0_CTRL_INDEX
l2_val:
.word 0xffff
+#endif
.align 3
/* DDR related defines */
--
2.9.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH] ARM: omap2: fix am43xx build without L2X0
@ 2018-04-04 10:25 ` Arnd Bergmann
0 siblings, 0 replies; 7+ messages in thread
From: Arnd Bergmann @ 2018-04-04 10:25 UTC (permalink / raw)
To: linux-arm-kernel
When CONFIG_CACHE_L2X0 is disabled, the am43xx specific suspend
implemnentation fails to link:
arch/arm/mach-omap2/sleep43xx.o: In function `get_l2cache_base':
(.text+0x180): undefined reference to `omap4_get_l2cache_base'
This adds an #ifdef protection around the code, like we do for am44xx.
Fixes: 41d37e61372f ("ARM: OMAP2+: Introduce low-level suspend code for AM43XX")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/arm/mach-omap2/sleep43xx.S | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/sleep43xx.S b/arch/arm/mach-omap2/sleep43xx.S
index 59770a69396b..b24be624e8b9 100644
--- a/arch/arm/mach-omap2/sleep43xx.S
+++ b/arch/arm/mach-omap2/sleep43xx.S
@@ -52,10 +52,12 @@
ENTRY(am43xx_do_wfi)
stmfd sp!, {r4 - r11, lr} @ save registers on stack
+#ifdef CONFIG_CACHE_L2X0
/* Retrieve l2 cache virt address BEFORE we shut off EMIF */
ldr r1, get_l2cache_base
blx r1
mov r8, r0
+#endif
/*
* Flush all data from the L1 and L2 data cache before disabling
@@ -334,8 +336,6 @@ ENDPROC(am43xx_resume_from_deep_sleep)
.align
resume_addr:
.word cpu_resume - PAGE_OFFSET + 0x80000000
-get_l2cache_base:
- .word omap4_get_l2cache_base
kernel_flush:
.word v7_flush_dcache_all
ddr_start:
@@ -354,7 +354,10 @@ am43xx_phys_emif_clkctrl:
.word (AM43XX_CM_BASE + AM43XX_CM_PER_INST + \
AM43XX_CM_PER_EMIF_CLKCTRL_OFFSET)
+#ifdef CONFIG_CACHE_L2X0
/* L2 cache related defines for AM437x */
+get_l2cache_base:
+ .word omap4_get_l2cache_base
l2_cache_base:
.word OMAP44XX_L2CACHE_BASE
l2_smc1:
@@ -365,6 +368,7 @@ l2_smc3:
.word OMAP4_MON_L2X0_CTRL_INDEX
l2_val:
.word 0xffff
+#endif
.align 3
/* DDR related defines */
--
2.9.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH] ARM: omap2: fix am43xx build without L2X0
2018-04-04 10:25 ` Arnd Bergmann
@ 2018-04-04 17:12 ` Tony Lindgren
-1 siblings, 0 replies; 7+ messages in thread
From: Tony Lindgren @ 2018-04-04 17:12 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Russell King, Dave Gerlach, Santosh Shilimkar, linux-arm-kernel,
linux-omap, linux-kernel
* Arnd Bergmann <arnd@arndb.de> [180404 10:27]:
> When CONFIG_CACHE_L2X0 is disabled, the am43xx specific suspend
> implemnentation fails to link:
>
> arch/arm/mach-omap2/sleep43xx.o: In function `get_l2cache_base':
> (.text+0x180): undefined reference to `omap4_get_l2cache_base'
>
> This adds an #ifdef protection around the code, like we do for am44xx.
>
> Fixes: 41d37e61372f ("ARM: OMAP2+: Introduce low-level suspend code for AM43XX")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Thanks, looks OK to me:
Acked-by: Tony Lindgren <tony@atomide.com>
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH] ARM: omap2: fix am43xx build without L2X0
@ 2018-04-04 17:12 ` Tony Lindgren
0 siblings, 0 replies; 7+ messages in thread
From: Tony Lindgren @ 2018-04-04 17:12 UTC (permalink / raw)
To: linux-arm-kernel
* Arnd Bergmann <arnd@arndb.de> [180404 10:27]:
> When CONFIG_CACHE_L2X0 is disabled, the am43xx specific suspend
> implemnentation fails to link:
>
> arch/arm/mach-omap2/sleep43xx.o: In function `get_l2cache_base':
> (.text+0x180): undefined reference to `omap4_get_l2cache_base'
>
> This adds an #ifdef protection around the code, like we do for am44xx.
>
> Fixes: 41d37e61372f ("ARM: OMAP2+: Introduce low-level suspend code for AM43XX")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Thanks, looks OK to me:
Acked-by: Tony Lindgren <tony@atomide.com>
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] ARM: omap2: fix am43xx build without L2X0
2018-04-04 17:12 ` Tony Lindgren
@ 2018-04-05 9:07 ` Arnd Bergmann
-1 siblings, 0 replies; 7+ messages in thread
From: Arnd Bergmann @ 2018-04-05 9:07 UTC (permalink / raw)
To: Tony Lindgren
Cc: Russell King, Dave Gerlach, Santosh Shilimkar, Linux ARM,
linux-omap, Linux Kernel Mailing List
On Wed, Apr 4, 2018 at 7:12 PM, Tony Lindgren <tony@atomide.com> wrote:
> * Arnd Bergmann <arnd@arndb.de> [180404 10:27]:
>> When CONFIG_CACHE_L2X0 is disabled, the am43xx specific suspend
>> implemnentation fails to link:
>>
>> arch/arm/mach-omap2/sleep43xx.o: In function `get_l2cache_base':
>> (.text+0x180): undefined reference to `omap4_get_l2cache_base'
>>
>> This adds an #ifdef protection around the code, like we do for am44xx.
>>
>> Fixes: 41d37e61372f ("ARM: OMAP2+: Introduce low-level suspend code for AM43XX")
>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>
> Thanks, looks OK to me:
>
> Acked-by: Tony Lindgren <tony@atomide.com>
Applied to next/soc.
Arnd
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH] ARM: omap2: fix am43xx build without L2X0
@ 2018-04-05 9:07 ` Arnd Bergmann
0 siblings, 0 replies; 7+ messages in thread
From: Arnd Bergmann @ 2018-04-05 9:07 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Apr 4, 2018 at 7:12 PM, Tony Lindgren <tony@atomide.com> wrote:
> * Arnd Bergmann <arnd@arndb.de> [180404 10:27]:
>> When CONFIG_CACHE_L2X0 is disabled, the am43xx specific suspend
>> implemnentation fails to link:
>>
>> arch/arm/mach-omap2/sleep43xx.o: In function `get_l2cache_base':
>> (.text+0x180): undefined reference to `omap4_get_l2cache_base'
>>
>> This adds an #ifdef protection around the code, like we do for am44xx.
>>
>> Fixes: 41d37e61372f ("ARM: OMAP2+: Introduce low-level suspend code for AM43XX")
>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>
> Thanks, looks OK to me:
>
> Acked-by: Tony Lindgren <tony@atomide.com>
Applied to next/soc.
Arnd
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2018-04-05 9:07 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-04 10:25 [PATCH] ARM: omap2: fix am43xx build without L2X0 Arnd Bergmann
2018-04-04 10:25 ` Arnd Bergmann
2018-04-04 10:25 ` Arnd Bergmann
2018-04-04 17:12 ` Tony Lindgren
2018-04-04 17:12 ` Tony Lindgren
2018-04-05 9:07 ` Arnd Bergmann
2018-04-05 9:07 ` Arnd Bergmann
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.