[PATCH v3 0/2] scsi: ufs: convert probe to use dev_err_probe()

[PATCH v3 0/2] scsi: ufs: convert probe to use dev_err_probe()

[Brian Masney]

The following two log messages are shown on bootup due to an
-EPROBE_DEFER when booting on a Qualcomm sa8775p development board:

    ufshcd-qcom 1d84000.ufs: ufshcd_variant_hba_init: variant qcom init
        failed err -517
    ufshcd-qcom 1d84000.ufs: Initialization failed

This patch series converts the relevant two probe functions over to use
dev_err_probe() so that these messages are not shown on bootup.

Changes since v2
https://lore.kernel.org/lkml/20230809191054.2197963-1-bmasney@redhat.com/
- Add error code to message in second patch

Changes since v1
https://lore.kernel.org/lkml/20230808142650.1713432-1-bmasney@redhat.com/
- Dropped code cleanup from first patch

Brian Masney (2):
  scsi: ufs: core: convert to dev_err_probe() in hba_init
  scsi: ufs: host: convert to dev_err_probe() in pltfrm_init

 drivers/ufs/core/ufshcd.c        | 5 +++--
 drivers/ufs/host/ufshcd-pltfrm.c | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

-- 
2.41.0

[PATCH v3 1/2] scsi: ufs: core: convert to dev_err_probe() in hba_init

[Brian Masney]

Convert ufshcd_variant_hba_init() over to use dev_err_probe() to avoid
log messages like the following on bootup:

    ufshcd-qcom 1d84000.ufs: ufshcd_variant_hba_init: variant qcom init
        failed err -517

Signed-off-by: Brian Masney <bmasney@redhat.com>
---
Changes since v2
- None

Changes since v1
- Dropped code cleanup

 drivers/ufs/core/ufshcd.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
index 129446775796..409d176542e1 100644
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -9235,8 +9235,9 @@ static int ufshcd_variant_hba_init(struct ufs_hba *hba)
 
 	err = ufshcd_vops_init(hba);
 	if (err)
-		dev_err(hba->dev, "%s: variant %s init failed err %d\n",
-			__func__, ufshcd_get_var_name(hba), err);
+		dev_err_probe(hba->dev, err,
+			      "%s: variant %s init failed err %d\n",
+			      __func__, ufshcd_get_var_name(hba), err);
 out:
 	return err;
 }
-- 
2.41.0

[PATCH v3 2/2] scsi: ufs: host: convert to dev_err_probe() in pltfrm_init

[Brian Masney]

Convert ufshcd_pltfrm_init() over to use dev_err_probe() to avoid
the following log message on bootup due to an -EPROBE_DEFER return
code:

    ufshcd-qcom 1d84000.ufs: Initialization failed

While this line is changed, let's also go ahead and add the error code
to the message as well.

Signed-off-by: Brian Masney <bmasney@redhat.com>
---
Changes since v2
- Add error code to message

Changes since v1
- None

 drivers/ufs/host/ufshcd-pltfrm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/ufs/host/ufshcd-pltfrm.c b/drivers/ufs/host/ufshcd-pltfrm.c
index 0b7430033047..c81a14f9eaf5 100644
--- a/drivers/ufs/host/ufshcd-pltfrm.c
+++ b/drivers/ufs/host/ufshcd-pltfrm.c
@@ -373,7 +373,8 @@ int ufshcd_pltfrm_init(struct platform_device *pdev,
 
 	err = ufshcd_init(hba, mmio_base, irq);
 	if (err) {
-		dev_err(dev, "Initialization failed\n");
+		dev_err_probe(dev, err, "Initialization failed with error %d\n",
+			      err);
 		goto dealloc_host;
 	}
 
-- 
2.41.0

Re: [PATCH v3 1/2] scsi: ufs: core: convert to dev_err_probe() in hba_init

[Bart Van Assche]

On 8/14/23 11:43, Brian Masney wrote:
> diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
> index 129446775796..409d176542e1 100644
> --- a/drivers/ufs/core/ufshcd.c
> +++ b/drivers/ufs/core/ufshcd.c
> @@ -9235,8 +9235,9 @@ static int ufshcd_variant_hba_init(struct ufs_hba *hba)
>   
>   	err = ufshcd_vops_init(hba);
>   	if (err)
> -		dev_err(hba->dev, "%s: variant %s init failed err %d\n",
> -			__func__, ufshcd_get_var_name(hba), err);
> +		dev_err_probe(hba->dev, err,
> +			      "%s: variant %s init failed err %d\n",
> +			      __func__, ufshcd_get_var_name(hba), err);
>   out:
>   	return err;
>   }

This opportunity could have been used to improve the grammar of the reported
error message. Anyway:

Reviewed-by: Bart Van Assche <bvanassche@acm.org>

Re: [PATCH v3 1/2] scsi: ufs: core: convert to dev_err_probe() in hba_init

[Brian Masney]

