2023-02-20 08:33:35

by Stephen Zhang

[permalink] [raw]
Subject: [PATCH] scsi: ufs: Add select to CONFIG_PM in Kconfig

From: Shida Zhang <[email protected]>

From: Shida Zhang <[email protected]>

In a configuration with CONFIG_SCSI_UFS_MEDIATEK set to 'm' and
CONFIG_PM set to 'n', errors occur at compile time:

====
../drivers/ufs/host/ufs-mediatek.c: In function ‘ufs_mtk_runtime_suspend’:
../drivers/ufs/host/ufs-mediatek.c:1621:8: error: implicit declaration of function ‘ufshcd_runtime_suspend’; did you mean ‘ufs_mtk_runtime_suspend’? [-Werror=implicit-function-declaration]
../drivers/ufs/host/ufs-mediatek.c: In function ‘ufs_mtk_runtime_resume’:
../drivers/ufs/host/ufs-mediatek.c:1636:9: error: implicit declaration of function ‘ufshcd_runtime_resume’; did you mean ‘ufs_mtk_runtime_resume’? [-Werror=implicit-function-declaration]
====

This patch fixes these by selecting CONFIG_PM from CONFIG_SCSI_UFS_MEDIATEK.

Reported-by: k2ci <[email protected]>
Signed-off-by: Shida Zhang <[email protected]>
---
drivers/ufs/host/Kconfig | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/ufs/host/Kconfig b/drivers/ufs/host/Kconfig
index 4cc2dbd79ed0..f9786f085b54 100644
--- a/drivers/ufs/host/Kconfig
+++ b/drivers/ufs/host/Kconfig
@@ -71,6 +71,7 @@ config SCSI_UFS_QCOM
config SCSI_UFS_MEDIATEK
tristate "Mediatek specific hooks to UFS controller platform driver"
depends on SCSI_UFSHCD_PLATFORM && ARCH_MEDIATEK
+ select PM
select PHY_MTK_UFS
select RESET_TI_SYSCON
help
--
2.27.0



2023-02-20 09:32:27

by Manivannan Sadhasivam

[permalink] [raw]
Subject: Re: [PATCH] scsi: ufs: Add select to CONFIG_PM in Kconfig

On Mon, Feb 20, 2023 at 04:32:56PM +0800, Stephen Zhang wrote:
> From: Shida Zhang <[email protected]>
>
> From: Shida Zhang <[email protected]>
>
> In a configuration with CONFIG_SCSI_UFS_MEDIATEK set to 'm' and
> CONFIG_PM set to 'n', errors occur at compile time:
>
> ====
> ../drivers/ufs/host/ufs-mediatek.c: In function ‘ufs_mtk_runtime_suspend’:
> ../drivers/ufs/host/ufs-mediatek.c:1621:8: error: implicit declaration of function ‘ufshcd_runtime_suspend’; did you mean ‘ufs_mtk_runtime_suspend’? [-Werror=implicit-function-declaration]
> ../drivers/ufs/host/ufs-mediatek.c: In function ‘ufs_mtk_runtime_resume’:
> ../drivers/ufs/host/ufs-mediatek.c:1636:9: error: implicit declaration of function ‘ufshcd_runtime_resume’; did you mean ‘ufs_mtk_runtime_resume’? [-Werror=implicit-function-declaration]
> ====
>
> This patch fixes these by selecting CONFIG_PM from CONFIG_SCSI_UFS_MEDIATEK.
>
> Reported-by: k2ci <[email protected]>
> Signed-off-by: Shida Zhang <[email protected]>
> ---
> drivers/ufs/host/Kconfig | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/ufs/host/Kconfig b/drivers/ufs/host/Kconfig
> index 4cc2dbd79ed0..f9786f085b54 100644
> --- a/drivers/ufs/host/Kconfig
> +++ b/drivers/ufs/host/Kconfig
> @@ -71,6 +71,7 @@ config SCSI_UFS_QCOM
> config SCSI_UFS_MEDIATEK
> tristate "Mediatek specific hooks to UFS controller platform driver"
> depends on SCSI_UFSHCD_PLATFORM && ARCH_MEDIATEK
> + select PM

Forcing a dependency is only valid if the driver won't work without it. PM is
an optional feature, so it shouldn't be forced. Moreover, in your case the
drivers were not used but instead erroring out because their definitions exist.

Here you should guard the ufs_mtk_runtime_suspend and ufs_mtk_runtime_resume
functions with CONFIG_PM instead.

Thanks,
Mani

> select PHY_MTK_UFS
> select RESET_TI_SYSCON
> help
> --
> 2.27.0
>

--
மணிவண்ணன் சதாசிவம்

Subject: Re: [PATCH] scsi: ufs: Add select to CONFIG_PM in Kconfig

Il 20/02/23 09:32, Stephen Zhang ha scritto:
> From: Shida Zhang <[email protected]>
>
> From: Shida Zhang <[email protected]>
>
> In a configuration with CONFIG_SCSI_UFS_MEDIATEK set to 'm' and
> CONFIG_PM set to 'n', errors occur at compile time:
>
> ====
> ../drivers/ufs/host/ufs-mediatek.c: In function ‘ufs_mtk_runtime_suspend’:
> ../drivers/ufs/host/ufs-mediatek.c:1621:8: error: implicit declaration of function ‘ufshcd_runtime_suspend’; did you mean ‘ufs_mtk_runtime_suspend’? [-Werror=implicit-function-declaration]
> ../drivers/ufs/host/ufs-mediatek.c: In function ‘ufs_mtk_runtime_resume’:
> ../drivers/ufs/host/ufs-mediatek.c:1636:9: error: implicit declaration of function ‘ufshcd_runtime_resume’; did you mean ‘ufs_mtk_runtime_resume’? [-Werror=implicit-function-declaration]
> ====
>

That's wrong. This driver should be made to compile for both !CONFIG_PM
and CONFIG_PM.

Regards,
Angelo

> This patch fixes these by selecting CONFIG_PM from CONFIG_SCSI_UFS_MEDIATEK.
>
> Reported-by: k2ci <[email protected]>
> Signed-off-by: Shida Zhang <[email protected]>
> ---
> drivers/ufs/host/Kconfig | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/ufs/host/Kconfig b/drivers/ufs/host/Kconfig
> index 4cc2dbd79ed0..f9786f085b54 100644
> --- a/drivers/ufs/host/Kconfig
> +++ b/drivers/ufs/host/Kconfig
> @@ -71,6 +71,7 @@ config SCSI_UFS_QCOM
> config SCSI_UFS_MEDIATEK
> tristate "Mediatek specific hooks to UFS controller platform driver"
> depends on SCSI_UFSHCD_PLATFORM && ARCH_MEDIATEK
> + select PM
> select PHY_MTK_UFS
> select RESET_TI_SYSCON
> help