From: "Marek Behún" <kabel@kernel.org>
To: "Gregory CLEMENT" <gregory.clement@bootlin.com>,
"Andrew Lunn" <andrew@lunn.ch>, "Arnd Bergmann" <arnd@arndb.de>,
soc@kernel.org, arm@kernel.org,
"Andy Shevchenko" <andy@kernel.org>,
"Hans de Goede" <hdegoede@redhat.com>,
"Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
Cc: "Marek Behún" <kabel@kernel.org>
Subject: [PATCH v4 02/19] firmware: turris-mox-rwtm: Fix checking return value of wait_for_completion_timeout()
Date: Mon, 15 Jul 2024 12:47:06 +0200 [thread overview]
Message-ID: <20240715104723.17751-3-kabel@kernel.org> (raw)
In-Reply-To: <20240715104723.17751-1-kabel@kernel.org>
The wait_for_completion_timeout() function returns 0 if timed out, and a
positive value if completed. Fix the usage of this function.
Fixes: 389711b37493 ("firmware: Add Turris Mox rWTM firmware driver")
Fixes: 2eab59cf0d20 ("firmware: turris-mox-rwtm: fail probing when firmware does not support hwrng")
Signed-off-by: Marek Behún <kabel@kernel.org>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Reviewed-by: Andy Shevchenko <andy@kernel.org>
---
drivers/firmware/turris-mox-rwtm.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/drivers/firmware/turris-mox-rwtm.c b/drivers/firmware/turris-mox-rwtm.c
index f1f9160c4195..3f4758e03c81 100644
--- a/drivers/firmware/turris-mox-rwtm.c
+++ b/drivers/firmware/turris-mox-rwtm.c
@@ -202,9 +202,8 @@ static int mox_get_board_info(struct mox_rwtm *rwtm)
if (ret < 0)
return ret;
- ret = wait_for_completion_timeout(&rwtm->cmd_done, HZ / 2);
- if (ret < 0)
- return ret;
+ if (!wait_for_completion_timeout(&rwtm->cmd_done, HZ / 2))
+ return -ETIMEDOUT;
ret = mox_get_status(MBOX_CMD_BOARD_INFO, reply->retval);
if (ret == -ENODATA) {
@@ -238,9 +237,8 @@ static int mox_get_board_info(struct mox_rwtm *rwtm)
if (ret < 0)
return ret;
- ret = wait_for_completion_timeout(&rwtm->cmd_done, HZ / 2);
- if (ret < 0)
- return ret;
+ if (!wait_for_completion_timeout(&rwtm->cmd_done, HZ / 2))
+ return -ETIMEDOUT;
ret = mox_get_status(MBOX_CMD_ECDSA_PUB_KEY, reply->retval);
if (ret == -ENODATA) {
@@ -277,9 +275,8 @@ static int check_get_random_support(struct mox_rwtm *rwtm)
if (ret < 0)
return ret;
- ret = wait_for_completion_timeout(&rwtm->cmd_done, HZ / 2);
- if (ret < 0)
- return ret;
+ if (!wait_for_completion_timeout(&rwtm->cmd_done, HZ / 2))
+ return -ETIMEDOUT;
return mox_get_status(MBOX_CMD_GET_RANDOM, rwtm->reply.retval);
}
--
2.44.2
next prev parent reply other threads:[~2024-07-15 10:47 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-15 10:47 [PATCH v4 00/19] Updates for turris-mox-rwtm driver Marek Behún
2024-07-15 10:47 ` [PATCH v4 01/19] firmware: turris-mox-rwtm: Do not complete if there are no waiters Marek Behún
2024-07-15 10:47 ` Marek Behún [this message]
2024-07-15 10:47 ` [PATCH v4 03/19] firmware: turris-mox-rwtm: Use macro constant instead of hardcoded 4096 Marek Behún
2024-07-15 10:47 ` [PATCH v4 04/19] firmware: turris-mox-rwtm: Use ETH_ALEN instead of hardcoded 6 Marek Behún
2024-07-15 10:47 ` [PATCH v4 05/19] firmware: turris-mox-rwtm: Use the boolean type where appropriate Marek Behún
2024-07-15 10:47 ` [PATCH v4 06/19] firmware: turris-mox-rwtm: Hide signature related constants behind macros Marek Behún
2024-07-15 10:47 ` [PATCH v4 07/19] firmware: turris-mox-rwtm: Fix driver includes Marek Behún
2024-07-15 10:47 ` [PATCH v4 08/19] firmware: turris-mox-rwtm: Use sysfs_emit() instead of sprintf() Marek Behún
2024-07-15 10:47 ` [PATCH v4 09/19] firmware: turris-mox-rwtm: Don't create own kobject type Marek Behún
2024-07-15 10:47 ` [PATCH v4 10/19] firmware: turris-mox-rwtm: Simplify debugfs code Marek Behún
2024-07-15 10:47 ` [PATCH v4 11/19] firmware: turris-mox-rwtm: Convert rest to devm_* and get rid of driver .remove() Marek Behún
2024-07-15 10:47 ` [PATCH v4 12/19] firmware: turris-mox-rwtm: Use dev_err_probe() where possible Marek Behún
2024-07-15 10:47 ` [PATCH v4 13/19] firmware: turris-mox-rwtm: Initialize completion before mailbox Marek Behún
2024-07-15 10:47 ` [PATCH v4 14/19] firmware: turris-mox-rwtm: Drop redundant device pointer Marek Behún
2024-07-15 10:47 ` [PATCH v4 15/19] firmware: turris-mox-rwtm: Use devm_mutex_init() instead of mutex_init() Marek Behún
2024-07-15 10:47 ` [PATCH v4 16/19] firmware: turris-mox-rwtm: Use container_of() instead of hwrng .priv member Marek Behún
2024-07-15 10:47 ` [PATCH v4 17/19] firmware: turris-mox-rwtm: Use EOPNOTSUPP instead of ENOSYS Marek Behún
2024-07-15 10:47 ` [PATCH v4 18/19] firmware: turris-mox-rwtm: Use ALIGN() instead of hardcoding Marek Behún
2024-07-15 10:47 ` [PATCH v4 19/19] firmware: turris-mox-rwtm: Deduplicate command execution code Marek Behún
2024-07-15 11:11 ` [PATCH v4 00/19] Updates for turris-mox-rwtm driver Arnd Bergmann
2024-08-06 20:08 ` patchwork-bot+linux-soc
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=20240715104723.17751-3-kabel@kernel.org \
--to=kabel@kernel.org \
--cc=andrew@lunn.ch \
--cc=andy@kernel.org \
--cc=arm@kernel.org \
--cc=arnd@arndb.de \
--cc=gregory.clement@bootlin.com \
--cc=hdegoede@redhat.com \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=soc@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.