On Mon, Aug 14, 2023 at 12:31:31PM -0700, Bart Van Assche wrote:
> On 8/14/23 11:43, Brian Masney wrote:
> > diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
> > index 129446775796..409d176542e1 100644
> > --- a/drivers/ufs/core/ufshcd.c
> > +++ b/drivers/ufs/core/ufshcd.c
> > @@ -9235,8 +9235,9 @@ static int ufshcd_variant_hba_init(struct ufs_hba *hba)
> >   	err = ufshcd_vops_init(hba);
> >   	if (err)
> > -		dev_err(hba->dev, "%s: variant %s init failed err %d\n",
> > -			__func__, ufshcd_get_var_name(hba), err);
> > +		dev_err_probe(hba->dev, err,
> > +			      "%s: variant %s init failed err %d\n",
> > +			      __func__, ufshcd_get_var_name(hba), err);
> >   out:
> >   	return err;
> >   }
> 
> This opportunity could have been used to improve the grammar of the reported
> error message. Anyway:

That's what I originally did in v1, however I was asked to split out the
cleanup into a different patch. Split out, I think the cleanup on it's
own isn't worth it's own patch, so that's why I dropped it.

https://lore.kernel.org/lkml/20230808142650.1713432-2-bmasney@redhat.com/

> Reviewed-by: Bart Van Assche <bvanassche@acm.org>

Thanks!

Brian

Re: [PATCH v3 1/2] scsi: ufs: core: convert to dev_err_probe() in hba_init

[Bart Van Assche]

On 8/14/23 14:18, Brian Masney wrote:
> On Mon, Aug 14, 2023 at 12:31:31PM -0700, Bart Van Assche wrote:
>> On 8/14/23 11:43, Brian Masney wrote:
>>> diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
>>> index 129446775796..409d176542e1 100644
>>> --- a/drivers/ufs/core/ufshcd.c
>>> +++ b/drivers/ufs/core/ufshcd.c
>>> @@ -9235,8 +9235,9 @@ static int ufshcd_variant_hba_init(struct ufs_hba *hba)
>>>    	err = ufshcd_vops_init(hba);
>>>    	if (err)
>>> -		dev_err(hba->dev, "%s: variant %s init failed err %d\n",
>>> -			__func__, ufshcd_get_var_name(hba), err);
>>> +		dev_err_probe(hba->dev, err,
>>> +			      "%s: variant %s init failed err %d\n",
>>> +			      __func__, ufshcd_get_var_name(hba), err);
>>>    out:
>>>    	return err;
>>>    }
>>
>> This opportunity could have been used to improve the grammar of the reported
>> error message. Anyway:
> 
> That's what I originally did in v1, however I was asked to split out the
> cleanup into a different patch. Split out, I think the cleanup on it's
> own isn't worth it's own patch, so that's why I dropped it.
> 
> https://lore.kernel.org/lkml/20230808142650.1713432-2-bmasney@redhat.com/

Changing an error message and introducing dev_err_probe() at the same time is
fine. I don't think that is what the reviewer complained about. The complaint
probably was about renaming 'err' into 'ret' and about changing 'goto out'
into 'return 0'?

Thanks,

Bart.

Re: [PATCH v3 2/2] scsi: ufs: host: convert to dev_err_probe() in pltfrm_init

[Bao D. Nguyen]

> diff --git a/drivers/ufs/host/ufshcd-pltfrm.c b/drivers/ufs/host/ufshcd-pltfrm.c
> index 0b7430033047..c81a14f9eaf5 100644
> --- a/drivers/ufs/host/ufshcd-pltfrm.c
> +++ b/drivers/ufs/host/ufshcd-pltfrm.c
> @@ -373,7 +373,8 @@ int ufshcd_pltfrm_init(struct platform_device *pdev,
>   
>   	err = ufshcd_init(hba, mmio_base, irq);
>   	if (err) {
> -		dev_err(dev, "Initialization failed\n");
> +		dev_err_probe(dev, err, "Initialization failed with error %d\n",
> +			      err);
>   		goto dealloc_host;
>   	}
>   

Reviewed-by: Bao D. Nguyen <quic_nguyenb@quicinc.com>

Re: [PATCH v3 0/2] scsi: ufs: convert probe to use dev_err_probe()

[Martin K. Petersen]

Brian,

> The following two log messages are shown on bootup due to an
> -EPROBE_DEFER when booting on a Qualcomm sa8775p development board:
>
>     ufshcd-qcom 1d84000.ufs: ufshcd_variant_hba_init: variant qcom init
>         failed err -517
>     ufshcd-qcom 1d84000.ufs: Initialization failed
>
> This patch series converts the relevant two probe functions over to use
> dev_err_probe() so that these messages are not shown on bootup.

Applied to 6.6/scsi-staging, thanks!

-- 
Martin K. Petersen	Oracle Linux Engineering

Re: [PATCH v3 0/2] scsi: ufs: convert probe to use dev_err_probe()

[Martin K. Petersen]

On Mon, 14 Aug 2023 14:43:50 -0400, Brian Masney wrote:

> The following two log messages are shown on bootup due to an
> -EPROBE_DEFER when booting on a Qualcomm sa8775p development board:
> 
>     ufshcd-qcom 1d84000.ufs: ufshcd_variant_hba_init: variant qcom init
>         failed err -517
>     ufshcd-qcom 1d84000.ufs: Initialization failed
> 
> [...]

Applied to 6.6/scsi-queue, thanks!

[1/2] scsi: ufs: core: convert to dev_err_probe() in hba_init
      https://git.kernel.org/mkp/scsi/c/137523237172
[2/2] scsi: ufs: host: convert to dev_err_probe() in pltfrm_init
      https://git.kernel.org/mkp/scsi/c/517f8eb3fa64

-- 
Martin K. Petersen	Oracle Linux Engineering