diff mbox

ARM: OMAP5: select SCU

Message ID 1368550638-2046-1-git-send-email-vincent.stehle@laposte.net (mailing list archive)
State New, archived
Headers show

Commit Message

Vincent Stehlé May 14, 2013, 4:57 p.m. UTC
From: Vincent Stehlé <v-stehle@ti.com>

OMAP5 needs SCU in SMP.

This fixes the following link errors:

  arch/arm/mach-omap2/built-in.o: In function `scu_gp_set':
  arch/arm/mach-omap2/sleep44xx.S:132: undefined reference to `scu_power_mode'
  arch/arm/mach-omap2/built-in.o: In function `scu_gp_clear':
  arch/arm/mach-omap2/sleep44xx.S:229: undefined reference to `scu_power_mode'
  arch/arm/mach-omap2/built-in.o: In function `omap4_smp_prepare_cpus':
  arch/arm/mach-omap2/omap-smp.c:211: undefined reference to `scu_enable'
  arch/arm/mach-omap2/built-in.o: In function `omap4_smp_init_cpus':
  arch/arm/mach-omap2/omap-smp.c:185: undefined reference to `scu_get_core_count'

Signed-off-by: Vincent Stehlé <v-stehle@ti.com>
---
 arch/arm/mach-omap2/Kconfig |    1 +
 1 file changed, 1 insertion(+)

Comments

Santosh Shilimkar May 15, 2013, 12:36 p.m. UTC | #1
On Tuesday 14 May 2013 10:27 PM, Vincent Stehlé wrote:
> From: Vincent Stehlé <v-stehle@ti.com>
> 
> OMAP5 needs SCU in SMP.
> 
> This fixes the following link errors:
> 
>   arch/arm/mach-omap2/built-in.o: In function `scu_gp_set':
>   arch/arm/mach-omap2/sleep44xx.S:132: undefined reference to `scu_power_mode'
>   arch/arm/mach-omap2/built-in.o: In function `scu_gp_clear':
>   arch/arm/mach-omap2/sleep44xx.S:229: undefined reference to `scu_power_mode'
>   arch/arm/mach-omap2/built-in.o: In function `omap4_smp_prepare_cpus':
>   arch/arm/mach-omap2/omap-smp.c:211: undefined reference to `scu_enable'
>   arch/arm/mach-omap2/built-in.o: In function `omap4_smp_init_cpus':
>   arch/arm/mach-omap2/omap-smp.c:185: undefined reference to `scu_get_core_count'
> 
> Signed-off-by: Vincent Stehlé <v-stehle@ti.com>
> ---
OMAP5 doesn't need the SCU. So Nak for the patch. I haven't noticed
this earlier. Do you know which commit broke this ?

Regards,
Santosh

--
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
Vincent Stehlé May 16, 2013, 1:10 p.m. UTC | #2
On 05/15/2013 02:36 PM, Santosh Shilimkar wrote:
> OMAP5 doesn't need the SCU. So Nak for the patch.

Hi,

I agree that it is a pure link issue.

> I haven't noticed
> this earlier. Do you know which commit broke this ?

After some bisecting I arrived at this merge commit:

  5497e7b Merge branch 'late/fixes' into fixes

Indeed, if I revert it (-m 1) the result does link properly. I'll try to
isolate it further.

Best regards,

V.

--
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
Vincent Stehlé May 16, 2013, 2:29 p.m. UTC | #3
So the exact commit breaking OMAP5 link for me is:

  883a106 ARM: default machine descriptor for multiplatform

The breakage seems to be a side effect of not selecting ARCH_VEXPRESS
any more, which causes HAVE_ARM_SCU to not be selected any more, too,
when compiling only for OMAP5. IMHO this only reveals a deeper issue.

Probably the ideal fix would be to remove all references to the scu_
functions for OMAP5, but those seem to exist in files and functions,
common to OMAP4 and 5 (sleep44xx.S, omap-smp.c).

How would you deal with that, please?

Best regards,

V.

--
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
Santosh Shilimkar May 17, 2013, 7:16 a.m. UTC | #4
Sorry for top posting. Can you just add static inlines functions in header file and #ifdef it for OMAP5.

Regards,
Santosh
diff mbox

Patch

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index f49cd51..81690a2 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -109,6 +109,7 @@  config SOC_OMAP5
 	select ARM_CPU_SUSPEND if PM
 	select ARM_GIC
 	select CPU_V7
+	select HAVE_ARM_SCU if SMP
 	select HAVE_SMP
 	select COMMON_CLK
 	select HAVE_ARM_ARCH_TIMER