From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B1583C2B9F7 for ; Tue, 25 May 2021 02:39:01 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 75412613F5 for ; Tue, 25 May 2021 02:39:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 75412613F5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=V8LFcH1sPwJ9/IT4OKBkGEdkfdhQP6yc9q6O/YPm7i8=; b=qmx0qi9asEU85+ GFUj8Fg9gm9oIjnpXmhwMpg2jB9zTZUjUMkkKtjgvpTEwM8cmMIpJk+KrYcFj9EjtYaQTc34RQ6qm mV3bBCYshrz93FdM+Af6OPoU/95JLVMdPq8vF3w4H7nykJZ3DiMDacYWCztRlSckgMiNT5JcSeiUZ JOskGE3wRUZX1JvBd/1lRFlpXZL4Z8j67dg8QVLZ/2us8PkvG1mouMz1WsmkOp99IEJi4oJ9qdRZa EAmRK5ZfT+2M2WEbrisvZgP56LqRg1xYE7SiMRI0O1NAgDCtcubRZoFZNpcpYBvW62Od2Os+JLRF5 LBLIMMbr+Ksys4JgjwNg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1llMwQ-002x5R-Ay; Tue, 25 May 2021 02:37:11 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1llIuC-0025tT-F1 for linux-arm-kernel@lists.infradead.org; Mon, 24 May 2021 22:18:37 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 217E761405; Mon, 24 May 2021 22:18:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1621894716; bh=tjZHOWaK+cFm3eDjHyyP9YNAx0VLERWMIXFQByYvbjk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a3a8HITtJ4LrXjnSG/yvx9zmgza3xy0GoZpj9ILLhOy6rRf2Bg69pqnpwKffte4WB HlhijNhugweqOERSIYesy2E4ly/GIOr3Q4rK04219xqNdfSbVXUYcm2YE0ROUmQAIb T1aR/5hqLDwPoBVxledK63+RU8x7K0G94NXk5N8lA3yFwtwSHNGG6odd6GJixY8BYW PfyheRYeFj8CrIjV9DDDOFCNK2I6t28TUhfcVhkgVdjNYrnyKbezf0q9UPT4MaSPo2 2Fs7IcqLE7di25CqmJIwOY2Rd0EKHguLTdvHopX3+z5fbM/HmLEXURwR98sHPMp+4L aFfuyeTpGFd6g== From: Will Deacon To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, Will Deacon , Frederic Weisbecker , Thomas Gleixner , Marc Zyngier , Lorenzo Colitti , John Stultz , Stephen Boyd , =?UTF-8?q?Mika=20Penttil=C3=A4?= , kernel-team@android.com Subject: [PATCH v2 2/5] tick/broadcast: Split __tick_broadcast_oneshot_control() into a helper Date: Mon, 24 May 2021 23:18:15 +0100 Message-Id: <20210524221818.15850-3-will@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210524221818.15850-1-will@kernel.org> References: <20210524221818.15850-1-will@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210524_151836_611270_92117C57 X-CRM114-Status: GOOD ( 16.46 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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. Cc: Frederic Weisbecker Cc: Thomas Gleixner Cc: Marc Zyngier Cc: Lorenzo Colitti Cc: John Stultz Cc: Stephen Boyd Signed-off-by: Will Deacon --- 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 fb794ff4855e..f3f2f4ba4321 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 @@ int __tick_broadcast_oneshot_control(enum tick_broadcast_state state) 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 * -- 2.31.1.818.g46aad6cb9e-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel