Skip to contentSkip to conversation

ARM: OMAP4: Fix definition of IS_PM44XX_ERRATUM

PATCH New Nishanth Menon 4 participants 6 messages Mar 12, 2014 – Mar 13, 2014

Subsystems (4)
Arm (32-bit) Arm sub-architectures OMAP2+ support OMAP power management support
lore
Share & tools
lore

Nishanth Menon

author
#0 lore raw

PATCH 1/1 ARM: OMAP4: Fix definition of IS_PM44XX_ERRATUM

Just like IS_PM34XX_ERRATUM, IS_PM44XX_ERRATUM is valid only if CONFIG_PM is enabled, else, disabling CONFIG_PM results in build failure complaining about the following:
arch/arm/mach-omap2/built-in.o: In function `omap4_boot_secondary':
:(.text+0x8a70): undefined reference to `pm44xx_errata'

Fixes c962184 (ARM: OMAP4: PM: add errata support)
Reported-by Tony Lindgren <[email protected]>
Signed-off-by Nishanth Menon <[email protected]>

---

Patch based on: v3.14-rc6
Reported originally with a randconfig defconfig: http://slexy.org/view/s21U7eF4k1

 arch/arm/mach-omap2/pm.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/pm.h +1 -1
index 7bdd22a..d4d0fce 100644
@@ -103,7 +103,7 @@ static inline void enable_omap3630_toggle_l2_on_restore(void) { }
 
 #define PM_OMAP4_ROM_SMP_BOOT_ERRATUM_GICD	(1 << 0)
 
-#if defined(CONFIG_ARCH_OMAP4)
+#if defined(CONFIG_PM) && defined(CONFIG_ARCH_OMAP4)
 extern u16 pm44xx_errata;
 #define IS_PM44XX_ERRATUM(id)		(pm44xx_errata & (id))
 #else
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 ARM: OMAP4: Fix definition of IS_PM44XX_ERRATUM

Quoted 6 lines · Nishanth Menon

Just like IS_PM34XX_ERRATUM, IS_PM44XX_ERRATUM is valid only if CONFIG_PM is enabled, else, disabling CONFIG_PM results in build failure complaining about the following:
arch/arm/mach-omap2/built-in.o: In function `omap4_boot_secondary':
:(.text+0x8a70): undefined reference to `pm44xx_errata'

Not entirely accurate since CPU hotplug doesn't depend on CONFIG_PM

Quoted 8 lines
Fixes c962184 (ARM: OMAP4: PM: add errata support)
Reported-by Tony Lindgren <[email protected]>
Signed-off-by Nishanth Menon <[email protected]>

---

Patch based on: v3.14-rc6
Reported originally with a randconfig defconfig: http://slexy.org/view/s21U7eF4k1

But without the PM sleep code, hotplug won't work either. SO I think its ok assumption in this particular case

Quoted 17 lines
 arch/arm/mach-omap2/pm.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/pm.h +1 -1
index 7bdd22a..d4d0fce 100644
@@ -103,7 +103,7 @@ static inline void enable_omap3630_toggle_l2_on_restore(void) { }
 
 #define PM_OMAP4_ROM_SMP_BOOT_ERRATUM_GICD	(1 << 0)
 
-#if defined(CONFIG_ARCH_OMAP4)
+#if defined(CONFIG_PM) && defined(CONFIG_ARCH_OMAP4)
 extern u16 pm44xx_errata;
 #define IS_PM44XX_ERRATUM(id)		(pm44xx_errata & (id))
 #else
author
#2 lore raw

PATCH 1/1 ARM: OMAP4: Fix definition of IS_PM44XX_ERRATUM

Quoted 8 lines · Santosh Shilimkar
Quoted 6 lines · Nishanth Menon

Just like IS_PM34XX_ERRATUM, IS_PM44XX_ERRATUM is valid only if CONFIG_PM is enabled, else, disabling CONFIG_PM results in build failure complaining about the following:
arch/arm/mach-omap2/built-in.o: In function `omap4_boot_secondary':
:(.text+0x8a70): undefined reference to `pm44xx_errata'

Not entirely accurate since CPU hotplug doesn't depend on CONFIG_PM

Just reporting the build error here.

Quoted 10 lines
Quoted 9 lines
Fixes c962184 (ARM: OMAP4: PM: add errata support)
Reported-by Tony Lindgren <[email protected]>
Signed-off-by Nishanth Menon <[email protected]>

