From patchwork Fri Nov 21 09:29:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 5353671 X-Patchwork-Delegate: lenb@kernel.org Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A48D29F2F1 for ; Fri, 21 Nov 2014 09:30:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C2B5A20172 for ; Fri, 21 Nov 2014 09:30:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D78DD2017E for ; Fri, 21 Nov 2014 09:30:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754592AbaKUJaH (ORCPT ); Fri, 21 Nov 2014 04:30:07 -0500 Received: from mail-wi0-f172.google.com ([209.85.212.172]:56539 "EHLO mail-wi0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755026AbaKUJaE (ORCPT ); Fri, 21 Nov 2014 04:30:04 -0500 Received: by mail-wi0-f172.google.com with SMTP id n3so11342559wiv.11 for ; Fri, 21 Nov 2014 01:29:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=cIOyj912P3F9cSniQBqPJHuph4SsHOFAstjnW3snDUc=; b=b47Rrd9BVJnIWrpkyXTaaDF52l2Wls9hVf74sC0mwQkGHQbWXzyY5agAEAMg8wR6e1 ECl9ZBTyB072U56uy8qBrWm4MSZyFa0oUHjjTp5+hWKlTJeFGoLxCvOZlIdSDODrXUTm 6KQtsbpRpBJ7WryxkF1XEbbMMZvJ3p4Ht5LLm2eNgKl3sOy5N5RIRzU2PsPjF3lSPrY9 T9XEW3KNhdAoT9sX+ToKcVmS0h1sYlQpV0tukONhW2/Hb6GEETex+aY7jpe1qJQQg0AD l8xPpDKM9txNg5zU3aYBCoJ/O+92myAqOaszHfoZ+pJItzIbLJTbbvT3gpU7QqynDYu2 Q55g== X-Gm-Message-State: ALoCoQmCmlk02Cj/ne1/STH7RVBf8MtnLvyOOBdXBe+U4giF01SMK4GOmNZ7Wawmu2NSi0H0O5G2 X-Received: by 10.194.189.81 with SMTP id gg17mr5363549wjc.115.1416562198570; Fri, 21 Nov 2014 01:29:58 -0800 (PST) Received: from localhost.localdomain ([109.215.21.36]) by mx.google.com with ESMTPSA id pj4sm7259002wjb.16.2014.11.21.01.29.57 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 21 Nov 2014 01:29:58 -0800 (PST) From: Daniel Lezcano To: rjw@rjwysocki.net Cc: linux-pm@vger.kernel.org, linaro-kernel@lists.linaro.org, linux-acpi@vger.kernel.org Subject: [PATCH 2/2] cpuidle: Remove TIME_INVALID flag Date: Fri, 21 Nov 2014 10:29:52 +0100 Message-Id: <1416562192-14114-2-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1416562192-14114-1-git-send-email-daniel.lezcano@linaro.org> References: <1416562192-14114-1-git-send-email-daniel.lezcano@linaro.org> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The time measurement is always valid for all the drivers for all the idle states. This flag is no longer needed. Remove it as well as the code using it. Signed-off-by: Daniel Lezcano --- drivers/cpuidle/governors/ladder.c | 8 ++------ drivers/cpuidle/governors/menu.c | 25 ++++++++----------------- include/linux/cpuidle.h | 2 -- 3 files changed, 10 insertions(+), 25 deletions(-) diff --git a/drivers/cpuidle/governors/ladder.c b/drivers/cpuidle/governors/ladder.c index 37263d9..55a1fc9 100644 --- a/drivers/cpuidle/governors/ladder.c +++ b/drivers/cpuidle/governors/ladder.c @@ -79,12 +79,8 @@ static int ladder_select_state(struct cpuidle_driver *drv, last_state = &ldev->states[last_idx]; - if (!(drv->states[last_idx].flags & CPUIDLE_FLAG_TIME_INVALID)) { - last_residency = cpuidle_get_last_residency(dev) - \ - drv->states[last_idx].exit_latency; - } - else - last_residency = last_state->threshold.promotion_time + 1; + last_residency = cpuidle_get_last_residency(dev) - \ + drv->states[last_idx].exit_latency; /* consider promotion */ if (last_idx < drv->state_count - 1 && diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c index 659d7b0..2191ea0 100644 --- a/drivers/cpuidle/governors/menu.c +++ b/drivers/cpuidle/governors/menu.c @@ -395,32 +395,23 @@ static void menu_update(struct cpuidle_driver *drv, struct cpuidle_device *dev) * 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_INVALID)) { - /* Use timer value as is */ - measured_us = data->next_timer_us; - } else { - /* Use measured value */ - measured_us = cpuidle_get_last_residency(dev); + /* Use measured value */ + measured_us = cpuidle_get_last_residency(dev); - /* Deduct exit latency */ - if (measured_us > target->exit_latency) - measured_us -= target->exit_latency; + /* 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; - } + /* 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]; diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h index a07e087..d697b9e 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h @@ -53,7 +53,6 @@ struct cpuidle_state { }; /* Idle State Flags */ -#define CPUIDLE_FLAG_TIME_INVALID (0x01) /* is residency time measurable? */ #define CPUIDLE_FLAG_COUPLED (0x02) /* state applies to multiple cpus */ #define CPUIDLE_FLAG_TIMER_STOP (0x04) /* timer is stopped on this state */ @@ -90,7 +89,6 @@ DECLARE_PER_CPU(struct cpuidle_device, cpuidle_dev); * cpuidle_get_last_residency - retrieves the last state's residency time * @dev: the target CPU * - * NOTE: this value is invalid if CPUIDLE_FLAG_TIME_INVALID is set */ static inline int cpuidle_get_last_residency(struct cpuidle_device *dev) {