From: Vaibhav Jain <vaibhav@linux.ibm.com>
To: "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com>, mpe@ellerman.id.au
Cc: Oliver O'Halloran <oohall@gmail.com>,
linuxppc-dev@lists.ozlabs.org,
"Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com>
Subject: Re: [PATCH v2 1/2] powerpc/nvdimm: Use HCALL error as the return value
Date: Wed, 04 Sep 2019 11:09:01 +0530 [thread overview]
Message-ID: <87y2z4tybu.fsf@vajain21.in.ibm.com> (raw)
In-Reply-To: <20190903123452.28620-1-aneesh.kumar@linux.ibm.com>
Hi Aneesh,
Thanks for the patch. Minor review comments below:
"Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com> writes:
> This simplifies the error handling and also enable us to switch to
> H_SCM_QUERY hcall in a later patch on H_OVERLAP error.
>
> We also do some kernel print formatting fixup in this patch.
>
> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
> ---
> arch/powerpc/platforms/pseries/papr_scm.c | 26 ++++++++++-------------
> 1 file changed, 11 insertions(+), 15 deletions(-)
>
> diff --git a/arch/powerpc/platforms/pseries/papr_scm.c b/arch/powerpc/platforms/pseries/papr_scm.c
> index a5ac371a3f06..3bef4d298ac6 100644
> --- a/arch/powerpc/platforms/pseries/papr_scm.c
> +++ b/arch/powerpc/platforms/pseries/papr_scm.c
> @@ -66,28 +66,22 @@ static int drc_pmem_bind(struct papr_scm_priv *p)
> } while (rc == H_BUSY);
>
> if (rc) {
> - /* H_OVERLAP needs a separate error path */
> - if (rc == H_OVERLAP)
> - return -EBUSY;
> -
> dev_err(&p->pdev->dev, "bind err: %lld\n", rc);
> - return -ENXIO;
> + return rc;
> }
>
> p->bound_addr = saved;
> -
> - dev_dbg(&p->pdev->dev, "bound drc %x to %pR\n", p->drc_index, &p->res);
> -
> - return 0;
> + dev_dbg(&p->pdev->dev, "bound drc 0x%x to %pR\n", p->drc_index, &p->res);
s/0x%x/%#x/
> + return rc;
rc == 0 always at this point hence 'return 0' should still work.
> }
>
> -static int drc_pmem_unbind(struct papr_scm_priv *p)
> +static void drc_pmem_unbind(struct papr_scm_priv *p)
> {
> unsigned long ret[PLPAR_HCALL_BUFSIZE];
> uint64_t token = 0;
> int64_t rc;
>
> - dev_dbg(&p->pdev->dev, "unbind drc %x\n", p->drc_index);
> + dev_dbg(&p->pdev->dev, "unbind drc 0x%x\n", p->drc_index);
>
> /* NB: unbind has the same retry requirements as drc_pmem_bind() */
> do {
> @@ -110,10 +104,10 @@ static int drc_pmem_unbind(struct papr_scm_priv *p)
> if (rc)
> dev_err(&p->pdev->dev, "unbind error: %lld\n", rc);
> else
> - dev_dbg(&p->pdev->dev, "unbind drc %x complete\n",
> + dev_dbg(&p->pdev->dev, "unbind drc 0x%x complete\n",
> p->drc_index);
>
> - return rc == H_SUCCESS ? 0 : -ENXIO;
> + return;
I would prefer drc_pmem_unbind() to still return error from the
HCALL. The caller can descide if it wants to ignore the error or not.
> }
>
> static int papr_scm_meta_get(struct papr_scm_priv *p,
> @@ -436,14 +430,16 @@ static int papr_scm_probe(struct platform_device *pdev)
> rc = drc_pmem_bind(p);
>
> /* If phyp says drc memory still bound then force unbound and retry */
> - if (rc == -EBUSY) {
> + if (rc == H_OVERLAP) {
> dev_warn(&pdev->dev, "Retrying bind after unbinding\n");
> drc_pmem_unbind(p);
> rc = drc_pmem_bind(p);
> }
>
> - if (rc)
> + if (rc != H_SUCCESS) {
> + rc = -ENXIO;
> goto err;
> + }
>
> /* setup the resource for the newly bound range */
> p->res.start = p->bound_addr;
> --
> 2.21.0
>
--
Vaibhav Jain <vaibhav@linux.ibm.com>
Linux Technology Center, IBM India Pvt. Ltd.
next prev parent reply other threads:[~2019-09-04 5:41 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-03 12:34 [PATCH v2 1/2] powerpc/nvdimm: Use HCALL error as the return value Aneesh Kumar K.V
2019-09-03 12:34 ` [PATCH v2 2/2] powerpc/nvdimm: use H_SCM_QUERY hcall on H_OVERLAP error Aneesh Kumar K.V
2019-09-04 6:59 ` Vaibhav Jain
2019-09-24 10:59 ` Aneesh Kumar K.V
2019-09-04 5:39 ` Vaibhav Jain [this message]
2019-09-24 11:02 ` [PATCH v2 1/2] powerpc/nvdimm: Use HCALL error as the return value Aneesh Kumar K.V
2019-09-25 11:05 ` Michael Ellerman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87y2z4tybu.fsf@vajain21.in.ibm.com \
--to=vaibhav@linux.ibm.com \
--cc=aneesh.kumar@linux.ibm.com \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=oohall@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).