A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-10 14:19:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "firmware: qcom_scm-64: Remove qcom_scm_call_do_smccc"

Browse source
This commit is contained in:
qctecmdr 2019-11-16 03:45:30 -08:00 • committed by Gerrit - the friendly Code Review server
commit 1e486afe4d
1 changed files with 20 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

46
drivers/firmware/qcom_scm-64.c
View file

@ -90,31 +90,6 @@ static void __qcom_scm_call_do_quirk(const struct qcom_scm_desc *desc,
} while (res->a0 == QCOM_SCM_INTERRUPTED);
}
static void qcom_scm_call_do_smccc(const struct qcom_scm_desc *desc,
struct arm_smccc_res *res, u64 x5, bool atomic)
{
int retry_count = 0;
if (atomic) {
__qcom_scm_call_do_quirk(desc, res, x5, ARM_SMCCC_FAST_CALL);
return;
}
do {
mutex_lock(&qcom_scm_lock);
__qcom_scm_call_do_quirk(desc, res, x5, ARM_SMCCC_STD_CALL);
mutex_unlock(&qcom_scm_lock);
if (res->a0 == QCOM_SCM_V2_EBUSY) {
if (retry_count++ > QCOM_SCM_EBUSY_MAX_RETRY)
break;
msleep(QCOM_SCM_EBUSY_WAIT_MS);
}
} while (res->a0 == QCOM_SCM_V2_EBUSY);
}
static int ___qcom_scm_call_smccc(struct device *dev,
struct qcom_scm_desc *desc, bool atomic)
{
@ -159,7 +134,26 @@ static int ___qcom_scm_call_smccc(struct device *dev,
x5 = args_phys;
}
qcom_scm_call_do_smccc(desc, &res, x5, atomic);
if (atomic) {
__qcom_scm_call_do_quirk(desc, &res, x5, ARM_SMCCC_FAST_CALL);
} else {
int retry_count = 0;
do {
mutex_lock(&qcom_scm_lock);
__qcom_scm_call_do_quirk(desc, &res, x5,
ARM_SMCCC_STD_CALL);
mutex_unlock(&qcom_scm_lock);
if (res.a0 == QCOM_SCM_V2_EBUSY) {
if (retry_count++ > QCOM_SCM_EBUSY_MAX_RETRY)
break;
msleep(QCOM_SCM_EBUSY_WAIT_MS);
}
} while (res.a0 == QCOM_SCM_V2_EBUSY);
}
if (args_virt) {
dma_unmap_single(dev, args_phys, alloc_len, DMA_TO_DEVICE);