From: Gavin Shan <gshan@redhat.com>
To: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org, Jonathan.Cameron@huawei.com,
james.morse@arm.com, mark.rutland@arm.com,
catalin.marinas@arm.com, will@kernel.org, shan.gavin@gmail.com
Subject: [PATCH v5 11/13] firmware: arm_sdei: Introduce sdei_do_local_call()
Date: Tue, 22 Sep 2020 23:04:21 +1000 [thread overview]
Message-ID: <20200922130423.10173-12-gshan@redhat.com> (raw)
In-Reply-To: <20200922130423.10173-1-gshan@redhat.com>
During the CPU hotplug, the private events are registered, enabled
or unregistered on the specific CPU. It repeats the same steps:
initializing cross call argument, make function call on local CPU,
check the returned error.
This introduces sdei_do_local_call() to cover the first steps. The
other benefit is to make CROSSCALL_INIT and struct sdei_crosscall_args
are only visible to sdei_do_{cross, local}_call().
Signed-off-by: Gavin Shan <gshan@redhat.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: James Morse <james.morse@arm.com>
---
drivers/firmware/arm_sdei.c | 41 ++++++++++++++++++++++---------------
1 file changed, 25 insertions(+), 16 deletions(-)
diff --git a/drivers/firmware/arm_sdei.c b/drivers/firmware/arm_sdei.c
index 786c1b6d4af3..cf1a37b40e24 100644
--- a/drivers/firmware/arm_sdei.c
+++ b/drivers/firmware/arm_sdei.c
@@ -85,6 +85,17 @@ struct sdei_crosscall_args {
atomic_set(&arg.errors, 0); \
} while (0)
+static inline int sdei_do_local_call(smp_call_func_t fn,
+ struct sdei_event *event)
+{
+ struct sdei_crosscall_args arg;
+
+ CROSSCALL_INIT(arg, event);
+ fn(&arg);
+
+ return arg.first_error;
+}
+
static inline int sdei_do_cross_call(smp_call_func_t fn,
struct sdei_event *event)
{
@@ -677,7 +688,7 @@ static int sdei_reregister_shared(void)
static int sdei_cpuhp_down(unsigned int cpu)
{
struct sdei_event *event;
- struct sdei_crosscall_args arg;
+ int err;
/* un-register private events */
spin_lock(&sdei_list_lock);
@@ -685,12 +696,11 @@ static int sdei_cpuhp_down(unsigned int cpu)
if (event->type == SDEI_EVENT_TYPE_SHARED)
continue;
- CROSSCALL_INIT(arg, event);
- /* call the cross-call function locally... */
- _local_event_unregister(&arg);
- if (arg.first_error)
+ err = sdei_do_local_call(_local_event_unregister, event);
+ if (err) {
pr_err("Failed to unregister event %u: %d\n",
- event->event_num, arg.first_error);
+ event->event_num, err);
+ }
}
spin_unlock(&sdei_list_lock);
@@ -700,7 +710,7 @@ static int sdei_cpuhp_down(unsigned int cpu)
static int sdei_cpuhp_up(unsigned int cpu)
{
struct sdei_event *event;
- struct sdei_crosscall_args arg;
+ int err;
/* re-register/enable private events */
spin_lock(&sdei_list_lock);
@@ -709,20 +719,19 @@ static int sdei_cpuhp_up(unsigned int cpu)
continue;
if (event->reregister) {
- CROSSCALL_INIT(arg, event);
- /* call the cross-call function locally... */
- _local_event_register(&arg);
- if (arg.first_error)
+ err = sdei_do_local_call(_local_event_register, event);
+ if (err) {
pr_err("Failed to re-register event %u: %d\n",
- event->event_num, arg.first_error);
+ event->event_num, err);
+ }
}
if (event->reenable) {
- CROSSCALL_INIT(arg, event);
- _local_event_enable(&arg);
- if (arg.first_error)
+ err = sdei_do_local_call(_local_event_enable, event);
+ if (err) {
pr_err("Failed to re-enable event %u: %d\n",
- event->event_num, arg.first_error);
+ event->event_num, err);
+ }
}
}
spin_unlock(&sdei_list_lock);
--
2.23.0
next prev parent reply other threads:[~2020-09-22 13:05 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-22 13:04 [PATCH v5 00/13] Refactor SDEI client driver Gavin Shan
2020-09-22 13:04 ` [PATCH v5 01/13] firmware: arm_sdei: Remove sdei_is_err() Gavin Shan
2020-09-22 13:04 ` [PATCH v5 02/13] firmware: arm_sdei: Common block for failing path in sdei_event_create() Gavin Shan
2020-09-22 13:04 ` [PATCH v5 03/13] firmware: arm_sdei: Retrieve event number from event instance Gavin Shan
2020-09-22 13:04 ` [PATCH v5 04/13] firmware: arm_sdei: Avoid nested statements in sdei_init() Gavin Shan
2020-09-22 13:04 ` [PATCH v5 05/13] firmware: arm_sdei: Unregister driver on error " Gavin Shan
2020-09-22 13:04 ` [PATCH v5 06/13] firmware: arm_sdei: Remove duplicate check in sdei_get_conduit() Gavin Shan
2020-09-22 13:04 ` [PATCH v5 07/13] firmware: arm_sdei: Remove redundant error message in sdei_probe() Gavin Shan
2020-09-22 13:04 ` [PATCH v5 08/13] firmware: arm_sdei: Remove while loop in sdei_event_register() Gavin Shan
2020-09-22 13:04 ` [PATCH v5 09/13] firmware: arm_sdei: Remove while loop in sdei_event_unregister() Gavin Shan
2020-09-22 13:04 ` [PATCH v5 10/13] firmware: arm_sdei: Cleanup on cross call function Gavin Shan
2020-09-22 13:04 ` Gavin Shan [this message]
2020-09-22 13:04 ` [PATCH v5 12/13] firmware: arm_sdei: Remove _sdei_event_register() Gavin Shan
2020-09-22 13:04 ` [PATCH v5 13/13] firmware: arm_sdei: Remove _sdei_event_unregister() Gavin Shan
2020-09-28 22:13 ` [PATCH v5 00/13] Refactor SDEI client driver Will Deacon
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=20200922130423.10173-12-gshan@redhat.com \
--to=gshan@redhat.com \
--cc=Jonathan.Cameron@huawei.com \
--cc=catalin.marinas@arm.com \
--cc=james.morse@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=shan.gavin@gmail.com \
--cc=will@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).