From patchwork Thu Jul 4 07:36:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 168462 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp1921570ilk; Thu, 4 Jul 2019 00:36:39 -0700 (PDT) X-Google-Smtp-Source: APXvYqwy+UBdsjHKlqGtpccYJFffibZJS6NsTeuUQTiuPilQYH0tFmwa1ode2qRa6bDM1ih8WG72 X-Received: by 2002:a63:494d:: with SMTP id y13mr1748868pgk.109.1562225799697; Thu, 04 Jul 2019 00:36:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562225799; cv=none; d=google.com; s=arc-20160816; b=b6zkb4AGaEZsr3BrRqrgr906jFhxDBUnK7t9wYHf/LI3h/TP9lXRiVJO7j+tMJeLDz N/uHKv6EiUBIMetlC9a15GZtZm7KHOhvE/bypxwybFJkGFqg/rKDDBlkpsjyfWjp54S0 cnoqsoqg59YN1JKBUUtUDCF7xkLyuM4jmpJrN24zVEHmFCYmkaA9QsDGOmvHjk/J9zxs Hh2Rb/8E+feWh75GMNMxYp9A0KQrqJ7ByILNkq5nyLqHNRofid5hmQ7KwdGIFnYbQ4LO lhGEX0KM+cQ9phUkD7OFOdr2fxvly8hQBsfVUnUT6yWMOJMLUvqWfN0caZ7XWTS85k1l dcfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=URsfVb2C5YnDBdAursEkzykoBuRcfjDfpur3Oh0s0WQ=; b=YG7hfn9RZiEYb6+8phB52f7vRxTgQIFj+8JUkPuSIbw2UVYxX6mJZ7pJdOf62tYFU4 vgNLIZhSJPlRb5UBFaMl7GLLDP8NB0MFAJ4WqX+Ee+hBaghK/eoSdAAlztPHrEUja05G 7GZ/hr7myXefPA68qVw/1AP2JGa4pyFNLQVT/dQ9ossRJTLSV/yC9ETgYk27Xolwr/c8 05UQJ8A960yWUpOB1uKiCt5AivYECY3LVH/3yHXFnqkv+Bv3HCIDj7pBwEEm7mxc8ev9 IShqVoWp8FlIPh27sOBHyFM6FDAPBS75ANQ91oAkLOInR366CiELcuDVairtcMzCRVGZ b9ZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=yLiVb0ti; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 71si4661093plf.156.2019.07.04.00.36.39; Thu, 04 Jul 2019 00:36:39 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=yLiVb0ti; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 S1727251AbfGDHgi (ORCPT + 30 others); Thu, 4 Jul 2019 03:36:38 -0400 Received: from mail-pf1-f196.google.com ([209.85.210.196]:42478 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726267AbfGDHgg (ORCPT ); Thu, 4 Jul 2019 03:36:36 -0400 Received: by mail-pf1-f196.google.com with SMTP id q10so2525174pff.9 for ; Thu, 04 Jul 2019 00:36:36 -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 :mime-version:content-transfer-encoding; bh=URsfVb2C5YnDBdAursEkzykoBuRcfjDfpur3Oh0s0WQ=; b=yLiVb0ti1ToT9rynffrniwkv2vML1oc4vwTfCyXQAAdUBi4tuqOGD2S0dnIXdFl4Eo m86o4yV8wGUA/uIpu8Kl/e30ZKEL1SjkiQstNlymRPfQrrcHFkethJ+EPfRB0xtsSWLd 2kNI6t3JpkKGDhNEIbSrGDTNCLnMGztukSDreTufoFyVpR+Lh37xvOkIKjO+RPfuD26F YxemoCmSJ0/tIchNdpRLrHndHOwhLcaQ5nyTt78yG97nALYDJzqg5Ky0X+cIMcEAwtH3 BFUOOtH7No+gcHUjN210nTxgc/OnJyEIsOOxfD7m+Zb4cK/ThNV1rAfB8t4w+i6/enln crfQ== 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:mime-version:content-transfer-encoding; bh=URsfVb2C5YnDBdAursEkzykoBuRcfjDfpur3Oh0s0WQ=; b=dqfX47i3i4rKnhk/4egz4p5+SIwCKIiW7gy+/mbveVhgxRiSVghEoYpMGIH8+iMRHD ELblKSmvK2SBaun5RQgAWX8mR7tU+xzfj3MkigsNyEJCcZ5P2EpYcDz3VGAMDkWFbZX8 VFKjwXWrFrULQRtlOJ4IAhJGcObMRXfmrMImpzjJ/o50MPbzQAst9UG6xRX8V6CTCHrQ e1SSi9wGfG0A7s83tiUaCv3pMS/Q+PATQMsuQpISo82vee6CaxmybrcW5DF1ucxX3eIA P/YDURwA90Os3rUyyk1I1m0HhpY6QO3iXIlrlhWjC0f04mImGw42QgbZjbcgX8gPfRoU h8dA== X-Gm-Message-State: APjAAAWfy3FhjP2qI0Hu/aYSwego812MX95XOwWbfz8qJceHHMilTqal bFKwWC7e81db1DP6ZhOIvMSDfQ== X-Received: by 2002:a17:90b:8d8:: with SMTP id ds24mr17848618pjb.135.1562225795530; Thu, 04 Jul 2019 00:36:35 -0700 (PDT) Received: from localhost ([122.172.21.205]) by smtp.gmail.com with ESMTPSA id t10sm4342324pjr.13.2019.07.04.00.36.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Jul 2019 00:36:35 -0700 (PDT) From: Viresh Kumar To: Rafael Wysocki , Kevin Hilman , Ulf Hansson , Pavel Machek , Len Brown , Daniel Lezcano Cc: Viresh Kumar , linux-pm@vger.kernel.org, Vincent Guittot , "Rafael J . Wysocki" , linux-kernel@vger.kernel.org Subject: [PATCH V6 2/7] PM / QOS: Rename __dev_pm_qos_read_value() and dev_pm_qos_raw_read_value() Date: Thu, 4 Jul 2019 13:06:18 +0530 Message-Id: X-Mailer: git-send-email 2.21.0.rc0.269.g1a574e7a288b In-Reply-To: References: MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org dev_pm_qos_read_value() will soon need to support more constraint types (min/max frequency) and will have another argument to it, i.e. type of the constraint. While that is fine for the existing users of dev_pm_qos_read_value(), but not that optimal for the callers of __dev_pm_qos_read_value() and dev_pm_qos_raw_read_value() as all the callers of these two routines are only looking for resume latency constraint. Lets make these two routines care only about the resume latency constraint and rename them to __dev_pm_qos_resume_latency() and dev_pm_qos_raw_resume_latency(). Suggested-by: Rafael J. Wysocki Signed-off-by: Viresh Kumar Signed-off-by: Rafael J. Wysocki --- drivers/base/power/domain_governor.c | 2 +- drivers/base/power/qos.c | 13 +++++++++---- drivers/base/power/runtime.c | 2 +- drivers/cpuidle/governor.c | 2 +- include/linux/pm_qos.h | 8 ++++---- 5 files changed, 16 insertions(+), 11 deletions(-) -- 2.21.0.rc0.269.g1a574e7a288b diff --git a/drivers/base/power/domain_governor.c b/drivers/base/power/domain_governor.c index 3838045c9277..20e56a5be01f 100644 --- a/drivers/base/power/domain_governor.c +++ b/drivers/base/power/domain_governor.c @@ -66,7 +66,7 @@ static bool default_suspend_ok(struct device *dev) td->constraint_changed = false; td->cached_suspend_ok = false; td->effective_constraint_ns = 0; - constraint_ns = __dev_pm_qos_read_value(dev); + constraint_ns = __dev_pm_qos_resume_latency(dev); spin_unlock_irqrestore(&dev->power.lock, flags); diff --git a/drivers/base/power/qos.c b/drivers/base/power/qos.c index cfd463212513..7a0d197f0809 100644 --- a/drivers/base/power/qos.c +++ b/drivers/base/power/qos.c @@ -90,16 +90,16 @@ enum pm_qos_flags_status dev_pm_qos_flags(struct device *dev, s32 mask) EXPORT_SYMBOL_GPL(dev_pm_qos_flags); /** - * __dev_pm_qos_read_value - Get PM QoS constraint for a given device. + * __dev_pm_qos_resume_latency - Get resume latency constraint for a given device. * @dev: Device to get the PM QoS constraint value for. * * This routine must be called with dev->power.lock held. */ -s32 __dev_pm_qos_read_value(struct device *dev) +s32 __dev_pm_qos_resume_latency(struct device *dev) { lockdep_assert_held(&dev->power.lock); - return dev_pm_qos_raw_read_value(dev); + return dev_pm_qos_raw_resume_latency(dev); } /** @@ -112,7 +112,12 @@ s32 dev_pm_qos_read_value(struct device *dev) s32 ret; spin_lock_irqsave(&dev->power.lock, flags); - ret = __dev_pm_qos_read_value(dev); + + if (IS_ERR_OR_NULL(dev->power.qos)) + ret = PM_QOS_RESUME_LATENCY_NO_CONSTRAINT; + else + ret = pm_qos_read_value(&dev->power.qos->resume_latency); + spin_unlock_irqrestore(&dev->power.lock, flags); return ret; diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c index 952a1e7057c7..b75335508d2c 100644 --- a/drivers/base/power/runtime.c +++ b/drivers/base/power/runtime.c @@ -275,7 +275,7 @@ static int rpm_check_suspend_allowed(struct device *dev) || (dev->power.request_pending && dev->power.request == RPM_REQ_RESUME)) retval = -EAGAIN; - else if (__dev_pm_qos_read_value(dev) == 0) + else if (__dev_pm_qos_resume_latency(dev) == 0) retval = -EPERM; else if (dev->power.runtime_status == RPM_SUSPENDED) retval = 1; diff --git a/drivers/cpuidle/governor.c b/drivers/cpuidle/governor.c index 9fddf828a76f..2e3e14192bee 100644 --- a/drivers/cpuidle/governor.c +++ b/drivers/cpuidle/governor.c @@ -110,7 +110,7 @@ int cpuidle_governor_latency_req(unsigned int cpu) { int global_req = pm_qos_request(PM_QOS_CPU_DMA_LATENCY); struct device *device = get_cpu_device(cpu); - int device_req = dev_pm_qos_raw_read_value(device); + int device_req = dev_pm_qos_raw_resume_latency(device); return device_req < global_req ? device_req : global_req; } diff --git a/include/linux/pm_qos.h b/include/linux/pm_qos.h index 58e8749ceac5..5e09d4980786 100644 --- a/include/linux/pm_qos.h +++ b/include/linux/pm_qos.h @@ -139,7 +139,7 @@ s32 pm_qos_read_value(struct pm_qos_constraints *c); #ifdef CONFIG_PM enum pm_qos_flags_status __dev_pm_qos_flags(struct device *dev, s32 mask); enum pm_qos_flags_status dev_pm_qos_flags(struct device *dev, s32 mask); -s32 __dev_pm_qos_read_value(struct device *dev); +s32 __dev_pm_qos_resume_latency(struct device *dev); s32 dev_pm_qos_read_value(struct device *dev); int dev_pm_qos_add_request(struct device *dev, struct dev_pm_qos_request *req, enum dev_pm_qos_req_type type, s32 value); @@ -176,7 +176,7 @@ static inline s32 dev_pm_qos_requested_flags(struct device *dev) return dev->power.qos->flags_req->data.flr.flags; } -static inline s32 dev_pm_qos_raw_read_value(struct device *dev) +static inline s32 dev_pm_qos_raw_resume_latency(struct device *dev) { return IS_ERR_OR_NULL(dev->power.qos) ? PM_QOS_RESUME_LATENCY_NO_CONSTRAINT : @@ -189,7 +189,7 @@ static inline enum pm_qos_flags_status __dev_pm_qos_flags(struct device *dev, static inline enum pm_qos_flags_status dev_pm_qos_flags(struct device *dev, s32 mask) { return PM_QOS_FLAGS_UNDEFINED; } -static inline s32 __dev_pm_qos_read_value(struct device *dev) +static inline s32 __dev_pm_qos_resume_latency(struct device *dev) { return PM_QOS_RESUME_LATENCY_NO_CONSTRAINT; } static inline s32 dev_pm_qos_read_value(struct device *dev) { return PM_QOS_RESUME_LATENCY_NO_CONSTRAINT; } @@ -245,7 +245,7 @@ static inline s32 dev_pm_qos_requested_resume_latency(struct device *dev) return PM_QOS_RESUME_LATENCY_NO_CONSTRAINT; } static inline s32 dev_pm_qos_requested_flags(struct device *dev) { return 0; } -static inline s32 dev_pm_qos_raw_read_value(struct device *dev) +static inline s32 dev_pm_qos_raw_resume_latency(struct device *dev) { return PM_QOS_RESUME_LATENCY_NO_CONSTRAINT; }