Re: [PATCH -next] soc: qcom: fix QCOM_AOSS_QMP dependency and build errors

[Bjorn Andersson]

On Fri 14 Jun 14:47 PDT 2019, Randy Dunlap wrote:

> From: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
> 
> Fix Kconfig warning and subsequent build errors that are caused
> when PM_GENERIC_DOMAINS=y but CONFIG_PM is not set/enabled.
> 

Thanks Randy, I thought I had all angles covered here.

Applied to our -next branch.

Regards,
Bjorn

> WARNING: unmet direct dependencies detected for PM_GENERIC_DOMAINS
>   Depends on [n]: PM [=n]
>   Selected by [m]:
>   - QCOM_AOSS_QMP [=m] && (ARCH_QCOM || COMPILE_TEST [=y]) && MAILBOX [=y] && COMMON_CLK [=y]
> 
> Fixes these build errors:
> 
> ../drivers/base/power/domain.c: In function ‘genpd_queue_power_off_work’:
> ../drivers/base/power/domain.c:485:13: error: ‘pm_wq’ undeclared (first use in this function)
>   queue_work(pm_wq, &genpd->power_off_work);
> ../drivers/base/power/domain.c:485:13: note: each undeclared identifier is reported only once for each function it appears in
> ../drivers/base/power/domain.c: In function ‘genpd_dev_pm_qos_notifier’:
> ../drivers/base/power/domain.c:675:25: error: ‘struct dev_pm_info’ has no member named ‘ignore_children’
>    if (!dev || dev->power.ignore_children)
> ../drivers/base/power/domain.c: In function ‘rtpm_status_str’:
> ../drivers/base/power/domain.c:2754:16: error: ‘struct dev_pm_info’ has no member named ‘runtime_error’
>   if (dev->power.runtime_error)
> ../drivers/base/power/domain.c:2756:21: error: ‘struct dev_pm_info’ has no member named ‘disable_depth’
>   else if (dev->power.disable_depth)
> ../drivers/base/power/domain.c:2758:21: error: ‘struct dev_pm_info’ has no member named ‘runtime_status’
>   else if (dev->power.runtime_status < ARRAY_SIZE(status_lookup))
> ../drivers/base/power/domain.c:2759:31: error: ‘struct dev_pm_info’ has no member named ‘runtime_status’
>    p = status_lookup[dev->power.runtime_status];
> ../drivers/base/power/domain_governor.c: In function ‘default_suspend_ok’:
> ../drivers/base/power/domain_governor.c:82:17: error: ‘struct dev_pm_info’ has no member named ‘ignore_children’
> 
> Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
> Cc: Bjorn Andersson <bjorn.andersson@xxxxxxxxxxxxxx>
> Cc: Bjorn Andersson <bjorn.andersson@xxxxxxxxxx>
> Cc: Andy Gross <andy.gross@xxxxxxxxxx>
> Cc: David Brown <david.brown@xxxxxxxxxx>
> ---
>  drivers/soc/qcom/Kconfig |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> --- linux-next-20190614.orig/drivers/soc/qcom/Kconfig
> +++ linux-next-20190614/drivers/soc/qcom/Kconfig
> @@ -8,7 +8,7 @@ config QCOM_AOSS_QMP
>  	tristate "Qualcomm AOSS Driver"
>  	depends on ARCH_QCOM || COMPILE_TEST
>  	depends on MAILBOX
> -	depends on COMMON_CLK
> +	depends on COMMON_CLK && PM
>  	select PM_GENERIC_DOMAINS
>  	help
>  	  This driver provides the means of communicating with and controlling
> 
>