From patchwork Thu Oct 3 12:45:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 175084 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp264859ill; Thu, 3 Oct 2019 05:46:20 -0700 (PDT) X-Google-Smtp-Source: APXvYqyYdeKXE6bjutq5Gtz+GEvEPSzea39isp6MPMDVchxxyUzBJemPnDIDYU66sckOFjxLtD5U X-Received: by 2002:a50:fa9a:: with SMTP id w26mr9298071edr.227.1570106780279; Thu, 03 Oct 2019 05:46:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570106780; cv=none; d=google.com; s=arc-20160816; b=RvRG9qUq4N8XhCyKzqkivYYFaJOBC5o7H88rpHr/LrzpP/akPLuQzc46b+n8H1YYWD sG7VQuXVHoym2dEnS30JiCd+cAuO1HhFtdmYPu8Fq2KAVPfGhhhEF8jHGGErLBwdX8rs 2cNVl0srrov9HzydLi9V7PgC7ns8l8o0lUekIxFC1mCV/fcYm34ORNSCXk7KPc8xkBTL W6itlJchgQG+w/aSEVoII7n6LJSwd78veBRL98Iw2UbbNuYm6q5rxXoDIxA99KLnKfjX U63mOuXmaCMNqDQBa0vk242AjbuCdN8wFVezEbh7kyjfV3qT4rgJwbDCHZO4/EaV9l+t zMCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=kEN8tPAT2fA9Rfc8gxL4d7nyWjikV+WP3V/1RcMXwQA=; b=f4WP+uGhAVlCqQJlbgufHKbRyLIRZy38o6JNGTTST+v4cZI09ISJNKF1ruBRllZsph B7bIFD17SurijqYKzc3TlZGPUf14CmSQn6L+wQgNWEM9S5HP5KswHcGc43z0JsGzbRsT B/03Ytb3F+yUGyahWjfb+zjI7Tlec511tB6hP64MWmU7R9xCA1eu2AR2gCm6rCDmIRy4 6RLIXlPFlR3bA6uSMsP8IK3FJY5plT+i9SbgOGMVmBKJIlvY1d+hiVETpGpI7WO6pDRo Znu+DBlymkHOtOZ93QO8JAE0cpW9cBQ1gh8GkhkmWrj2fAY3gQZB4QHogL/2Fvkt+VK6 6JXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gUdxq5Ui; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b22si1133580eje.299.2019.10.03.05.46.20; Thu, 03 Oct 2019 05:46:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gUdxq5Ui; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730027AbfJCMqK (ORCPT + 10 others); Thu, 3 Oct 2019 08:46:10 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:52245 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729359AbfJCMqJ (ORCPT ); Thu, 3 Oct 2019 08:46:09 -0400 Received: by mail-wm1-f66.google.com with SMTP id r19so2179486wmh.2 for ; Thu, 03 Oct 2019 05:46:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=kEN8tPAT2fA9Rfc8gxL4d7nyWjikV+WP3V/1RcMXwQA=; b=gUdxq5Ui65bKot0+EettEbDhNJnplDnQFK83G8i4nEsaazLAQHywqPF3RghfOWxMta xeW2S8ahkc/PkzIe8SIDjYRuBcIeiCjQhS9lS01FDmd3LZyWaOrSx4icjDOGQjqfLpa+ /KQSD/Kg2Aa7Fe2r80CHuCkgxpY0ycC0QZQPjS31aV/ob9Rzu/cpmC4q/cJd2ym6KKWk znMIMYmkr3kbThk62JWk4ZNv3Q60asjysUEYb6uFuubSdO0rVu5c3qkCXSJ/ZOz57eht 4nGi+jRaE9uN7YMPEHl5aJWQ2tkDPCcu5Np9QcuhPlZsX8vCBIM+KxzhuUKp7H8M2puJ nS/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=kEN8tPAT2fA9Rfc8gxL4d7nyWjikV+WP3V/1RcMXwQA=; b=qPNreqodtNIbFAd1e6pFMJgoY+8/2jok/dUbH1zg6kXx2wgv/yNh2IHapx+OfbAVJ2 0mxvZ8/JZ+6j3ezl7vs2fZ/6t7XbO0f56ylwX0np0U2dEGDYkktyM4MWJt/PlCJuUWjX F4wq7EE7ivJSAbRt/2TgMBjNc9L3E36pUI6A4dfhvVHOcX+Ja2UwgGe+5zUwtowXv6XM mY/KI6BSQrLKWNWgI8AQKA58+hKY1wqDarSf6H0O1qMOm/PgDc5nU+Mbz2rs23/tfMO9 UXiA6ZfiPI2P4Ev37LMTk8XnNSmV0ZYtsc1iDlwsMPM5RA+KiHmwhiPeIooneLDfAHqz Zgdg== X-Gm-Message-State: APjAAAX4FZ7Jt9FcK2LWMWDWT9NUzxOimxgMF1bvL9DT0hOYvOghvHJo XRdTsUyFBUq7/UzaI7B2Lrz7Z0e2mws= X-Received: by 2002:a1c:6a0f:: with SMTP id f15mr6241489wmc.159.1570106767667; Thu, 03 Oct 2019 05:46:07 -0700 (PDT) Received: from localhost.localdomain ([2a01:e34:ed2f:f020:7990:8bfa:5771:282b]) by smtp.gmail.com with ESMTPSA id m62sm2453586wmm.35.2019.10.03.05.46.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Oct 2019 05:46:07 -0700 (PDT) From: Daniel Lezcano To: rjw@rjwysocki.net Cc: Mathieu Poirier , linux-pm@vger.kernel.org (open list:POWER MANAGEMENT CORE), linux-kernel@vger.kernel.org (open list) Subject: [PATCH V3 3/3] powercap/drivers/idle_inject: Specify the idle state to inject Date: Thu, 3 Oct 2019 14:45:41 +0200 Message-Id: <20191003124541.27147-3-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191003124541.27147-1-daniel.lezcano@linaro.org> References: <20191003124541.27147-1-daniel.lezcano@linaro.org> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Currently the idle injection framework only allows to inject the deepest idle state available on the system. Give the opportunity to specify which idle state we want to inject by adding a new function helper to set the state and use it when calling play_idle(). There is no functional changes, the cpuidle state is the deepest one. Signed-off-by: Daniel Lezcano Acked-by: Mathieu Poirier --- drivers/powercap/idle_inject.c | 14 +++++++++++++- include/linux/idle_inject.h | 3 +++ 2 files changed, 16 insertions(+), 1 deletion(-) -- 2.17.1 diff --git a/drivers/powercap/idle_inject.c b/drivers/powercap/idle_inject.c index 233c878cbf46..a612c425d74c 100644 --- a/drivers/powercap/idle_inject.c +++ b/drivers/powercap/idle_inject.c @@ -66,6 +66,7 @@ struct idle_inject_thread { */ struct idle_inject_device { struct hrtimer timer; + int state; unsigned int idle_duration_us; unsigned int run_duration_us; unsigned long int cpumask[0]; @@ -140,7 +141,7 @@ static void idle_inject_fn(unsigned int cpu) iit->should_run = 0; play_idle(READ_ONCE(ii_dev->idle_duration_us), - cpuidle_find_deepest_state()); + READ_ONCE(ii_dev->state)); } /** @@ -171,6 +172,16 @@ void idle_inject_get_duration(struct idle_inject_device *ii_dev, *idle_duration_us = READ_ONCE(ii_dev->idle_duration_us); } +/** + * idle_inject_set_state - set the idle state to inject + * @state: an integer for the idle state to inject + */ +void idle_inject_set_state(struct idle_inject_device *ii_dev, int state) +{ + if (state >= CPUIDLE_STATE_NOUSE && state < CPUIDLE_STATE_MAX) + WRITE_ONCE(ii_dev->state, state); +} + /** * idle_inject_start - start idle injections * @ii_dev: idle injection control device structure @@ -299,6 +310,7 @@ struct idle_inject_device *idle_inject_register(struct cpumask *cpumask) cpumask_copy(to_cpumask(ii_dev->cpumask), cpumask); hrtimer_init(&ii_dev->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); ii_dev->timer.function = idle_inject_timer_fn; + ii_dev->state = cpuidle_find_deepest_state(); for_each_cpu(cpu, to_cpumask(ii_dev->cpumask)) { diff --git a/include/linux/idle_inject.h b/include/linux/idle_inject.h index a445cd1a36c5..e2b26b9ccd34 100644 --- a/include/linux/idle_inject.h +++ b/include/linux/idle_inject.h @@ -26,4 +26,7 @@ void idle_inject_set_duration(struct idle_inject_device *ii_dev, void idle_inject_get_duration(struct idle_inject_device *ii_dev, unsigned int *run_duration_us, unsigned int *idle_duration_us); + +void idle_inject_set_state(struct idle_inject_device *ii_dev, int state); + #endif /* __IDLE_INJECT_H__ */