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=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 A79E4C43460 for ; Thu, 20 May 2021 18:47:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8AFAC611AB for ; Thu, 20 May 2021 18:47:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236278AbhETStC (ORCPT ); Thu, 20 May 2021 14:49:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:39482 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236139AbhETSsw (ORCPT ); Thu, 20 May 2021 14:48:52 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7259B61355; Thu, 20 May 2021 18:47:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1621536451; bh=2qJHn0NYcRsiDGsS+gVNRop9M5cOLWda5mJZcN1WsXc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Sdx2dYon4xoRVs0Hz9wbxFz/wOK1BTycjLW9cBydCYtm/VH0eAyZG6m3En+vo1Yf3 lo6laU2hralBSiIMoHmfqZuDOaqL53t4nBs5tjyonbHm6GvAzPI1pZmaYqmn1N4G/t v5nZhCozGEs9wRc358hWiwS3J6cEHWeOMKg0oQZ3kLmNVDyrM4QqjHYiqk97sTN7a8 GDd5AVdlecdpFocPg0vtdwCa+ge0mVFobtxpJjUYMElVFqnLDo7S0WPQGsglQS296M GDrdxgKpVKo3ldBHnyi3PdUsZyMO3ocQ5MDkf0uIpb9AndExtM3kv5RAOIGyF0+rIm yPNCEg//JrvWA== 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 , kernel-team@android.com Subject: [PATCH 4/5] tick/broadcast: Program wakeup timer when entering idle if required Date: Thu, 20 May 2021 19:47:04 +0100 Message-Id: <20210520184705.10845-5-will@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210520184705.10845-1-will@kernel.org> References: <20210520184705.10845-1-will@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When configuring the broadcast timer on entry to and exit from deep idle states, prefer a per-CPU wakeup timer if one exists. On entry to idle, stop the tick device and transfer the next event into the oneshot wakeup device, which will serve as the wakeup from idle. To avoid the overhead of additional hardware accesses on exit from idle, leave the timer armed and treat the inevitable interrupt as a (possibly spurious) tick event. 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 | 38 +++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c index 8bd8cd69c8c9..ba5264e210d9 100644 --- a/kernel/time/tick-broadcast.c +++ b/kernel/time/tick-broadcast.c @@ -96,6 +96,15 @@ static struct clock_event_device *tick_get_oneshot_wakeup_device(int cpu) return per_cpu(tick_oneshot_wakeup_device, cpu); } +static void tick_oneshot_wakeup_handler(struct clock_event_device *wd) +{ + /* + * If we woke up early and the tick was reprogrammed in the + * meantime then this may be spurious but harmless. + */ + tick_receive_broadcast(); +} + static bool tick_set_oneshot_wakeup_device(struct clock_event_device *newdev, int cpu) { @@ -116,6 +125,7 @@ static bool tick_set_oneshot_wakeup_device(struct clock_event_device *newdev, if (curdev && newdev->rating <= curdev->rating) return false; + newdev->event_handler = tick_oneshot_wakeup_handler; set_device: per_cpu(tick_oneshot_wakeup_device, cpu) = newdev; return true; @@ -903,16 +913,42 @@ static int ___tick_broadcast_oneshot_control(enum tick_broadcast_state state, return ret; } +static int tick_oneshot_wakeup_control(enum tick_broadcast_state state, + struct tick_device *td, + int cpu) +{ + struct clock_event_device *dev, *wd; + + dev = td->evtdev; + if (td->mode != TICKDEV_MODE_ONESHOT) + return -EINVAL; + + wd = tick_get_oneshot_wakeup_device(cpu); + if (!wd) + return -ENODEV; + + if (state == TICK_BROADCAST_ENTER) { + clockevents_switch_state(dev, CLOCK_EVT_STATE_ONESHOT_STOPPED); + clockevents_switch_state(wd, CLOCK_EVT_STATE_ONESHOT); + clockevents_program_event(wd, dev->next_event, 1); + } + + return 0; +} + 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_oneshot_wakeup_control(state, td, cpu)) + return 0; + if (tick_broadcast_device.evtdev) return ___tick_broadcast_oneshot_control(state, td, cpu); /* - * If there is no broadcast device, tell the caller not + * If there is no broadcast or wakeup device, tell the caller not * to go into deep idle. */ return -EBUSY; -- 2.31.1.818.g46aad6cb9e-goog 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,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 E1252C433B4 for ; Thu, 20 May 2021 18:50:12 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 6985A606A5 for ; Thu, 20 May 2021 18:50:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6985A606A5 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=desiato.20200630; 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=6ImA5pFpshs5CHFwFqdJdn3BusHVhvxL/SR+aToHlQI=; b=PDSQqUzJcHA9a5jjB+8OnBzSUn eo1SlCcuQ/0ta5BPpweYBQ8cnR13NWFkEic2YPhe4FUbGapOT2iAv1DzmBXBPEf/9nOqpmmyEgYPn c0QNSZdVo1G5KXI9e7eTOPvza8PGU1cibQkPHmfRWnoy9n0pie2x4ckBIM8hQe61kOAjrz+gU6MUB LDtk/QuMmJ3lkW+vy7tazN5bCjUJTGm+J6urBACMhKz+GzenWb5BII3OyX19mTiRMHuRzFxcDkwc7 1SiCt5Id8dS05oXvYoJenm/HxBfruZkYMoSbEQPtMkpd1SJScbZdOAfxt+tHQH/h0M8L6PCshCe+P Uwla7E6w==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ljniV-002K5A-3z; Thu, 20 May 2021 18:48:19 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ljnhm-002JmV-3E for linux-arm-kernel@desiato.infradead.org; Thu, 20 May 2021 18:47:34 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=uRG4gelGTu33BHMfq016RYRBpJp7Ja0MBBjAPXQEnp0=; b=L9M/gWDS8SuNiB/ACzYvYzESxx /1AQh1YtWh6Fm0C66rGI0maS5KEardeCRPXnQAxBfFQDFhOwVsfMAU8HWkfDvdM4QVMwf1IoJJbe8 BtGPGiJTMWzHPi0ketAeZ0/AUmlHNXFL39BDrAEzMBfdtYxqoH+d1N+QsakqSto8ICMvj58Efgo96 xr1/EeUDnFuGI/viBb87ndskDulO/IPhtNFWwOsFLxExxzwInxnp7xYvWZVeBcj6d0gmqTHstZDPc vRELqCUpBBrdoU2UjEkcxcpUgUJM0RJe4NrNayG++T/qWht2ZOKePETnyjyZAHIMmiZL4Ae/QojOE OZS4AvTQ==; Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1ljnhj-00GaEm-EC for linux-arm-kernel@lists.infradead.org; Thu, 20 May 2021 18:47:32 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7259B61355; Thu, 20 May 2021 18:47:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1621536451; bh=2qJHn0NYcRsiDGsS+gVNRop9M5cOLWda5mJZcN1WsXc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Sdx2dYon4xoRVs0Hz9wbxFz/wOK1BTycjLW9cBydCYtm/VH0eAyZG6m3En+vo1Yf3 lo6laU2hralBSiIMoHmfqZuDOaqL53t4nBs5tjyonbHm6GvAzPI1pZmaYqmn1N4G/t v5nZhCozGEs9wRc358hWiwS3J6cEHWeOMKg0oQZ3kLmNVDyrM4QqjHYiqk97sTN7a8 GDd5AVdlecdpFocPg0vtdwCa+ge0mVFobtxpJjUYMElVFqnLDo7S0WPQGsglQS296M GDrdxgKpVKo3ldBHnyi3PdUsZyMO3ocQ5MDkf0uIpb9AndExtM3kv5RAOIGyF0+rIm yPNCEg//JrvWA== 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 , kernel-team@android.com Subject: [PATCH 4/5] tick/broadcast: Program wakeup timer when entering idle if required Date: Thu, 20 May 2021 19:47:04 +0100 Message-Id: <20210520184705.10845-5-will@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210520184705.10845-1-will@kernel.org> References: <20210520184705.10845-1-will@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210520_114731_536234_7C26D1BA X-CRM114-Status: GOOD ( 15.50 ) 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 When configuring the broadcast timer on entry to and exit from deep idle states, prefer a per-CPU wakeup timer if one exists. On entry to idle, stop the tick device and transfer the next event into the oneshot wakeup device, which will serve as the wakeup from idle. To avoid the overhead of additional hardware accesses on exit from idle, leave the timer armed and treat the inevitable interrupt as a (possibly spurious) tick event. 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 | 38 +++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c index 8bd8cd69c8c9..ba5264e210d9 100644 --- a/kernel/time/tick-broadcast.c +++ b/kernel/time/tick-broadcast.c @@ -96,6 +96,15 @@ static struct clock_event_device *tick_get_oneshot_wakeup_device(int cpu) return per_cpu(tick_oneshot_wakeup_device, cpu); } +static void tick_oneshot_wakeup_handler(struct clock_event_device *wd) +{ + /* + * If we woke up early and the tick was reprogrammed in the + * meantime then this may be spurious but harmless. + */ + tick_receive_broadcast(); +} + static bool tick_set_oneshot_wakeup_device(struct clock_event_device *newdev, int cpu) { @@ -116,6 +125,7 @@ static bool tick_set_oneshot_wakeup_device(struct clock_event_device *newdev, if (curdev && newdev->rating <= curdev->rating) return false; + newdev->event_handler = tick_oneshot_wakeup_handler; set_device: per_cpu(tick_oneshot_wakeup_device, cpu) = newdev; return true; @@ -903,16 +913,42 @@ static int ___tick_broadcast_oneshot_control(enum tick_broadcast_state state, return ret; } +static int tick_oneshot_wakeup_control(enum tick_broadcast_state state, + struct tick_device *td, + int cpu) +{ + struct clock_event_device *dev, *wd; + + dev = td->evtdev; + if (td->mode != TICKDEV_MODE_ONESHOT) + return -EINVAL; + + wd = tick_get_oneshot_wakeup_device(cpu); + if (!wd) + return -ENODEV; + + if (state == TICK_BROADCAST_ENTER) { + clockevents_switch_state(dev, CLOCK_EVT_STATE_ONESHOT_STOPPED); + clockevents_switch_state(wd, CLOCK_EVT_STATE_ONESHOT); + clockevents_program_event(wd, dev->next_event, 1); + } + + return 0; +} + 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_oneshot_wakeup_control(state, td, cpu)) + return 0; + if (tick_broadcast_device.evtdev) return ___tick_broadcast_oneshot_control(state, td, cpu); /* - * If there is no broadcast device, tell the caller not + * If there is no broadcast or wakeup device, tell the caller not * to go into deep idle. */ return -EBUSY; -- 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