Build error with !CONFIG_SMP in v4.2-rc1 on arm multi_v7_defconfig

Build error with !CONFIG_SMP in v4.2-rc1 on arm multi_v7_defconfig

[Dave Gerlach]

Hello,
I am seeing the following error when building v4.2-rc1 for arm with
multi_v7_defconfig with CONFIG_SMP=n:

 LINK    vmlinux
  LD      vmlinux.o
  MODPOST vmlinux.o
  GEN     .version
  CHK     include/generated/compile.h
  UPD     include/generated/compile.h
  CC      init/version.o
  LD      init/built-in.o
drivers/built-in.o: In function `qcom_pm_collapse':
:(.text+0xaf44c): undefined reference to `qcom_scm_cpu_power_down'
drivers/built-in.o: In function `qcom_cpuidle_init':
:(.init.text+0x9508): undefined reference to `qcom_scm_set_warm_boot_addr'
make: *** [vmlinux] Error 1


It appears the calling functions in drivers/soc/qcom/spm.c get included by
CONFIG_QCOM_PM which is part of multi_v7_defconfig but the missing functions
from drivers/firmware/qcom_scm.c only get included by CONFIG_QCOM_SCM if SMP is
selected. I am not sure if the correct approach is to remove CONFIG_QCOM_PM from
multi_v7_defconfig or to remove 'if SMP' from CONFIG_QCOM_SCM, or something else
entirely. Thoughts?

Regards,
Dave

Re: Build error with !CONFIG_SMP in v4.2-rc1 on arm multi_v7_defconfig

[Stephen Boyd]

On 07/10/2015 12:31 PM, Dave Gerlach wrote:
> Hello,
> I am seeing the following error when building v4.2-rc1 for arm with
> multi_v7_defconfig with CONFIG_SMP=n:
>
>  LINK    vmlinux
>   LD      vmlinux.o
>   MODPOST vmlinux.o
>   GEN     .version
>   CHK     include/generated/compile.h
>   UPD     include/generated/compile.h
>   CC      init/version.o
>   LD      init/built-in.o
> drivers/built-in.o: In function `qcom_pm_collapse':
> :(.text+0xaf44c): undefined reference to `qcom_scm_cpu_power_down'
> drivers/built-in.o: In function `qcom_cpuidle_init':
> :(.init.text+0x9508): undefined reference to `qcom_scm_set_warm_boot_addr'
> make: *** [vmlinux] Error 1
>
>
> It appears the calling functions in drivers/soc/qcom/spm.c get included by
> CONFIG_QCOM_PM which is part of multi_v7_defconfig but the missing functions
> from drivers/firmware/qcom_scm.c only get included by CONFIG_QCOM_SCM if SMP is
> selected. I am not sure if the correct approach is to remove CONFIG_QCOM_PM from
> multi_v7_defconfig or to remove 'if SMP' from CONFIG_QCOM_SCM, or something else
> entirely. Thoughts?
>
>

CONFIG_QCOM_PM should select CONFIG_QCOM_SCM unconditionally.

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project

[PATCH] drivers: qcom: Select QCOM_SCM unconditionally for QCOM_PM

[Lina Iyer]

Enable QCOM_SCM for QCOM power management driver

Signed-off-by: Lina Iyer <lina.iyer@linaro.org>
---
 drivers/soc/qcom/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig
index 5eea374..e9a2c19 100644
--- a/drivers/soc/qcom/Kconfig
+++ b/drivers/soc/qcom/Kconfig
@@ -13,6 +13,7 @@ config QCOM_GSBI
 config QCOM_PM
 	bool "Qualcomm Power Management"
 	depends on ARCH_QCOM && !ARM64
+	select QCOM_SCM
 	help
 	  QCOM Platform specific power driver to manage cores and L2 low power
 	  modes. It interface with various system drivers to put the cores in
-- 
2.1.4

Re: Build error with !CONFIG_SMP in v4.2-rc1 on arm multi_v7_defconfig

[Dave Gerlach]

On 07/10/2015 02:36 PM, Stephen Boyd wrote:
> On 07/10/2015 12:31 PM, Dave Gerlach wrote:
>> Hello,
>> I am seeing the following error when building v4.2-rc1 for arm with
>> multi_v7_defconfig with CONFIG_SMP=n:
>>
>>  LINK    vmlinux
>>   LD      vmlinux.o
>>   MODPOST vmlinux.o
>>   GEN     .version
>>   CHK     include/generated/compile.h
>>   UPD     include/generated/compile.h
>>   CC      init/version.o
>>   LD      init/built-in.o
>> drivers/built-in.o: In function `qcom_pm_collapse':
>> :(.text+0xaf44c): undefined reference to `qcom_scm_cpu_power_down'
>> drivers/built-in.o: In function `qcom_cpuidle_init':
>> :(.init.text+0x9508): undefined reference to `qcom_scm_set_warm_boot_addr'
>> make: *** [vmlinux] Error 1
>>
>>
>> It appears the calling functions in drivers/soc/qcom/spm.c get included by
>> CONFIG_QCOM_PM which is part of multi_v7_defconfig but the missing functions
>> from drivers/firmware/qcom_scm.c only get included by CONFIG_QCOM_SCM if SMP is
>> selected. I am not sure if the correct approach is to remove CONFIG_QCOM_PM from
>> multi_v7_defconfig or to remove 'if SMP' from CONFIG_QCOM_SCM, or something else
>> entirely. Thoughts?
>>
>>
> 
> CONFIG_QCOM_PM should select CONFIG_QCOM_SCM unconditionally.
> 

Ok thanks, I can send a quick patch.

Regards,
Dave

