From patchwork Mon Oct 20 16:25:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 39055 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f71.google.com (mail-ee0-f71.google.com [74.125.83.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B19AE203C5 for ; Mon, 20 Oct 2014 16:26:26 +0000 (UTC) Received: by mail-ee0-f71.google.com with SMTP id e51sf918074eek.6 for ; Mon, 20 Oct 2014 09:26:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=X8dITm38ivKJQ+/CmW/ZIj2JD/ISlgbzU9T8kldEhX0=; b=YuUt/v1N0orlgPVLUAo8iAeDje8NP7HlJJX+TlSKryXTN60URfrVViWxdIZprrcQGJ 9kld9q6gwHpgAx3vKVltPKeFRdSs/pMAop+H3nT1SQPdUPy36vph3QsabmAnKXCQNSHv bZk/0Wsw/i5+Q718e6o0mV5LiqCSvFY1amsgJvhRyV//V+jQcPgn0OqrGeG3E9XWkp0J e8vdVioC6gXbf5qxSS/xdwypOnzGLsdZBcnc6pJfUaVcrXl8FOVnstJVmZqkFCthAR3u gyDMchaktHoAR+XeCcJZVe7U9yXggfMU194+BnWtsGFW3NOESVvJtSnE24Ih14rCPdX/ InEA== X-Gm-Message-State: ALoCoQkfLQNTdoEI2gdesT9ffvUsm3uFLrsGvADima+kYJtKUhmyk4u/vTr3CyqoLmJZGpVGUvZh X-Received: by 10.152.9.37 with SMTP id w5mr3324laa.10.1413822385396; Mon, 20 Oct 2014 09:26:25 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.37.133 with SMTP id y5ls59741laj.95.gmail; Mon, 20 Oct 2014 09:26:25 -0700 (PDT) X-Received: by 10.112.148.199 with SMTP id tu7mr29011396lbb.7.1413822385060; Mon, 20 Oct 2014 09:26:25 -0700 (PDT) Received: from mail-lb0-f179.google.com (mail-lb0-f179.google.com. [209.85.217.179]) by mx.google.com with ESMTPS id jt11si11001863lab.123.2014.10.20.09.26.24 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 20 Oct 2014 09:26:24 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.179 as permitted sender) client-ip=209.85.217.179; Received: by mail-lb0-f179.google.com with SMTP id l4so4205561lbv.10 for ; Mon, 20 Oct 2014 09:26:23 -0700 (PDT) X-Received: by 10.152.5.38 with SMTP id p6mr23852588lap.44.1413822383665; Mon, 20 Oct 2014 09:26:23 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.84.229 with SMTP id c5csp339336lbz; Mon, 20 Oct 2014 09:26:22 -0700 (PDT) X-Received: by 10.70.135.68 with SMTP id pq4mr2802239pdb.165.1413822381455; Mon, 20 Oct 2014 09:26:21 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id rp1si8256659pbc.214.2014.10.20.09.26.20 for ; Mon, 20 Oct 2014 09:26:21 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752181AbaJTQ0C (ORCPT + 27 others); Mon, 20 Oct 2014 12:26:02 -0400 Received: from mail-wi0-f179.google.com ([209.85.212.179]:58321 "EHLO mail-wi0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752062AbaJTQZ5 (ORCPT ); Mon, 20 Oct 2014 12:25:57 -0400 Received: by mail-wi0-f179.google.com with SMTP id d1so6854539wiv.12 for ; Mon, 20 Oct 2014 09:25:54 -0700 (PDT) X-Received: by 10.194.206.36 with SMTP id ll4mr34774220wjc.21.1413822354338; Mon, 20 Oct 2014 09:25:54 -0700 (PDT) Received: from localhost.localdomain (AToulouse-656-1-960-30.w90-50.abo.wanadoo.fr. [90.50.217.30]) by mx.google.com with ESMTPSA id cs2sm10155776wib.2.2014.10.20.09.25.52 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 20 Oct 2014 09:25:53 -0700 (PDT) From: Daniel Lezcano To: rjw@rjwysocki.net Cc: peterz@infradead.org, nicolas.pitre@linaro.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, linaro-kernel@lists.linaro.org Subject: [PATCH 5/5] cpuidle: menu: Move the update function before its declaration Date: Mon, 20 Oct 2014 18:25:43 +0200 Message-Id: <1413822343-1972-5-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1413822343-1972-1-git-send-email-daniel.lezcano@linaro.org> References: <1413822343-1972-1-git-send-email-daniel.lezcano@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: daniel.lezcano@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.179 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , In order to prevent a pointless forward declaration, just move the function at the beginning of the file. This patch does not change the behavior of the governor, it is just code reordering. Signed-off-by: Daniel Lezcano --- drivers/cpuidle/governors/menu.c | 149 +++++++++++++++++++-------------------- 1 file changed, 74 insertions(+), 75 deletions(-) diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c index 6ae8390..0ac76b1 100644 --- a/drivers/cpuidle/governors/menu.c +++ b/drivers/cpuidle/governors/menu.c @@ -184,7 +184,6 @@ static inline int performance_multiplier(unsigned long nr_iowaiters, unsigned lo static DEFINE_PER_CPU(struct menu_device, menu_devices); -static void menu_update(struct cpuidle_driver *drv, struct cpuidle_device *dev); /* This implements DIV_ROUND_CLOSEST but avoids 64 bit division */ static u64 div_round64(u64 dividend, u32 divisor) @@ -192,6 +191,80 @@ static u64 div_round64(u64 dividend, u32 divisor) return div_u64(dividend + (divisor / 2), divisor); } +/** + * menu_update - attempts to guess what happened after entry + * @drv: cpuidle driver containing state data + * @dev: the CPU + */ +static void menu_update(struct cpuidle_driver *drv, struct cpuidle_device *dev) +{ + struct menu_device *data = &__get_cpu_var(menu_devices); + int last_idx = data->last_state_idx; + struct cpuidle_state *target = &drv->states[last_idx]; + unsigned int measured_us; + unsigned int new_factor; + + /* + * Try to figure out how much time passed between entry to low + * power state and occurrence of the wakeup event. + * + * If the entered idle state didn't support residency measurements, + * we are basically lost in the dark how much time passed. + * As a compromise, assume we slept for the whole expected time. + * + * Any measured amount of time will include the exit latency. + * Since we are interested in when the wakeup begun, not when it + * was completed, we must subtract the exit latency. However, if + * the measured amount of time is less than the exit latency, + * assume the state was never reached and the exit latency is 0. + */ + if (unlikely(!(target->flags & CPUIDLE_FLAG_TIME_VALID))) { + /* Use timer value as is */ + measured_us = data->next_timer_us; + + } else { + /* Use measured value */ + measured_us = cpuidle_get_last_residency(dev); + + /* Deduct exit latency */ + if (measured_us > target->exit_latency) + measured_us -= target->exit_latency; + + /* Make sure our coefficients do not exceed unity */ + if (measured_us > data->next_timer_us) + measured_us = data->next_timer_us; + } + + /* Update our correction ratio */ + new_factor = data->correction_factor[data->bucket]; + new_factor -= new_factor / DECAY; + + if (data->next_timer_us > 0 && measured_us < MAX_INTERESTING) + new_factor += RESOLUTION * measured_us / data->next_timer_us; + else + /* + * we were idle so long that we count it as a perfect + * prediction + */ + new_factor += RESOLUTION; + + /* + * We don't want 0 as factor; we always want at least + * a tiny bit of estimated time. Fortunately, due to rounding, + * new_factor will stay nonzero regardless of measured_us values + * and the compiler can eliminate this test as long as DECAY > 1. + */ + if (DECAY == 1 && unlikely(new_factor == 0)) + new_factor = 1; + + data->correction_factor[data->bucket] = new_factor; + + /* update the repeating-pattern data */ + data->intervals[data->interval_ptr++] = measured_us; + if (data->interval_ptr >= INTERVALS) + data->interval_ptr = 0; +} + /* * Try detecting repeating patterns by keeping track of the last 8 * intervals, and checking if the standard deviation of that set @@ -378,80 +451,6 @@ static void menu_reflect(struct cpuidle_device *dev, int index) } /** - * menu_update - attempts to guess what happened after entry - * @drv: cpuidle driver containing state data - * @dev: the CPU - */ -static void menu_update(struct cpuidle_driver *drv, struct cpuidle_device *dev) -{ - struct menu_device *data = &__get_cpu_var(menu_devices); - int last_idx = data->last_state_idx; - struct cpuidle_state *target = &drv->states[last_idx]; - unsigned int measured_us; - unsigned int new_factor; - - /* - * Try to figure out how much time passed between entry to low - * power state and occurrence of the wakeup event. - * - * If the entered idle state didn't support residency measurements, - * we are basically lost in the dark how much time passed. - * As a compromise, assume we slept for the whole expected time. - * - * Any measured amount of time will include the exit latency. - * Since we are interested in when the wakeup begun, not when it - * was completed, we must subtract the exit latency. However, if - * the measured amount of time is less than the exit latency, - * assume the state was never reached and the exit latency is 0. - */ - if (unlikely(!(target->flags & CPUIDLE_FLAG_TIME_VALID))) { - /* Use timer value as is */ - measured_us = data->next_timer_us; - - } else { - /* Use measured value */ - measured_us = cpuidle_get_last_residency(dev); - - /* Deduct exit latency */ - if (measured_us > target->exit_latency) - measured_us -= target->exit_latency; - - /* Make sure our coefficients do not exceed unity */ - if (measured_us > data->next_timer_us) - measured_us = data->next_timer_us; - } - - /* Update our correction ratio */ - new_factor = data->correction_factor[data->bucket]; - new_factor -= new_factor / DECAY; - - if (data->next_timer_us > 0 && measured_us < MAX_INTERESTING) - new_factor += RESOLUTION * measured_us / data->next_timer_us; - else - /* - * we were idle so long that we count it as a perfect - * prediction - */ - new_factor += RESOLUTION; - - /* - * We don't want 0 as factor; we always want at least - * a tiny bit of estimated time. Fortunately, due to rounding, - * new_factor will stay nonzero regardless of measured_us values - * and the compiler can eliminate this test as long as DECAY > 1. - */ - if (DECAY == 1 && unlikely(new_factor == 0)) - new_factor = 1; - - data->correction_factor[data->bucket] = new_factor; - - /* update the repeating-pattern data */ - data->intervals[data->interval_ptr++] = measured_us; - if (data->interval_ptr >= INTERVALS) - data->interval_ptr = 0; -} - -/** * menu_enable_device - scans a CPU's states and does setup * @drv: cpuidle driver * @dev: the CPU