From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
To: gregkh@linuxfoundation.org
Cc: arnd@arndb.de, linux-kernel@vger.kernel.org,
linux-arm-msm@vger.kernel.org,
Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>,
Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Subject: [PATCH v3 3/5] misc: fastrpc: do not interrupt kernel calls
Date: Wed, 9 Oct 2019 15:41:21 +0100 [thread overview]
Message-ID: <20191009144123.24583-4-srinivas.kandagatla@linaro.org> (raw)
In-Reply-To: <20191009144123.24583-1-srinivas.kandagatla@linaro.org>
From: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>
the DSP firmware requires some calls to be held until processing has
completed: this is to guarantee that memory continues to be
accessible.
Nevertheless, the fastrpc driver chooses not support the case were
requests need to be held for unbounded amounts of time. If such a
use-case becomes necessary, this timeout will need to be revisited.
Signed-off-by: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>
Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
drivers/misc/fastrpc.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c
index c0fe3419c685..666c431380ce 100644
--- a/drivers/misc/fastrpc.c
+++ b/drivers/misc/fastrpc.c
@@ -959,8 +959,13 @@ static int fastrpc_internal_invoke(struct fastrpc_user *fl, u32 kernel,
if (err)
goto bail;
- /* Wait for remote dsp to respond or time out */
- err = wait_for_completion_interruptible(&ctx->work);
+ if (kernel) {
+ if (!wait_for_completion_timeout(&ctx->work, 10 * HZ))
+ err = -ETIMEDOUT;
+ } else {
+ err = wait_for_completion_interruptible(&ctx->work);
+ }
+
if (err)
goto bail;
--
2.21.0
next prev parent reply other threads:[~2019-10-09 14:41 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-09 14:41 [PATCH v3 0/5] misc: fastrpc: fixes and map/unmap support Srinivas Kandagatla
2019-10-09 14:41 ` [PATCH v3 1/5] misc: fastrpc: add mmap/unmap support Srinivas Kandagatla
2019-10-09 14:41 ` [PATCH v3 2/5] misc: fastrpc: fix memory leak from miscdev->name Srinivas Kandagatla
2019-10-09 14:41 ` Srinivas Kandagatla [this message]
2019-10-09 14:41 ` [PATCH v3 4/5] misc: fastrpc: handle interrupted contexts Srinivas Kandagatla
2019-10-09 14:41 ` [PATCH v3 5/5] misc: fastrpc: revert max init file size back to 2MB Srinivas Kandagatla
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=20191009144123.24583-4-srinivas.kandagatla@linaro.org \
--to=srinivas.kandagatla@linaro.org \
--cc=arnd@arndb.de \
--cc=gregkh@linuxfoundation.org \
--cc=jorge.ramirez-ortiz@linaro.org \
--cc=linux-arm-msm@vger.kernel.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 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).