From: Daniel Wagner <wagi@monom.org>
To: linux-kernel@vger.kernel.org
Cc: Daniel Wagner <daniel.wagner@bmw-carit.de>,
Ming Lei <ming.lei@canonical.com>,
"Luis R . Rodriguez" <mcgrof@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Subject: [PATCH v4 3/4] firmware: Drop bit ops in favor of simple state machine
Date: Wed, 7 Sep 2016 10:45:07 +0200 [thread overview]
Message-ID: <1473237908-20989-4-git-send-email-wagi@monom.org> (raw)
In-Reply-To: <1473237908-20989-1-git-send-email-wagi@monom.org>
From: Daniel Wagner <daniel.wagner@bmw-carit.de>
We track the state of the loading with bit ops. Since the state machine
has only a couple of states and there are only a few simple state
transition we can model this simplify.
UNKNOWN -> LOADING -> DONE | ABORTED
Signed-off-by: Daniel Wagner <daniel.wagner@bmw-carit.de>
Cc: Ming Lei <ming.lei@canonical.com>
Cc: Luis R. Rodriguez <mcgrof@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/base/firmware_class.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index b11fbb0..7757c03 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -120,16 +120,18 @@ static void fw_status_init(struct fw_status *fw_st)
static int __fw_status_check(struct fw_status *fw_st, unsigned long status)
{
- return test_bit(status, &fw_st->status);
+ return fw_st->status == status;
}
static int fw_status_wait_timeout(struct fw_status *fw_st, long timeout)
{
+ unsigned long status;
int ret;
ret = wait_for_completion_interruptible_timeout(&fw_st->completion,
timeout);
- if (ret == 0 && test_bit(FW_STATUS_ABORTED, &fw_st->status))
+ status = READ_ONCE(fw_st->status);
+ if (ret == 0 && status == FW_STATUS_ABORTED)
return -ENOENT;
return ret;
@@ -138,13 +140,11 @@ static int fw_status_wait_timeout(struct fw_status *fw_st, long timeout)
static void __fw_status_set(struct fw_status *fw_st,
unsigned long status)
{
- set_bit(status, &fw_st->status);
+ WRITE_ONCE(fw_st->status, status);
if (status == FW_STATUS_DONE ||
- status == FW_STATUS_ABORTED) {
- clear_bit(FW_STATUS_LOADING, &fw_st->status);
+ status == FW_STATUS_ABORTED)
complete_all(&fw_st->completion);
- }
}
#define fw_status_start(fw_st) \
--
2.7.4
next prev parent reply other threads:[~2016-09-07 8:45 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-07 8:45 [PATCH v4 0/4] firmware: encapsulate firmware loading status Daniel Wagner
2016-09-07 8:45 ` [PATCH v4 1/4] firmware: Move umh locking code into fw_load_from_user_helper() Daniel Wagner
2016-09-07 23:33 ` Luis R. Rodriguez
2016-09-08 12:41 ` Daniel Wagner
2016-09-08 14:55 ` Luis R. Rodriguez
2016-09-08 15:37 ` Ming Lei
2016-09-08 20:11 ` Luis R. Rodriguez
2016-09-09 1:22 ` Ming Lei
[not found] ` <CAB=NE6XK9g9muQ8p5+VaVGt2t0E_4K0wiavacQGqt_S4PyN28A@mail.gmail.com>
2016-09-09 4:19 ` Ming Lei
2016-09-09 22:10 ` Luis R. Rodriguez
[not found] ` <efba9730-d3bc-1fd4-2511-e509a4c60971@bmw-carit.de>
2016-09-15 15:43 ` Luis R. Rodriguez
2016-09-07 8:45 ` [PATCH v4 2/4] firmware: encapsulate firmware loading status Daniel Wagner
2016-09-08 1:39 ` Luis R. Rodriguez
2016-09-08 8:05 ` Daniel Wagner
2016-09-08 9:45 ` Daniel Wagner
2016-09-08 11:26 ` Ming Lei
2016-09-08 12:26 ` Daniel Wagner
2016-09-08 15:49 ` Ming Lei
2016-09-09 11:43 ` Daniel Wagner
2016-09-08 12:32 ` Daniel Wagner
2016-09-07 8:45 ` Daniel Wagner [this message]
2016-09-08 1:45 ` [PATCH v4 3/4] firmware: Drop bit ops in favor of simple state machine Luis R. Rodriguez
2016-09-08 12:44 ` Daniel Wagner
2016-09-07 8:45 ` [PATCH v4 4/4] firmware: Do not use fw_lock for fw_status protection Daniel Wagner
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=1473237908-20989-4-git-send-email-wagi@monom.org \
--to=wagi@monom.org \
--cc=daniel.wagner@bmw-carit.de \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mcgrof@kernel.org \
--cc=ming.lei@canonical.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).