Re: Build error with !CONFIG_SMP in v4.2-rc1 on arm multi_v7_defconfig

[Lina Iyer]

On Fri, Jul 10 2015 at 14:29 -0600, Dave Gerlach wrote:
>On 07/10/2015 02:36 PM, Stephen Boyd wrote:
>> On 07/10/2015 12:31 PM, Dave Gerlach wrote:
>>> Hello,
>>> I am seeing the following error when building v4.2-rc1 for arm with
>>> multi_v7_defconfig with CONFIG_SMP=n:
>>>
>>>  LINK    vmlinux
>>>   LD      vmlinux.o
>>>   MODPOST vmlinux.o
>>>   GEN     .version
>>>   CHK     include/generated/compile.h
>>>   UPD     include/generated/compile.h
>>>   CC      init/version.o
>>>   LD      init/built-in.o
>>> drivers/built-in.o: In function `qcom_pm_collapse':
>>> :(.text+0xaf44c): undefined reference to `qcom_scm_cpu_power_down'
>>> drivers/built-in.o: In function `qcom_cpuidle_init':
>>> :(.init.text+0x9508): undefined reference to `qcom_scm_set_warm_boot_addr'
>>> make: *** [vmlinux] Error 1
>>>
>>>
>>> It appears the calling functions in drivers/soc/qcom/spm.c get included by
>>> CONFIG_QCOM_PM which is part of multi_v7_defconfig but the missing functions
>>> from drivers/firmware/qcom_scm.c only get included by CONFIG_QCOM_SCM if SMP is
>>> selected. I am not sure if the correct approach is to remove CONFIG_QCOM_PM from
>>> multi_v7_defconfig or to remove 'if SMP' from CONFIG_QCOM_SCM, or something else
>>> entirely. Thoughts?
>>>
>>>
>>
>> CONFIG_QCOM_PM should select CONFIG_QCOM_SCM unconditionally.
>>
>
>Ok thanks, I can send a quick patch.
>
I sent one a few minutes ago, in reply to your mail :)

Re: Build error with !CONFIG_SMP in v4.2-rc1 on arm multi_v7_defconfig

[Dave Gerlach]

On 07/10/2015 03:39 PM, Lina Iyer wrote:
> On Fri, Jul 10 2015 at 14:29 -0600, Dave Gerlach wrote:
>> On 07/10/2015 02:36 PM, Stephen Boyd wrote:
>>> On 07/10/2015 12:31 PM, Dave Gerlach wrote:
>>>> Hello,
>>>> I am seeing the following error when building v4.2-rc1 for arm with
>>>> multi_v7_defconfig with CONFIG_SMP=n:
>>>>
>>>>  LINK    vmlinux
>>>>   LD      vmlinux.o
>>>>   MODPOST vmlinux.o
>>>>   GEN     .version
>>>>   CHK     include/generated/compile.h
>>>>   UPD     include/generated/compile.h
>>>>   CC      init/version.o
>>>>   LD      init/built-in.o
>>>> drivers/built-in.o: In function `qcom_pm_collapse':
>>>> :(.text+0xaf44c): undefined reference to `qcom_scm_cpu_power_down'
>>>> drivers/built-in.o: In function `qcom_cpuidle_init':
>>>> :(.init.text+0x9508): undefined reference to `qcom_scm_set_warm_boot_addr'
>>>> make: *** [vmlinux] Error 1
>>>>
>>>>
>>>> It appears the calling functions in drivers/soc/qcom/spm.c get included by
>>>> CONFIG_QCOM_PM which is part of multi_v7_defconfig but the missing functions
>>>> from drivers/firmware/qcom_scm.c only get included by CONFIG_QCOM_SCM if SMP is
>>>> selected. I am not sure if the correct approach is to remove CONFIG_QCOM_PM
>>>> from
>>>> multi_v7_defconfig or to remove 'if SMP' from CONFIG_QCOM_SCM, or something
>>>> else
>>>> entirely. Thoughts?
>>>>
>>>>
>>>
>>> CONFIG_QCOM_PM should select CONFIG_QCOM_SCM unconditionally.
>>>
>>
>> Ok thanks, I can send a quick patch.
>>
> I sent one a few minutes ago, in reply to your mail :)

Thank you! Does indeed solve the problem.

Regards,
Dave

Re: [PATCH] drivers: qcom: Select QCOM_SCM unconditionally for QCOM_PM

[Stephen Boyd]

On 07/10/2015 01:18 PM, Lina Iyer wrote:
> Enable QCOM_SCM for QCOM power management driver
>
> Signed-off-by: Lina Iyer <lina.iyer@linaro.org>

Acked-by: Stephen Boyd <sboyd@codeaurora.org>

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project

Re: [PATCH] drivers: qcom: Select QCOM_SCM unconditionally for QCOM_PM

[Andy Gross]

On Fri, Jul 10, 2015 at 02:18:00PM -0600, Lina Iyer wrote:
> Enable QCOM_SCM for QCOM power management driver
> 
> Signed-off-by: Lina Iyer <lina.iyer@linaro.org>

Acked-by: Andy Gross <agross@codeaurora.org>

-- 
Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

Re: [PATCH] drivers: qcom: Select QCOM_SCM unconditionally for QCOM_PM

[Andy Gross]

On Tue, Jul 14, 2015 at 04:54:12PM -0500, Andy Gross wrote:
> On Fri, Jul 10, 2015 at 02:18:00PM -0600, Lina Iyer wrote:
> > Enable QCOM_SCM for QCOM power management driver
> > 
> > Signed-off-by: Lina Iyer <lina.iyer@linaro.org>
> 
> Acked-by: Andy Gross <agross@codeaurora.org>

Applied.

-- 
Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project