Skip to contentSkip to conversation

ARM: imx6: build pm-imx6q.c independently of CONFIG_PM

PATCH RESEND Superseded Shawn Guo 3 participants 5 messages Feb 18, 2014 – Feb 26, 2014

Subsystems (3)
lore
Share & tools
lore

Shawn Guo

author
#0 lore raw

PATCH RESEND 1/1 ARM: imx6: build pm-imx6q.c independently of CONFIG_PM

When building a kernel image with only CONFIG_CPU_IDLE but no CONFIG_PM, we will get the following link error.

LD init/built-in.o
arch/arm/mach-imx/built-in.o: In function `imx6q_enter_wait':
platform-spi_imx.c:(.text+0x25c0): undefined reference to imx6q_set_lpm' platform-spi_imx.c:(.text+0x25d4): undefined reference to imx6q_set_lpm' arch/arm/mach-imx/built-in.o: In function `imx6q_cpuidle_init':
platform-spi_imx.c:(.init.text+0x75d4): undefined reference to `imx6q_set_chicken_bit' make[1]: *** [vmlinux] Error 1

Since pm-imx6q.c has been a collection of library functions that access CCM low-power registers used by not only suspend but also cpuidle and other drivers, let's build pm-imx6q.c independently of CONFIG_PM to fix above error.

---
Kevin, Olof, Arnd,

Please apply this fix for v3.14. Thanks.

Shawn

 arch/arm/mach-imx/Makefile |    2 --
 arch/arm/mach-imx/common.h |    4 +---
 2 files changed, 1 insertion(+), 5 deletions(-)
arch/arm/mach-imx/Makefile +0 -2
index befcaf5..ec41964 100644
@@ -101,11 +101,9 @@ obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
 obj-$(CONFIG_SOC_IMX6Q) += clk-imx6q.o mach-imx6q.o
 obj-$(CONFIG_SOC_IMX6SL) += clk-imx6sl.o mach-imx6sl.o
 
-ifeq ($(CONFIG_PM),y)
 obj-$(CONFIG_SOC_IMX6Q) += pm-imx6q.o headsmp.o
 # i.MX6SL reuses i.MX6Q code
 obj-$(CONFIG_SOC_IMX6SL) += pm-imx6q.o headsmp.o
-endif
 
 # i.MX5 based machines
 obj-$(CONFIG_MACH_MX51_BABBAGE) += mach-mx51_babbage.o
arch/arm/mach-imx/common.h +1 -3
index 59c3b9b..baf439d 100644
@@ -144,13 +144,11 @@ void imx6q_set_chicken_bit(void);
 void imx_cpu_die(unsigned int cpu);
 int imx_cpu_kill(unsigned int cpu);
 
-#ifdef CONFIG_PM
 void imx6q_pm_init(void);
 void imx6q_pm_set_ccm_base(void __iomem *base);
+#ifdef CONFIG_PM
 void imx5_pm_init(void);
 #else
-static inline void imx6q_pm_init(void) {}
-static inline void imx6q_pm_set_ccm_base(void __iomem *base) {}
 static inline void imx5_pm_init(void) {}
 #endif
 
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH RESEND 1/1 ARM: imx6: build pm-imx6q.c independently of CONFIG_PM

Quoted 16 lines · Shawn Guo

When building a kernel image with only CONFIG_CPU_IDLE but no CONFIG_PM, we will get the following link error.

LD init/built-in.o
arch/arm/mach-imx/built-in.o: In function `imx6q_enter_wait':
platform-spi_imx.c:(.text+0x25c0): undefined reference to imx6q_set_lpm' platform-spi_imx.c:(.text+0x25d4): undefined reference to imx6q_set_lpm' arch/arm/mach-imx/built-in.o: In function `imx6q_cpuidle_init':
platform-spi_imx.c:(.init.text+0x75d4): undefined reference to `imx6q_set_chicken_bit' make[1]: *** [vmlinux] Error 1

Since pm-imx6q.c has been a collection of library functions that access CCM low-power registers used by not only suspend but also cpuidle and other drivers, let's build pm-imx6q.c independently of CONFIG_PM to fix above error.

Quoted 8 lines

---
Kevin, Olof, Arnd,

Please apply this fix for v3.14. Thanks.

Applied, thanks.

-Olof

#2 lore raw

PATCH RESEND 1/1 ARM: imx6: build pm-imx6q.c independently of CONFIG_PM

In reply to Shawn Guo
Quoted 3 lines · Shawn Guo

When building a kernel image with only CONFIG_CPU_IDLE but no CONFIG_PM, we will get the following link error.

I seem to need more changes on top of this, to allow building with neither CPU_IDLE nor PM enabled. Can you verify that?

Arnd

commit 6a434aea44d8a250f8ee2205be9bc429b140b663

Author: Arnd Bergmann <[email protected]>
Date:   Mon Feb 24 22:19:50 2014 +0100

ARM: imx: more CONFIG_PM fixes

This lets us build the imx code in more configurations.

