scsi: ufs: exynos: Don't resume FMP when crypto support is disabled

ebiggers · martinkpetersen · commit 47398f49dab8 · 2024-07-22T20:52:15.000-04:00
If exynos_ufs_fmp_init() did not enable FMP support, then exynos_ufs_fmp_resume() should not execute the FMP-related SMC calls. Fixes: c96499f ("scsi: ufs: exynos: Add support for Flash Memory Protector (FMP)") Signed-off-by: Eric Biggers <ebiggers@google.com> Link: https://lore.kernel.org/r/20240721183840.209284-1-ebiggers@kernel.org Reviewed-by: Bart Van Assche <bvanassche@acm.org> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
diff --git a/drivers/ufs/host/ufs-exynos.c b/drivers/ufs/host/ufs-exynos.c
@@ -1293,6 +1293,9 @@ static void exynos_ufs_fmp_resume(struct ufs_hba *hba)
 {
 	struct arm_smccc_res res;
 
+	if (!(hba->caps & UFSHCD_CAP_CRYPTO))
+		return;
+
 	arm_smccc_smc(SMC_CMD_FMP_SECURITY, 0, SMU_EMBEDDED, CFG_DESCTYPE_3,
 		      0, 0, 0, 0, &res);
 	if (res.a0)

Original file line number	Diff line number	Diff line change
`@@ -1293,6 +1293,9 @@ static void exynos_ufs_fmp_resume(struct ufs_hba *hba)`
`1293`	`1293`	`{`
`1294`	`1294`	`struct arm_smccc_res res;`
`1295`	`1295`
	`1296`	`+ if (!(hba->caps & UFSHCD_CAP_CRYPTO))`
	`1297`	`+ return;`
	`1298`	`+`
`1296`	`1299`	`arm_smccc_smc(SMC_CMD_FMP_SECURITY, 0, SMU_EMBEDDED, CFG_DESCTYPE_3,`
`1297`	`1300`	`0, 0, 0, 0, &res);`
`1298`	`1301`	`if (res.a0)`