---

Patch based on: v3.14-rc6
Reported originally with a randconfig defconfig: http://slexy.org/view/s21U7eF4k1

But without the PM sleep code, hotplug won't work either.

yep - agreed,

Quoted 1 line

SO I think its ok assumption in this particular case

Can I take that as an Ack here? or would you suggest any improvements?

Quoted 19 lines
Quoted 18 lines
 arch/arm/mach-omap2/pm.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/pm.h +1 -1
index 7bdd22a..d4d0fce 100644
@@ -103,7 +103,7 @@ static inline void enable_omap3630_toggle_l2_on_restore(void) { }
 
 #define PM_OMAP4_ROM_SMP_BOOT_ERRATUM_GICD	(1 << 0)
 
-#if defined(CONFIG_ARCH_OMAP4)
+#if defined(CONFIG_PM) && defined(CONFIG_ARCH_OMAP4)
 extern u16 pm44xx_errata;
 #define IS_PM44XX_ERRATUM(id)		(pm44xx_errata & (id))
 #else
Signature · 2 lines
Regards,
Nishanth Menon
#3 lore raw

PATCH 1/1 ARM: OMAP4: Fix definition of IS_PM44XX_ERRATUM

Quoted 17 lines · Nishanth Menon
Quoted 8 lines · Santosh Shilimkar
Quoted 6 lines · Nishanth Menon

Just like IS_PM34XX_ERRATUM, IS_PM44XX_ERRATUM is valid only if CONFIG_PM is enabled, else, disabling CONFIG_PM results in build failure complaining about the following:
arch/arm/mach-omap2/built-in.o: In function `omap4_boot_secondary':
:(.text+0x8a70): undefined reference to `pm44xx_errata'

Not entirely accurate since CPU hotplug doesn't depend on CONFIG_PM

Just reporting the build error here.

Quoted 6 lines
Quoted 6 lines
Fixes c962184 (ARM: OMAP4: PM: add errata support)
Reported-by Tony Lindgren <[email protected]>
Signed-off-by Nishanth Menon <[email protected]>

---

Quoted 9 lines
Quoted 4 lines
Quoted 3 lines

Patch based on: v3.14-rc6
Reported originally with a randconfig defconfig: http://slexy.org/view/s21U7eF4k1

But without the PM sleep code, hotplug won't work either.

yep - agreed,

Quoted 1 line

SO I think its ok assumption in this particular case

Can I take that as an Ack here? or would you suggest any improvements?

yep. Acked-by: Santosh Shilimkar <[email protected]>

#4 lore raw

PATCH 1/1 ARM: OMAP4: Fix definition of IS_PM44XX_ERRATUM

In reply to Nishanth Menon
Quoted 9 lines · Nishanth Menon

Just like IS_PM34XX_ERRATUM, IS_PM44XX_ERRATUM is valid only if CONFIG_PM is enabled, else, disabling CONFIG_PM results in build failure complaining about the following:
arch/arm/mach-omap2/built-in.o: In function `omap4_boot_secondary':
:(.text+0x8a70): undefined reference to `pm44xx_errata'

Fixes c962184 (ARM: OMAP4: PM: add errata support)
Reported-by Tony Lindgren <[email protected]>
Signed-off-by Nishanth Menon <[email protected]>
Acked-by Kevin Hilman <[email protected]>
maintainer
#5 lore raw

PATCH 1/1 ARM: OMAP4: Fix definition of IS_PM44XX_ERRATUM

Quoted 8 lines · Kevin Hilman
Quoted 6 lines · Nishanth Menon

Just like IS_PM34XX_ERRATUM, IS_PM44XX_ERRATUM is valid only if CONFIG_PM is enabled, else, disabling CONFIG_PM results in build failure complaining about the following:
arch/arm/mach-omap2/built-in.o: In function `omap4_boot_secondary':
:(.text+0x8a70): undefined reference to `pm44xx_errata'

Quoted 5 lines
Quoted 3 lines
Fixes c962184 (ARM: OMAP4: PM: add errata support)
Reported-by Tony Lindgren <[email protected]>
Signed-off-by Nishanth Menon <[email protected]>
Acked-by Kevin Hilman <[email protected]>

Applying this into omap-for-v3.15/fixes thanks.

Tony