From: Eddie James <eajames@linux.ibm.com>
To: Joel Stanley <joel@jms.id.au>, Jeremy Kerr <jk@ozlabs.org>,
Alistar Popple <alistair@popple.id.au>
Cc: linux-fsi@lists.ozlabs.org, linux-kernel@vger.kernel.org,
Dan Carpenter <dan.carpenter@oracle.com>,
Greg KH <gregkh@linuxfoundation.org>
Subject: Re: [PATCH 2/2] fsi: scom: Remove retries in indirect scoms
Date: Mon, 10 Jan 2022 17:13:45 -0600 [thread overview]
Message-ID: <82083174-fccb-a9e2-616f-7a706958e2da@linux.ibm.com> (raw)
In-Reply-To: <20211207033811.518981-3-joel@jms.id.au>
On 12/6/21 21:38, Joel Stanley wrote:
> In commit f72ddbe1d7b7 ("fsi: scom: Remove retries") the retries were
> removed from get and put scoms. That patch missed the retires in get and
> put indirect scom.
>
> For the same reason, remove them from the scom driver to allow the
> caller to decide to retry.
>
> This removes the following special case which would have caused the
> retry code to return early:
>
> - if ((ind_data & XSCOM_DATA_IND_COMPLETE) || (err != SCOM_PIB_BLOCKED))
> - return 0;
>
> I believe this case is handled.
Reviewed-by: Eddie James <eajames@linux.ibm.com>
>
> Fixes: f72ddbe1d7b7 ("fsi: scom: Remove retries")
> Signed-off-by: Joel Stanley <joel@jms.id.au>
> ---
> drivers/fsi/fsi-scom.c | 41 +++++++++++++++--------------------------
> 1 file changed, 15 insertions(+), 26 deletions(-)
>
> diff --git a/drivers/fsi/fsi-scom.c b/drivers/fsi/fsi-scom.c
> index 3b427f7e9027..bcb756dc9866 100644
> --- a/drivers/fsi/fsi-scom.c
> +++ b/drivers/fsi/fsi-scom.c
> @@ -145,7 +145,7 @@ static int put_indirect_scom_form0(struct scom_device *scom, uint64_t value,
> uint64_t addr, uint32_t *status)
> {
> uint64_t ind_data, ind_addr;
> - int rc, retries, err = 0;
> + int rc, err;
>
> if (value & ~XSCOM_DATA_IND_DATA)
> return -EINVAL;
> @@ -156,19 +156,14 @@ static int put_indirect_scom_form0(struct scom_device *scom, uint64_t value,
> if (rc || (*status & SCOM_STATUS_ANY_ERR))
> return rc;
>
> - for (retries = 0; retries < SCOM_MAX_IND_RETRIES; retries++) {
> - rc = __get_scom(scom, &ind_data, addr, status);
> - if (rc || (*status & SCOM_STATUS_ANY_ERR))
> - return rc;
> + rc = __get_scom(scom, &ind_data, addr, status);
> + if (rc || (*status & SCOM_STATUS_ANY_ERR))
> + return rc;
>
> - err = (ind_data & XSCOM_DATA_IND_ERR_MASK) >> XSCOM_DATA_IND_ERR_SHIFT;
> - *status = err << SCOM_STATUS_PIB_RESP_SHIFT;
> - if ((ind_data & XSCOM_DATA_IND_COMPLETE) || (err != SCOM_PIB_BLOCKED))
> - return 0;
> + err = (ind_data & XSCOM_DATA_IND_ERR_MASK) >> XSCOM_DATA_IND_ERR_SHIFT;
> + *status = err << SCOM_STATUS_PIB_RESP_SHIFT;
>
> - msleep(1);
> - }
> - return rc;
> + return 0;
> }
>
> static int put_indirect_scom_form1(struct scom_device *scom, uint64_t value,
> @@ -188,7 +183,7 @@ static int get_indirect_scom_form0(struct scom_device *scom, uint64_t *value,
> uint64_t addr, uint32_t *status)
> {
> uint64_t ind_data, ind_addr;
> - int rc, retries, err = 0;
> + int rc, err;
>
> ind_addr = addr & XSCOM_ADDR_DIRECT_PART;
> ind_data = (addr & XSCOM_ADDR_INDIRECT_PART) | XSCOM_DATA_IND_READ;
> @@ -196,21 +191,15 @@ static int get_indirect_scom_form0(struct scom_device *scom, uint64_t *value,
> if (rc || (*status & SCOM_STATUS_ANY_ERR))
> return rc;
>
> - for (retries = 0; retries < SCOM_MAX_IND_RETRIES; retries++) {
> - rc = __get_scom(scom, &ind_data, addr, status);
> - if (rc || (*status & SCOM_STATUS_ANY_ERR))
> - return rc;
> -
> - err = (ind_data & XSCOM_DATA_IND_ERR_MASK) >> XSCOM_DATA_IND_ERR_SHIFT;
> - *status = err << SCOM_STATUS_PIB_RESP_SHIFT;
> - *value = ind_data & XSCOM_DATA_IND_DATA;
> + rc = __get_scom(scom, &ind_data, addr, status);
> + if (rc || (*status & SCOM_STATUS_ANY_ERR))
> + return rc;
>
> - if ((ind_data & XSCOM_DATA_IND_COMPLETE) || (err != SCOM_PIB_BLOCKED))
> - return 0;
> + err = (ind_data & XSCOM_DATA_IND_ERR_MASK) >> XSCOM_DATA_IND_ERR_SHIFT;
> + *status = err << SCOM_STATUS_PIB_RESP_SHIFT;
> + *value = ind_data & XSCOM_DATA_IND_DATA;
>
> - msleep(1);
> - }
> - return rc;
> + return 0;
> }
>
> static int raw_put_scom(struct scom_device *scom, uint64_t value,
prev parent reply other threads:[~2022-01-10 23:14 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-07 3:38 [PATCH 0/2] fsi: scom: Error handling fixes Joel Stanley
2021-12-07 3:38 ` [PATCH 1/2] fsi: scom: Fix error handling Joel Stanley
2022-01-10 23:13 ` Eddie James
2021-12-07 3:38 ` [PATCH 2/2] fsi: scom: Remove retries in indirect scoms Joel Stanley
2022-01-10 23:13 ` Eddie James [this message]
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=82083174-fccb-a9e2-616f-7a706958e2da@linux.ibm.com \
--to=eajames@linux.ibm.com \
--cc=alistair@popple.id.au \
--cc=dan.carpenter@oracle.com \
--cc=gregkh@linuxfoundation.org \
--cc=jk@ozlabs.org \
--cc=joel@jms.id.au \
--cc=linux-fsi@lists.ozlabs.org \
--cc=linux-kernel@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.