Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1616880

[PATCH v2] soc: qcom: smsm: Improve error handling, quiesce probe deferral

Show all headers | View raw

Don't use size if info indicates an error condition. Previously a
non-ENOENT error (such as -EPROBE_DEFER) would lead to size being used
even though it hadn't necessarily been initialized in qcom_smem_get.

Don't print an error message in the -EPROBE_DEFER case.

Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>

---
v2:
- Rewrite based on Bjorn's suggestion.
- Don't check for -EPROBE_DEFER again after qcom_smem_alloc was called
  in qcom_smsm_probe. This point is only reached if smsm_get_size_info
  returned success, which can only happen if probe deferral is over.
v1:
- was "[PATCH 1/2] soc: qcom: smsm: Handle probe deferral"
---
 drivers/soc/qcom/smsm.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/soc/qcom/smsm.c b/drivers/soc/qcom/smsm.c
index d0337b2a71c8..dc540ea92e9d 100644
--- a/drivers/soc/qcom/smsm.c
+++ b/drivers/soc/qcom/smsm.c
@@ -439,14 +439,15 @@ static int smsm_get_size_info(struct qcom_smsm *smsm)
 	} *info;
 
 	info = qcom_smem_get(QCOM_SMEM_HOST_ANY, SMEM_SMSM_SIZE_INFO, &size);
-	if (PTR_ERR(info) == -ENOENT || size != sizeof(*info)) {
+	if (IS_ERR(info) && PTR_ERR(info) != -ENOENT) {
+		if (PTR_ERR(info) != -EPROBE_DEFER)
+			dev_err(smsm->dev, "unable to retrieve smsm size info\n");
+		return PTR_ERR(info);
+	} else if (IS_ERR(info) || size != sizeof(*info)) {
 		dev_warn(smsm->dev, "no smsm size info, using defaults\n");
 		smsm->num_entries = SMSM_DEFAULT_NUM_ENTRIES;
 		smsm->num_hosts = SMSM_DEFAULT_NUM_HOSTS;
 		return 0;
-	} else if (IS_ERR(info)) {
-		dev_err(smsm->dev, "unable to retrieve smsm size info\n");
-		return PTR_ERR(info);
 	}
 
 	smsm->num_entries = info->num_entries;
-- 
2.11.0

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

Re: [PATCH 1/2] soc: qcom: smsm: Handle probe deferral Bjorn Andersson <bjorn.andersson@linaro.org> - 2017-03-28 08:20 +0200
  Re: [PATCH 1/2] soc: qcom: smsm: Handle probe deferral Jonathan Neuschäfer <j.neuschaefer@gmx.net> - 2017-04-04 04:40 +0200
    Re: [PATCH 1/2] soc: qcom: smsm: Handle probe deferral Bjorn Andersson <bjorn.andersson@linaro.org> - 2017-04-05 05:50 +0200
    [PATCH v2] soc: qcom: smsm: Improve error handling, quiesce probe deferral Jonathan Neuschäfer <j.neuschaefer@gmx.net> - 2017-04-05 14:20 +0200
      Re: [PATCH v2] soc: qcom: smsm: Improve error handling, quiesce  probe deferral Bjorn Andersson <bjorn.andersson@linaro.org> - 2017-04-05 19:10 +0200

csiph-web