From: Richard Gong <richard.gong@linux.intel.com>
To: mdf@kernel.org
Cc: linux-fpga@vger.kernel.org, linux-kernel@vger.kernel.org,
dinguyen@kernel.org, richard.gong@intel.com
Subject: Re: [PATCH] fpga: stratix10-soc: make FPGA task un-interruptible
Date: Mon, 20 Jul 2020 14:00:22 -0500 [thread overview]
Message-ID: <d678df9e-7f1d-8f50-e2c9-a734b60e6c9a@linux.intel.com> (raw)
In-Reply-To: <1594138447-21488-1-git-send-email-richard.gong@linux.intel.com>
Hi Moritz,
Sorry for asking.
When you get chance, can you review this FPGA patch?
Regards,
Richard
On 7/7/20 11:14 AM, richard.gong@linux.intel.com wrote:
> From: Richard Gong <richard.gong@intel.com>
>
> When CTRL+C occurs during the process of FPGA reconfiguration, the FPGA
> reconfiguration process stops and the user can't perform a new FPGA
> reconfiguration properly.
>
> Set FPGA complete task to be not interruptible so that the user can
> properly perform FPGA reconfiguration after CTRL+C event.
>
> Signed-off-by: Richard Gong <richard.gong@intel.com>
> ---
> drivers/fpga/stratix10-soc.c | 23 +++--------------------
> 1 file changed, 3 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/fpga/stratix10-soc.c b/drivers/fpga/stratix10-soc.c
> index 44b7c56..657a70c 100644
> --- a/drivers/fpga/stratix10-soc.c
> +++ b/drivers/fpga/stratix10-soc.c
> @@ -196,17 +196,13 @@ static int s10_ops_write_init(struct fpga_manager *mgr,
> if (ret < 0)
> goto init_done;
>
> - ret = wait_for_completion_interruptible_timeout(
> + ret = wait_for_completion_timeout(
> &priv->status_return_completion, S10_RECONFIG_TIMEOUT);
> if (!ret) {
> dev_err(dev, "timeout waiting for RECONFIG_REQUEST\n");
> ret = -ETIMEDOUT;
> goto init_done;
> }
> - if (ret < 0) {
> - dev_err(dev, "error (%d) waiting for RECONFIG_REQUEST\n", ret);
> - goto init_done;
> - }
>
> ret = 0;
> if (!test_and_clear_bit(SVC_STATUS_OK, &priv->status)) {
> @@ -318,7 +314,7 @@ static int s10_ops_write(struct fpga_manager *mgr, const char *buf,
> */
> wait_status = 1; /* not timed out */
> if (!priv->status)
> - wait_status = wait_for_completion_interruptible_timeout(
> + wait_status = wait_for_completion_timeout(
> &priv->status_return_completion,
> S10_BUFFER_TIMEOUT);
>
> @@ -340,13 +336,6 @@ static int s10_ops_write(struct fpga_manager *mgr, const char *buf,
> ret = -ETIMEDOUT;
> break;
> }
> - if (wait_status < 0) {
> - ret = wait_status;
> - dev_err(dev,
> - "error (%d) waiting for svc layer buffers\n",
> - ret);
> - break;
> - }
> }
>
> if (!s10_free_buffers(mgr))
> @@ -372,7 +361,7 @@ static int s10_ops_write_complete(struct fpga_manager *mgr,
> if (ret < 0)
> break;
>
> - ret = wait_for_completion_interruptible_timeout(
> + ret = wait_for_completion_timeout(
> &priv->status_return_completion, timeout);
> if (!ret) {
> dev_err(dev,
> @@ -380,12 +369,6 @@ static int s10_ops_write_complete(struct fpga_manager *mgr,
> ret = -ETIMEDOUT;
> break;
> }
> - if (ret < 0) {
> - dev_err(dev,
> - "error (%d) waiting for RECONFIG_COMPLETED\n",
> - ret);
> - break;
> - }
> /* Not error or timeout, so ret is # of jiffies until timeout */
> timeout = ret;
> ret = 0;
>
prev parent reply other threads:[~2020-07-20 18:45 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-07 16:14 [PATCH] fpga: stratix10-soc: make FPGA task un-interruptible richard.gong
2020-07-08 17:08 ` Dinh Nguyen
2020-07-08 18:30 ` Richard Gong
2020-07-08 18:47 ` Dinh Nguyen
2020-07-08 20:08 ` Richard Gong
2020-07-09 20:01 ` Tom Rix
2020-07-09 21:10 ` Richard Gong
2020-07-20 19:00 ` Richard Gong [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=d678df9e-7f1d-8f50-e2c9-a734b60e6c9a@linux.intel.com \
--to=richard.gong@linux.intel.com \
--cc=dinguyen@kernel.org \
--cc=linux-fpga@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mdf@kernel.org \
--cc=richard.gong@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 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).