linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "tip-bot2 for Will Deacon" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Will Deacon <will@kernel.org>,
	Thomas Gleixner <tglx@linutronix.de>,
	x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: timers/core] tick/broadcast: Split __tick_broadcast_oneshot_control() into a helper
Date: Mon, 31 May 2021 15:06:59 -0000	[thread overview]
Message-ID: <162247361983.29796.2022959181572862326.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20210524221818.15850-3-will@kernel.org>

The following commit has been merged into the timers/core branch of tip:

Commit-ID:     e5007c288e7981e0b0cf8ea3dea443f0b8c34345
Gitweb:        https://git.kernel.org/tip/e5007c288e7981e0b0cf8ea3dea443f0b8c34345
Author:        Will Deacon <will@kernel.org>
AuthorDate:    Mon, 24 May 2021 23:18:15 +01:00
Committer:     Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Mon, 31 May 2021 17:04:45 +02:00

tick/broadcast: Split __tick_broadcast_oneshot_control() into a helper

In preparation for adding support for per-cpu wakeup timers, split
_tick_broadcast_oneshot_control() into a helper function which deals
only with the broadcast timer management across idle transitions.

Signed-off-by: Will Deacon <will@kernel.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20210524221818.15850-3-will@kernel.org

---
 kernel/time/tick-broadcast.c | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c
index fb794ff..f3f2f4b 100644
--- a/kernel/time/tick-broadcast.c
+++ b/kernel/time/tick-broadcast.c
@@ -717,24 +717,16 @@ static void broadcast_shutdown_local(struct clock_event_device *bc,
 	clockevents_switch_state(dev, CLOCK_EVT_STATE_SHUTDOWN);
 }
 
-int __tick_broadcast_oneshot_control(enum tick_broadcast_state state)
+static int ___tick_broadcast_oneshot_control(enum tick_broadcast_state state,
+					     struct tick_device *td,
+					     int cpu)
 {
-	struct clock_event_device *bc, *dev;
-	int cpu, ret = 0;
+	struct clock_event_device *bc, *dev = td->evtdev;
+	int ret = 0;
 	ktime_t now;
 
-	/*
-	 * If there is no broadcast device, tell the caller not to go
-	 * into deep idle.
-	 */
-	if (!tick_broadcast_device.evtdev)
-		return -EBUSY;
-
-	dev = this_cpu_ptr(&tick_cpu_device)->evtdev;
-
 	raw_spin_lock(&tick_broadcast_lock);
 	bc = tick_broadcast_device.evtdev;
-	cpu = smp_processor_id();
 
 	if (state == TICK_BROADCAST_ENTER) {
 		/*
@@ -863,6 +855,21 @@ out:
 	return ret;
 }
 
+int __tick_broadcast_oneshot_control(enum tick_broadcast_state state)
+{
+	struct tick_device *td = this_cpu_ptr(&tick_cpu_device);
+	int cpu = smp_processor_id();
+
+	if (tick_broadcast_device.evtdev)
+		return ___tick_broadcast_oneshot_control(state, td, cpu);
+
+	/*
+	 * If there is no broadcast device, tell the caller not
+	 * to go into deep idle.
+	 */
+	return -EBUSY;
+}
+
 /*
  * Reset the one shot broadcast for a cpu
  *

  parent reply	other threads:[~2021-05-31 17:06 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-24 22:18 [PATCH v2 0/5] tick/broadcast: Allow per-cpu timers to be used instead of broadcast Will Deacon
2021-05-24 22:18 ` [PATCH v2 1/5] tick/broadcast: Drop unneeded CONFIG_GENERIC_CLOCKEVENTS_BROADCAST guard Will Deacon
2021-05-31 15:07   ` [tip: timers/core] " tip-bot2 for Will Deacon
2021-05-24 22:18 ` [PATCH v2 2/5] tick/broadcast: Split __tick_broadcast_oneshot_control() into a helper Will Deacon
2021-05-27  7:23   ` Xin Hao
2021-05-27  8:22     ` Will Deacon
2021-05-27 11:35       ` Xin Hao
2021-05-27 11:55         ` Will Deacon
2021-05-27 11:56         ` Will Deacon
2021-05-31 14:29           ` Thomas Gleixner
2021-06-01 12:13             ` Will Deacon
2021-06-01 18:14               ` Thomas Gleixner
2021-05-31 15:06   ` tip-bot2 for Will Deacon [this message]
2021-05-24 22:18 ` [PATCH v2 3/5] tick/broadcast: Prefer per-cpu oneshot wakeup timers to broadcast Will Deacon
2021-05-31 15:06   ` [tip: timers/core] " tip-bot2 for Will Deacon
2021-05-24 22:18 ` [PATCH v2 4/5] tick/broadcast: Program wakeup timer when entering idle if required Will Deacon
2021-05-31 15:06   ` [tip: timers/core] " tip-bot2 for Will Deacon
2021-05-24 22:18 ` [PATCH v2 5/5] timer_list: Print name of per-cpu wakeup device Will Deacon
2021-05-31 15:06   ` [tip: timers/core] " tip-bot2 for 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=162247361983.29796.2022959181572862326.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=tglx@linutronix.de \
    --cc=will@kernel.org \
    --cc=x86@kernel.org \
    --subject='Re: [tip: timers/core] tick/broadcast: Split __tick_broadcast_oneshot_control() into a helper' \
    /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

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).