From: Ivan Bornyakov <i.bornyakov@metrotek.ru>
To: Conor Dooley <conor.dooley@microchip.com>,
Moritz Fischer <mdf@kernel.org>, Wu Hao <hao.wu@intel.com>,
Xu Yilun <yilun.xu@intel.com>, Tom Rix <trix@redhat.com>
Cc: Ivan Bornyakov <i.bornyakov@metrotek.ru>,
linux-fpga@vger.kernel.org, linux-kernel@vger.kernel.org,
system@metrotek.ru
Subject: [PATCH v2 2/3] fpga: microchip-spi: rewrite status polling in a time measurable way
Date: Mon, 26 Dec 2022 17:23:25 +0300 [thread overview]
Message-ID: <20221226142326.8111-3-i.bornyakov@metrotek.ru> (raw)
In-Reply-To: <20221226142326.8111-1-i.bornyakov@metrotek.ru>
Original busy loop with retries count in mpf_poll_status() is not too
reliable, as it takes different times on different systems. Replace it
with read_poll_timeout() macro.
Fixes: 5f8d4a900830 ("fpga: microchip-spi: add Microchip MPF FPGA manager")
Signed-off-by: Ivan Bornyakov <i.bornyakov@metrotek.ru>
---
drivers/fpga/microchip-spi.c | 25 +++++++++++--------------
1 file changed, 11 insertions(+), 14 deletions(-)
diff --git a/drivers/fpga/microchip-spi.c b/drivers/fpga/microchip-spi.c
index e72fedd93a27..f3ddfab87499 100644
--- a/drivers/fpga/microchip-spi.c
+++ b/drivers/fpga/microchip-spi.c
@@ -6,6 +6,7 @@
#include <asm/unaligned.h>
#include <linux/delay.h>
#include <linux/fpga/fpga-mgr.h>
+#include <linux/iopoll.h>
#include <linux/module.h>
#include <linux/of_device.h>
#include <linux/spi/spi.h>
@@ -33,7 +34,7 @@
#define MPF_BITS_PER_COMPONENT_SIZE 22
-#define MPF_STATUS_POLL_RETRIES 10000
+#define MPF_STATUS_POLL_TIMEOUT (2 * USEC_PER_SEC)
#define MPF_STATUS_BUSY BIT(0)
#define MPF_STATUS_READY BIT(1)
#define MPF_STATUS_SPI_VIOLATION BIT(2)
@@ -197,21 +198,17 @@ static int mpf_ops_parse_header(struct fpga_manager *mgr,
/* Poll HW status until busy bit is cleared and mask bits are set. */
static int mpf_poll_status(struct mpf_priv *priv, u8 mask)
{
- int status, retries = MPF_STATUS_POLL_RETRIES;
+ int ret, status;
- while (retries--) {
- status = mpf_read_status(priv);
- if (status < 0)
- return status;
-
- if (status & MPF_STATUS_BUSY)
- continue;
-
- if (!mask || (status & mask))
- return status;
- }
+ ret = read_poll_timeout(mpf_read_status, status,
+ (status < 0) ||
+ (!(status & MPF_STATUS_BUSY) &&
+ (!mask || (status & mask))),
+ 0, MPF_STATUS_POLL_TIMEOUT, false, priv);
+ if (ret < 0)
+ return ret;
- return -EBUSY;
+ return status;
}
static int mpf_spi_write(struct mpf_priv *priv, const void *buf, size_t buf_size)
--
2.38.2
next prev parent reply other threads:[~2022-12-26 14:37 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-26 14:23 [PATCH v2 0/3] Reliability improvements for Microchip MPF FPGA manager Ivan Bornyakov
2022-12-26 14:23 ` [PATCH v2 1/3] fpga: microchip-spi: move SPI I/O buffers out of stack Ivan Bornyakov
2022-12-26 14:23 ` Ivan Bornyakov [this message]
2022-12-26 18:24 ` [PATCH v2 2/3] fpga: microchip-spi: rewrite status polling in a time measurable way Ilpo Järvinen
2022-12-26 18:58 ` Ivan Bornyakov
2022-12-26 14:23 ` [PATCH v2 3/3] fpga: microchip-spi: separate data frame write routine Ivan Bornyakov
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=20221226142326.8111-3-i.bornyakov@metrotek.ru \
--to=i.bornyakov@metrotek.ru \
--cc=conor.dooley@microchip.com \
--cc=hao.wu@intel.com \
--cc=linux-fpga@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mdf@kernel.org \
--cc=system@metrotek.ru \
--cc=trix@redhat.com \
--cc=yilun.xu@intel.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 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.