From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932687AbbGGRPB (ORCPT ); Tue, 7 Jul 2015 13:15:01 -0400 Received: from terminus.zytor.com ([198.137.202.10]:36426 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757746AbbGGROx (ORCPT ); Tue, 7 Jul 2015 13:14:53 -0400 Date: Tue, 7 Jul 2015 10:14:12 -0700 From: tip-bot for Thomas Gleixner Message-ID: Cc: mingo@kernel.org, hpa@zytor.com, preeti@linux.vnet.ibm.com, tglx@linutronix.de, Catalin.Marinas@arm.com, peterz@infradead.org, linux-kernel@vger.kernel.org, Lorenzo.Pieralisi@arm.com, rafael.j.wysocki@intel.com, Suzuki.Poulose@arm.com, sudeep.holla@arm.com Reply-To: sudeep.holla@arm.com, Lorenzo.Pieralisi@arm.com, rafael.j.wysocki@intel.com, linux-kernel@vger.kernel.org, Suzuki.Poulose@arm.com, preeti@linux.vnet.ibm.com, tglx@linutronix.de, peterz@infradead.org, Catalin.Marinas@arm.com, hpa@zytor.com, mingo@kernel.org In-Reply-To: References: To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/urgent] tick/broadcast: Return busy if periodic mode and hrtimer broadcast Git-Commit-ID: d33257264b0267a8fd20f6717abbb484c9e21130 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: d33257264b0267a8fd20f6717abbb484c9e21130 Gitweb: http://git.kernel.org/tip/d33257264b0267a8fd20f6717abbb484c9e21130 Author: Thomas Gleixner AuthorDate: Tue, 7 Jul 2015 17:45:22 +0200 Committer: Thomas Gleixner CommitDate: Tue, 7 Jul 2015 18:46:48 +0200 tick/broadcast: Return busy if periodic mode and hrtimer broadcast If the system is in periodic mode and the broadcast device is hrtimer based, return busy as we have no proper handling for this. [ Split out from a larger combo patch ] Tested-by: Sudeep Holla Signed-off-by: Thomas Gleixner Cc: Suzuki Poulose Cc: Lorenzo Pieralisi Cc: Catalin Marinas Cc: Rafael J. Wysocki Cc: Peter Zijlstra Cc: Preeti U Murthy Cc: Ingo Molnar Link: http://lkml.kernel.org/r/alpine.DEB.2.11.1507070929360.3916@nanos --- kernel/time/tick-broadcast.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c index 83aa92e..da7b40f 100644 --- a/kernel/time/tick-broadcast.c +++ b/kernel/time/tick-broadcast.c @@ -709,8 +709,12 @@ int __tick_broadcast_oneshot_control(enum tick_broadcast_state state) * If the broadcast device is in periodic mode, we * return. */ - if (tick_broadcast_device.mode == TICKDEV_MODE_PERIODIC) + if (tick_broadcast_device.mode == TICKDEV_MODE_PERIODIC) { + /* If it is a hrtimer based broadcast, return busy */ + if (bc->features & CLOCK_EVT_FEAT_HRTIMER) + ret = -EBUSY; goto out; + } if (!cpumask_test_and_set_cpu(cpu, tick_broadcast_oneshot_mask)) { WARN_ON_ONCE(cpumask_test_cpu(cpu, tick_broadcast_pending_mask));