Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933494AbdDEREU (ORCPT ); Wed, 5 Apr 2017 13:04:20 -0400 Received: from mail-pf0-f172.google.com ([209.85.192.172]:33723 "EHLO mail-pf0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756091AbdDERBm (ORCPT ); Wed, 5 Apr 2017 13:01:42 -0400 Date: Wed, 5 Apr 2017 10:01:23 -0700 From: Bjorn Andersson To: Jonathan Neusch?fer Cc: linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, Andy Gross , David Brown , linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] soc: qcom: smsm: Improve error handling, quiesce probe deferral Message-ID: <20170405170123.GK70446@Bjorns-MacBook-Pro-2.local> References: <20170404023807.4ivn4pt4zv2bq4di@latitude> <20170405121048.31800-1-j.neuschaefer@gmx.net> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20170405121048.31800-1-j.neuschaefer@gmx.net> User-Agent: Mutt/1.8.0 (2017-02-23) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1925 Lines: 55 On Wed 05 Apr 05:10 PDT 2017, Jonathan Neusch?fer wrote: > 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 Reviewed-by: Bjorn Andersson Regards, Bjorn > > --- > 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 >