From 7b58c35f8d233ecb5478dc64774517d8d096e4c0 Mon Sep 17 00:00:00 2001 From: Guru Das Srinagesh Date: Wed, 5 Jul 2023 15:14:02 -0700 Subject: [PATCH] firmware: qcom-scm: Convert a few noretry calls to regular calls Since these calls are marked as "no-retry" calls, they, by design, are not retried by the driver if -EBUSY is received from the firmware. Since these calls are related to essential cryptographic functions that are required by the platform to mount filesystems, they need to be retried when -EBUSY is received. Convert them to regular SCM calls. Change-Id: I672f44730eae87a62c48c3a948aa7497a615217f Signed-off-by: Guru Das Srinagesh --- drivers/firmware/qcom_scm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c index 180d04cc1710..f9bcb40e195e 100644 --- a/drivers/firmware/qcom_scm.c +++ b/drivers/firmware/qcom_scm.c @@ -1962,7 +1962,7 @@ int qcom_scm_config_set_ice_key(uint32_t index, phys_addr_t paddr, size_t size, QCOM_SCM_VAL, QCOM_SCM_VAL), }; - return qcom_scm_call_noretry(__scm->dev, &desc, NULL); + return qcom_scm_call(__scm->dev, &desc, NULL); } EXPORT_SYMBOL(qcom_scm_config_set_ice_key); @@ -1977,7 +1977,7 @@ int qcom_scm_clear_ice_key(uint32_t index, unsigned int ce) .arginfo = QCOM_SCM_ARGS(2), }; - return qcom_scm_call_noretry(__scm->dev, &desc, NULL); + return qcom_scm_call(__scm->dev, &desc, NULL); } EXPORT_SYMBOL(qcom_scm_clear_ice_key); @@ -1996,7 +1996,7 @@ int qcom_scm_derive_raw_secret(phys_addr_t paddr_key, size_t size_key, desc.args[3] = size_secret; desc.arginfo = QCOM_SCM_ARGS(4, QCOM_SCM_RW, QCOM_SCM_VAL, QCOM_SCM_RW, QCOM_SCM_VAL); - return qcom_scm_call_noretry(__scm->dev, &desc, NULL); + return qcom_scm_call(__scm->dev, &desc, NULL); } EXPORT_SYMBOL(qcom_scm_derive_raw_secret);