From patchwork Thu Jun 20 07:35:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 167297 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp1725164ilk; Thu, 20 Jun 2019 00:35:47 -0700 (PDT) X-Google-Smtp-Source: APXvYqxHQ87eHRhFWwfACGxGvISXHLhuO4CQ0YL1NvL3lsKz+kC2+P8G11slttMbSBxwGSyonNbs X-Received: by 2002:a17:902:f216:: with SMTP id gn22mr104909015plb.118.1561016147358; Thu, 20 Jun 2019 00:35:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561016147; cv=none; d=google.com; s=arc-20160816; b=z21g6B9Q4KZaVrh/+ZEVknRgKN3NmJGRMAKElo3F6EwN4lH7q3seGW0Mmwh7ntDhga jQiwa32KTdHHDx0KUVG9fd82ju3JQr2hE+OHq012CgJNNMnBKlg1f5pcsOJaBE6KeODJ UP7gameY6xGTAtMbkJODYQzGF9WoAVr6EN+i666IaU3D1mVvdABOnSYyIoZ8yTKVs+uw dNefHzNidEaZ6ujvsHAV1V3z0d3ikVmKRJHY+ShZER4adZmGB8Tb0gJFg4bz5AUp3+BW HMpyf5TplKA/PBqbu8pKUSd9IhKvYuxHkLbxLZ0QBEOEBkW+aR9AcDdFM3wRj22j4pLS NW9A== 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=+ZHoXqHDnWQNNxjeBIgVIp/1BFcAyIjpzOAOe/B47LU=; b=PNmkzBNzy+6JAsfgsCOsuZP3sk/xe6Oh9kIBk9q7S4AvsffvZGXz8qX67M+Xe3da5G ylNswQVM5Eue9ufMCbCcqOVfQql9a1jg7dC2QJuzz0ZVo0xM3R1js+LE5H522LpdyXXR dikmF+dyIzxsfRfYCGx0XmGJWjFumXHiTubMVzh3Pv5S545DNw8pJGhBScAf+Po3epyL xdg7DZUvFmt2NKrvZQ25eY3C1BR1UEFRfHmGztIIhzXNQIUBXOKyO0wnXKLj2AAZe3Nj Mg65idxjt88+LQJX19SqiRSMD0KIs4nDRBsymEWbM2N+LRQgW4VPkatV/ZhYNVYtyLCK lVpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cD8fnPFb; 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 x4si600857pjn.93.2019.06.20.00.35.46; Thu, 20 Jun 2019 00:35:47 -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=cD8fnPFb; 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 S1727244AbfFTHfp (ORCPT + 30 others); Thu, 20 Jun 2019 03:35:45 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:42526 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725872AbfFTHfp (ORCPT ); Thu, 20 Jun 2019 03:35:45 -0400 Received: by mail-pf1-f194.google.com with SMTP id q10so1157258pff.9 for ; Thu, 20 Jun 2019 00:35:44 -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=+ZHoXqHDnWQNNxjeBIgVIp/1BFcAyIjpzOAOe/B47LU=; b=cD8fnPFbjnlUcmEq/d+FBOHDffPKPfMy/d2kvSq77Vua582eT8LCrDSAp9hlwJR4AZ zxa/VGNkp8W6/Fv0ozb6t67/DDp9dxYR6iKdRYrPBXk6XEXrsjIHRiLR9Qm89e5xCwyC rBWVsWZa6QIkZI9Y3wbB8eTA0L/6ae9JTUvD0z0ZITIoGdFrarDXGlifMpUloS++VWUA 8WLizucE8MFI11UUaA4AQSxQY8oVCqzjpEXLQ9bva2fz68lsZlySzdiORYrTa8jHtGmr atfb4z2VakxSUBV7ui7f7s/yVx0gHQDc00Q2i2PivUwJd+63wd+lnSaHsI9oMYVkY4pe br3g== 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=+ZHoXqHDnWQNNxjeBIgVIp/1BFcAyIjpzOAOe/B47LU=; b=pPVLWFhl5jxNqwg9+oGu1kLh1W7DErHIN+36X1746HY/NYympHZZ8JybrCWyTLd9uI FvgzuViqidkzoYtKOmzgP26ILljv5y7Ff/lPD+uwGG7G/XCSf3Kk/+Jb+TOBzqdXlM4e 7Cob74SoBKmM/qDnccYEHCI0AkNh7PBDRQCcGcdpFs7EtR9q1jDU36T5+4ltwD15cdnA yUKq3ffsGEHpx3VFUEJ6qpbT7U1QJ4Gp+aRrOQJhEvwJ4S0WKxOpMyHww7KfgjVrZZ26 FgmKwvtF6WgY6bwd4Ihh18RnX2c/gSWuJZ61Pfo62QuNuYH0WF0lkQD+H8RTPJA4TPuk vviQ== X-Gm-Message-State: APjAAAVCFYLN6xkDZ5+ERVnZwOMrCd5WttspaEch6XQRP2jme205Xuk9 fdIsYinozCE47Bq8ZRHGOWBw+w== X-Received: by 2002:a63:8ac3:: with SMTP id y186mr5976672pgd.198.1561016144144; Thu, 20 Jun 2019 00:35:44 -0700 (PDT) Received: from localhost ([122.172.66.84]) by smtp.gmail.com with ESMTPSA id c129sm23187235pfa.106.2019.06.20.00.35.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Jun 2019 00:35:43 -0700 (PDT) From: Viresh Kumar To: Rafael Wysocki , Len Brown , Pavel Machek , Kevin Hilman , Ulf Hansson Cc: Viresh Kumar , linux-pm@vger.kernel.org, Vincent Guittot , Qais.Yousef@arm.com, mka@chromium.org, juri.lelli@gmail.com, linux-kernel@vger.kernel.org Subject: [PATCH V4 1/6] PM / QOS: Pass request type to dev_pm_qos_{add|remove}_notifier() Date: Thu, 20 Jun 2019 13:05:24 +0530 Message-Id: <9c6f189e4853b332ac3e28d40d7ef6e310501e9e.1561014965.git.viresh.kumar@linaro.org> 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 In order to use the same set of routines to register notifiers for different request types, update the existing dev_pm_qos_{add|remove}_notifier() routines with an additional parameter: request-type. For now, it only supports resume-latency request type but will be extended to frequency limit (min/max) constraints later on. Reviewed-by: Matthias Kaehlcke Reviewed-by: Ulf Hansson Signed-off-by: Viresh Kumar --- Documentation/power/pm_qos_interface.txt | 10 ++++++---- drivers/base/power/domain.c | 8 +++++--- drivers/base/power/qos.c | 14 ++++++++++++-- include/linux/pm_qos.h | 12 ++++++++---- 4 files changed, 31 insertions(+), 13 deletions(-) -- 2.21.0.rc0.269.g1a574e7a288b diff --git a/Documentation/power/pm_qos_interface.txt b/Documentation/power/pm_qos_interface.txt index 19c5f7b1a7ba..ec7d662d1707 100644 --- a/Documentation/power/pm_qos_interface.txt +++ b/Documentation/power/pm_qos_interface.txt @@ -164,12 +164,14 @@ directory. Notification mechanisms: The per-device PM QoS framework has a per-device notification tree. -int dev_pm_qos_add_notifier(device, notifier): -Adds a notification callback function for the device. +int dev_pm_qos_add_notifier(device, notifier, type): +Adds a notification callback function for the device for a particular request +type. + The callback is called when the aggregated value of the device constraints list -is changed (for resume latency device PM QoS only). +is changed. -int dev_pm_qos_remove_notifier(device, notifier): +int dev_pm_qos_remove_notifier(device, notifier, type): Removes the notification callback function for the device. diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 33c30c1e6a30..b063bc41b0a9 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -1536,7 +1536,8 @@ static int genpd_add_device(struct generic_pm_domain *genpd, struct device *dev, if (ret) genpd_free_dev_data(dev, gpd_data); else - dev_pm_qos_add_notifier(dev, &gpd_data->nb); + dev_pm_qos_add_notifier(dev, &gpd_data->nb, + DEV_PM_QOS_RESUME_LATENCY); return ret; } @@ -1569,7 +1570,8 @@ static int genpd_remove_device(struct generic_pm_domain *genpd, pdd = dev->power.subsys_data->domain_data; gpd_data = to_gpd_data(pdd); - dev_pm_qos_remove_notifier(dev, &gpd_data->nb); + dev_pm_qos_remove_notifier(dev, &gpd_data->nb, + DEV_PM_QOS_RESUME_LATENCY); genpd_lock(genpd); @@ -1597,7 +1599,7 @@ static int genpd_remove_device(struct generic_pm_domain *genpd, out: genpd_unlock(genpd); - dev_pm_qos_add_notifier(dev, &gpd_data->nb); + dev_pm_qos_add_notifier(dev, &gpd_data->nb, DEV_PM_QOS_RESUME_LATENCY); return ret; } diff --git a/drivers/base/power/qos.c b/drivers/base/power/qos.c index 6c91f8df1d59..cfd463212513 100644 --- a/drivers/base/power/qos.c +++ b/drivers/base/power/qos.c @@ -467,6 +467,7 @@ EXPORT_SYMBOL_GPL(dev_pm_qos_remove_request); * * @dev: target device for the constraint * @notifier: notifier block managed by caller. + * @type: request type. * * Will register the notifier into a notification chain that gets called * upon changes to the target value for the device. @@ -474,10 +475,14 @@ EXPORT_SYMBOL_GPL(dev_pm_qos_remove_request); * If the device's constraints object doesn't exist when this routine is called, * it will be created (or error code will be returned if that fails). */ -int dev_pm_qos_add_notifier(struct device *dev, struct notifier_block *notifier) +int dev_pm_qos_add_notifier(struct device *dev, struct notifier_block *notifier, + enum dev_pm_qos_req_type type) { int ret = 0; + if (WARN_ON(type != DEV_PM_QOS_RESUME_LATENCY)) + return -EINVAL; + mutex_lock(&dev_pm_qos_mtx); if (IS_ERR(dev->power.qos)) @@ -500,15 +505,20 @@ EXPORT_SYMBOL_GPL(dev_pm_qos_add_notifier); * * @dev: target device for the constraint * @notifier: notifier block to be removed. + * @type: request type. * * Will remove the notifier from the notification chain that gets called * upon changes to the target value. */ int dev_pm_qos_remove_notifier(struct device *dev, - struct notifier_block *notifier) + struct notifier_block *notifier, + enum dev_pm_qos_req_type type) { int retval = 0; + if (WARN_ON(type != DEV_PM_QOS_RESUME_LATENCY)) + return -EINVAL; + mutex_lock(&dev_pm_qos_mtx); /* Silently return if the constraints object is not present. */ diff --git a/include/linux/pm_qos.h b/include/linux/pm_qos.h index 6ea1ae373d77..1f4d456e8fff 100644 --- a/include/linux/pm_qos.h +++ b/include/linux/pm_qos.h @@ -146,9 +146,11 @@ int dev_pm_qos_add_request(struct device *dev, struct dev_pm_qos_request *req, int dev_pm_qos_update_request(struct dev_pm_qos_request *req, s32 new_value); int dev_pm_qos_remove_request(struct dev_pm_qos_request *req); int dev_pm_qos_add_notifier(struct device *dev, - struct notifier_block *notifier); + struct notifier_block *notifier, + enum dev_pm_qos_req_type type); int dev_pm_qos_remove_notifier(struct device *dev, - struct notifier_block *notifier); + struct notifier_block *notifier, + enum dev_pm_qos_req_type type); void dev_pm_qos_constraints_init(struct device *dev); void dev_pm_qos_constraints_destroy(struct device *dev); int dev_pm_qos_add_ancestor_request(struct device *dev, @@ -202,10 +204,12 @@ static inline int dev_pm_qos_update_request(struct dev_pm_qos_request *req, static inline int dev_pm_qos_remove_request(struct dev_pm_qos_request *req) { return 0; } static inline int dev_pm_qos_add_notifier(struct device *dev, - struct notifier_block *notifier) + struct notifier_block *notifier, + enum dev_pm_qos_req_type type); { return 0; } static inline int dev_pm_qos_remove_notifier(struct device *dev, - struct notifier_block *notifier) + struct notifier_block *notifier, + enum dev_pm_qos_req_type type) { return 0; } static inline void dev_pm_qos_constraints_init(struct device *dev) {