Skip to contentSkip to conversation

scsi: ufs-qcom: only select QCOM_SCM if SCSI_UFS_CRYPTO

PATCH Applied Eric Biggers 3 participants 4 messages Nov 14, 2020 – Dec 29, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 scsi: ufs-qcom: only select QCOM_SCM if SCSI_UFS_CRYPTO

From: Eric Biggers <[email protected]>

QCOM_SCM is only needed to make the qcom_scm_*() calls in ufs-qcom-ice.c, which is only compiled when SCSI_UFS_CRYPTO=y. So don't unnecessarily enable QCOM_SCM when SCSI_UFS_CRYPTO=n.

---
 drivers/scsi/ufs/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/ufs/Kconfig +1 -1
index dcdb4eb1f90ba..3f6dfed4fe84b 100644
@@ -99,7 +99,7 @@ config SCSI_UFS_DWC_TC_PLATFORM
 config SCSI_UFS_QCOM
 	tristate "QCOM specific hooks to UFS controller platform driver"
 	depends on SCSI_UFSHCD_PLATFORM && ARCH_QCOM
-	select QCOM_SCM
+	select QCOM_SCM if SCSI_UFS_CRYPTO
 	select RESET_CONTROLLER
 	help
 	  This selects the QCOM specific additions to UFSHCD platform driver.
Signature · 1 line
2.29.2
#1 lore raw

Eric,

Quoted 3 lines

QCOM_SCM is only needed to make the qcom_scm_*() calls in ufs-qcom-ice.c, which is only compiled when SCSI_UFS_CRYPTO=y. So don't unnecessarily enable QCOM_SCM when SCSI_UFS_CRYPTO=n.

Applied to 5.11/scsi-staging, thanks!

Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering
#2 lore raw
In reply to Eric Biggers
Quoted 3 lines · Eric Biggers

QCOM_SCM is only needed to make the qcom_scm_*() calls in ufs-qcom-ice.c, which is only compiled when SCSI_UFS_CRYPTO=y. So don't unnecessarily enable QCOM_SCM when SCSI_UFS_CRYPTO=n.

Applied to 5.11/scsi-queue, thanks!

[1/1] scsi: ufs-qcom: Only select QCOM_SCM if SCSI_UFS_CRYPTO

      https://git.kernel.org/mkp/scsi/c/6ac63216a7af
Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering
#3 lore raw
In reply to Eric Biggers
This patch was applied to qcom/linux.git (refs/heads/for-next):

Hello:

This patch was applied to qcom/linux.git (refs/heads/for-next):

Quoted 9 lines · On Fri, 13 Nov 2020 16:47:54 -0800 you wrote:

From: Eric Biggers <[email protected]>

QCOM_SCM is only needed to make the qcom_scm_*() calls in ufs-qcom-ice.c, which is only compiled when SCSI_UFS_CRYPTO=y. So don't unnecessarily enable QCOM_SCM when SCSI_UFS_CRYPTO=n.

[...]

Here is the summary with links:
- scsi: ufs-qcom: only select QCOM_SCM if SCSI_UFS_CRYPTO

    https://git.kernel.org/qcom/c/6ac63216a7af

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html