diff options
| author | Bjorn Andersson <bjorn.andersson@linaro.org> | 2016-07-12 17:15:45 -0700 |
|---|---|---|
| committer | Bjorn Andersson <bjorn.andersson@linaro.org> | 2016-07-14 20:11:36 -0700 |
| commit | 72beb49070463147e29d4aea6aca9ec5684138e9 (patch) | |
| tree | e3f846346a794ab268a9c16415411f0be5dd16ec /drivers/remoteproc | |
| parent | b1653f23ea464b60445ee0d7cf569b3ed6fa3f0b (diff) | |
remoteproc: qcom: hexagon: Clean up mpss validation
As reported by Dan the unsigned "val" can't be negative. But instead
correcting the check for early errors here followed by a wait for the
validation result to show the error or success we can consolidate these
two parts of the validation process into the validation function.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Diffstat (limited to 'drivers/remoteproc')
| -rw-r--r-- | drivers/remoteproc/qcom_q6v5_pil.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/drivers/remoteproc/qcom_q6v5_pil.c b/drivers/remoteproc/qcom_q6v5_pil.c index 9b0e1dd6cd8b..24791886219a 100644 --- a/drivers/remoteproc/qcom_q6v5_pil.c +++ b/drivers/remoteproc/qcom_q6v5_pil.c @@ -386,7 +386,6 @@ static int q6v5_mpss_validate(struct q6v5 *qproc, const struct firmware *fw) phys_addr_t fw_addr; bool relocate; size_t size; - u32 val; int ret; int i; @@ -425,8 +424,13 @@ static int q6v5_mpss_validate(struct q6v5 *qproc, const struct firmware *fw) writel(size, qproc->rmb_base + RMB_PMI_CODE_LENGTH_REG); } - val = readl(qproc->rmb_base + RMB_MBA_STATUS_REG); - return val < 0 ? val : 0; + ret = q6v5_rmb_mba_wait(qproc, RMB_MBA_AUTH_COMPLETE, 10000); + if (ret == -ETIMEDOUT) + dev_err(qproc->dev, "MPSS authentication timed out\n"); + else if (ret < 0) + dev_err(qproc->dev, "MPSS authentication failed: %d\n", ret); + + return ret < 0 ? ret : 0; } static int q6v5_mpss_load(struct q6v5 *qproc) @@ -463,14 +467,6 @@ static int q6v5_mpss_load(struct q6v5 *qproc) goto release_firmware; ret = q6v5_mpss_validate(qproc, fw); - if (ret) - goto release_firmware; - - ret = q6v5_rmb_mba_wait(qproc, RMB_MBA_AUTH_COMPLETE, 10000); - if (ret == -ETIMEDOUT) - dev_err(qproc->dev, "MPSS authentication timed out\n"); - else if (ret < 0) - dev_err(qproc->dev, "MPSS authentication failed: %d\n", ret); release_firmware: release_firmware(fw); |