arch/arm/mach-imx/common.h +2 -4
index a3fcd9c..a367675 100644
@@ -147,15 +147,13 @@ int imx_cpu_kill(unsigned int cpu);
 
 void imx6q_pm_init(void);
 void imx6q_pm_set_ccm_base(void __iomem *base);
-#ifdef CONFIG_PM
-void imx6_suspend(void __iomem *ocram_vbase);
 void imx6dl_pm_init(void);
 void imx6sl_pm_init(void);
+#ifdef CONFIG_PM
+void imx6_suspend(void __iomem *ocram_vbase);
 void imx5_pm_init(void);
 #else
 static inline void imx6_suspend(void __iomem *ocram_vbase) {}
-static inline void imx6dl_pm_init(void) {}
-static inline void imx6sl_pm_init(void) {}
 static inline void imx5_pm_init(void) {}
 #endif
 
arch/arm/mach-imx/pm-imx6q.c +6 -4
index bb69943..5fea999 100644
@@ -521,10 +521,12 @@ static void __init imx6_pm_common_init(const struct imx6_pm_socdata
 
 	WARN_ON(!ccm_base);
 
-	ret = imx6q_ocram_suspend_init(socdata);
-	if (ret)
-		pr_warn("%s: failed to initialize ocram suspend %d!\n",
-			__func__, ret);
+	if (IS_ENABLED(CONFIG_ARM_CPU_SUSPEND)) {
+		ret = imx6q_ocram_suspend_init(socdata);
+		if (ret)
+			pr_warn("%s: failed to initialize ocram suspend %d!\n",
+				__func__, ret);
+	}
 
 	/*
 	 * This is for SW workaround step #1 of ERR007265, see comments
author
#3 lore raw

PATCH RESEND 1/1 ARM: imx6: build pm-imx6q.c independently of CONFIG_PM

Quoted 7 lines · Arnd Bergmann
Quoted 3 lines · Shawn Guo

When building a kernel image with only CONFIG_CPU_IDLE but no CONFIG_PM, we will get the following link error.

I seem to need more changes on top of this, to allow building with neither CPU_IDLE nor PM enabled. Can you verify that?

The error is only seen on the linux-next, and partially caused by the resolution for the conflict between this patch and the ones I queued for 3.15. I'm rebasing my imx-soc-3.15 branch to 3.14-rc4, so that the conflict can be solved on my branch in a cleaner way, which will help fix the error here. So hopefully, in the next build of linux-next, the error will disappear.

Shawn

Quoted 56 lines

Arnd

commit 6a434aea44d8a250f8ee2205be9bc429b140b663

Author: Arnd Bergmann <[email protected]>
Date:   Mon Feb 24 22:19:50 2014 +0100

ARM: imx: more CONFIG_PM fixes

This lets us build the imx code in more configurations.

arch/arm/mach-imx/common.h +2 -4
index a3fcd9c..a367675 100644
@@ -147,15 +147,13 @@ int imx_cpu_kill(unsigned int cpu);
 
 void imx6q_pm_init(void);
 void imx6q_pm_set_ccm_base(void __iomem *base);
-#ifdef CONFIG_PM
-void imx6_suspend(void __iomem *ocram_vbase);
 void imx6dl_pm_init(void);
 void imx6sl_pm_init(void);
+#ifdef CONFIG_PM
+void imx6_suspend(void __iomem *ocram_vbase);
 void imx5_pm_init(void);
 #else
 static inline void imx6_suspend(void __iomem *ocram_vbase) {}
-static inline void imx6dl_pm_init(void) {}
-static inline void imx6sl_pm_init(void) {}
 static inline void imx5_pm_init(void) {}
 #endif
 
arch/arm/mach-imx/pm-imx6q.c +6 -4
index bb69943..5fea999 100644
@@ -521,10 +521,12 @@ static void __init imx6_pm_common_init(const struct imx6_pm_socdata
 
 	WARN_ON(!ccm_base);
 
-	ret = imx6q_ocram_suspend_init(socdata);
-	if (ret)
-		pr_warn("%s: failed to initialize ocram suspend %d!\n",
-			__func__, ret);
+	if (IS_ENABLED(CONFIG_ARM_CPU_SUSPEND)) {
+		ret = imx6q_ocram_suspend_init(socdata);
+		if (ret)
+			pr_warn("%s: failed to initialize ocram suspend %d!\n",
+				__func__, ret);
+	}
 
 	/*
 	 * This is for SW workaround step #1 of ERR007265, see comments
#4 lore raw

PATCH RESEND 1/1 ARM: imx6: build pm-imx6q.c independently of CONFIG_PM

Quoted 7 lines · On Wednesday 26 February 2014 15:28:35 Shawn Guo wrote:

The error is only seen on the linux-next, and partially caused by the resolution for the conflict between this patch and the ones I queued for 3.15. I'm rebasing my imx-soc-3.15 branch to 3.14-rc4, so that the conflict can be solved on my branch in a cleaner way, which will help fix the error here. So hopefully, in the next build of linux-next, the error will disappear.

Ok, thanks a lot!

Arnd