From patchwork Wed Jun 20 17:22:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 139373 Delivered-To: patches@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1050481lji; Wed, 20 Jun 2018 10:22:44 -0700 (PDT) X-Received: by 2002:a2e:4dcc:: with SMTP id c73-v6mr14319561ljd.135.1529515364685; Wed, 20 Jun 2018 10:22:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529515364; cv=none; d=google.com; s=arc-20160816; b=K92W4dNU4S7s4C2aL5CkWSJQOzw0++79xcTpOzz/YJT56g+jrSIba3rJTajJ4LvU9n 3nqhRPK67qxS18uOOn9o4LsTv5g4H7Z+N7IeFBRSfVYUhf1TX07lqsdMKi/LtL1QLdZ2 2i+wFQxcW7YN9SVM94vo/f/VUgjexgm/Dydk418OvGsFvrJjff49dTPAqKdwDxKg1+Pf YKzkkr0+fSM82knO6iIEyXL1YCrAvya4Yfl+1iejri5j3RAw4E9+eQRPKxoU47w5dDs1 KUL/+okkOO9xQ1qONyHxCCeUtfTqV2WeX+UlGikWiNMzyG3t1pTdcwsVpnsLB1MmtYTD ZSWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=40LOjQ+YPGx6FLKxOB2XtXKEBIZOB0eV+AE7c0B9P1E=; b=dWA+YCdyl41zhURaL6eJVsct4Mtt/B1Afpfs3sESnbKU0LFd4UFpflJxkSRyU9TaWG xFRFU0SZyOZ4ZF74znSHBQSNOy89GV8jl0/ohfITpxTyGQ13FgIvNHNGU5tEvzY6rM5H OX67jR5z/+l46vYuJoIlcU/E2RY/b1TX1EEjjZ9+XtxRVX9nGMc6Ulum1p4Ob1OEk9OX eu2JdsOp5QnrhxwIIOu4Ge+4hKW/BV1REJUZw9giEqHHzAust7N99xioePwrCyXthM8y dEgGZ+jjTihldrObh5XQaj/rdJiMJaxu3Q+wm55QzfT7n3H6g+/t5dQimqEkhpHvZJY3 U7RQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=aWFax21m; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id z12-v6sor735653ljz.68.2018.06.20.10.22.44 for (Google Transport Security); Wed, 20 Jun 2018 10:22:44 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=aWFax21m; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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=40LOjQ+YPGx6FLKxOB2XtXKEBIZOB0eV+AE7c0B9P1E=; b=aWFax21mb/OlcZ7istRxEXtPKUgExdCY0cZkrEYF2+Jr5f3yKt7cA4JqeDOe8p1AJY NNUJv+K8Al6QpPca5OFrRctUKi+y1W6JOcechSQQAEBT+F3kXon2QFO3P8WiL1gAl/Jp QxV1m/BbjaPYRQ1CJfXLnW72fnBPVUOcxglkk= 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=40LOjQ+YPGx6FLKxOB2XtXKEBIZOB0eV+AE7c0B9P1E=; b=OuVqguG9CH+B0OGJiMONlFzPMJVBmwfMAi9L2oGr2IOqPuL33sfyP9KXYpPt+o59I/ k51uB9AAiYp7nh6KsQfww3TJQ3cV1eWO6C6rLfgTyVtcyHpIUzxvpCdVnUAKKnRctEea gc1N3KEBfFrzufUmrulh7rtwahxATE1eUaEUQzbXOSgYiDYKPUhGGkA54DLRPfvpCM9t JOwBB1wZMJU1zBVLmxoDYZ+FlNEbUvADkmqxGAZxD8Kom1sVOaU1/ATFa0Rdy4ix9lLH y2hz29TqzbsGiQ9fkyORkKJ1o8nBBWQf/XF2kBtA8pnAhB3uDkzOWN6/zENI4rfncHi8 6Y1Q== X-Gm-Message-State: APt69E0jKJicUg76Pikr3+x7oPeha+C3xPeJ5fOsjGMAr0cYLT2/IsaV tMhNnyu9lVdf7UVP42bD6MjqvmOo X-Google-Smtp-Source: ADUXVKIIJjPRC5qpFFEOx8+I/8Zau9QXY7+lIPwkDkUPtNuVr2VDIS66YI54o1YXlQncriceQEnUqg== X-Received: by 2002:a2e:1d59:: with SMTP id d86-v6mr15375209ljd.104.1529515364476; Wed, 20 Jun 2018 10:22:44 -0700 (PDT) Return-Path: Received: from localhost.localdomain (h-158-174-22-210.NA.cust.bahnhof.se. [158.174.22.210]) by smtp.gmail.com with ESMTPSA id b2-v6sm514441lji.85.2018.06.20.10.22.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Jun 2018 10:22:43 -0700 (PDT) From: Ulf Hansson To: "Rafael J . Wysocki" , Sudeep Holla , Lorenzo Pieralisi , Mark Rutland , linux-pm@vger.kernel.org Cc: Kevin Hilman , Lina Iyer , Lina Iyer , Ulf Hansson , Rob Herring , Daniel Lezcano , Thomas Gleixner , Vincent Guittot , Stephen Boyd , Juri Lelli , Geert Uytterhoeven , linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v8 05/26] PM / Domains: Add helper functions to attach/detach CPUs to/from genpd Date: Wed, 20 Jun 2018 19:22:05 +0200 Message-Id: <20180620172226.15012-6-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180620172226.15012-1-ulf.hansson@linaro.org> References: <20180620172226.15012-1-ulf.hansson@linaro.org> Introduce two new genpd helper functions, of_genpd_attach|detach_cpu(), which takes the CPU-number as an in-parameter. To attach a CPU to a genpd, of_genpd_attach_cpu() starts by fetching the struct device belonging to the CPU. Then it calls genpd_dev_pm_attach(), which via DT tries to hook up the CPU device to its corresponding PM domain. If it succeeds, of_genpd_attach_cpu() continues to prepare/enable runtime PM of the device. To detach a CPU from its PM domain, of_genpd_attach_cpu() reverse the operations made from of_genpd_attach_cpu(). However, first it checks that the CPU device has a valid PM domain pointer assigned, as to make sure it belongs to genpd. Cc: Lina Iyer Co-developed-by: Lina Iyer Signed-off-by: Ulf Hansson --- drivers/base/power/domain.c | 69 +++++++++++++++++++++++++++++++++++++ include/linux/pm_domain.h | 9 +++++ 2 files changed, 78 insertions(+) -- 2.17.1 diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 6149ce0bfa7b..299fa2febbec 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -2445,6 +2445,75 @@ struct device *genpd_dev_pm_attach_by_id(struct device *dev, } EXPORT_SYMBOL_GPL(genpd_dev_pm_attach_by_id); +/* + * of_genpd_attach_cpu() - Attach a CPU to its PM domain + * @cpu: The CPU to be attached. + * + * Parses the OF node of the CPU's device, to find a PM domain specifier. If + * such is found, attaches the CPU's device to the retrieved pm_domain ops and + * enables runtime PM for it. This to allow the CPU to be power managed through + * its PM domain. + * + * Returns zero when successfully attached the CPU's device to its PM domain, + * else a negative error code. + */ +int of_genpd_attach_cpu(int cpu) +{ + struct device *dev = get_cpu_device(cpu); + int ret; + + if (!dev) { + pr_warn("genpd: no dev for cpu%d\n", cpu); + return -ENODEV; + } + + ret = genpd_dev_pm_attach(dev); + if (ret != 1) { + dev_warn(dev, "genpd: attach cpu failed %d\n", ret); + return ret < 0 ? ret : -ENODEV; + } + + pm_runtime_irq_safe(dev); + pm_runtime_get_noresume(dev); + pm_runtime_set_active(dev); + pm_runtime_enable(dev); + + dev_info(dev, "genpd: attached cpu\n"); + return 0; +} +EXPORT_SYMBOL(of_genpd_attach_cpu); + +/** + * of_genpd_detach_cpu() - Detach a CPU from its PM domain + * @cpu: The CPU to be detached. + * + * Detach the CPU's device from its corresponding PM domain. If detaching is + * completed successfully, disable runtime PM and restore the runtime PM usage + * count for the CPU's device. + */ +void of_genpd_detach_cpu(int cpu) +{ + struct device *dev = get_cpu_device(cpu); + + if (!dev) { + pr_warn("genpd: no dev for cpu%d\n", cpu); + return; + } + + /* Check that the device is attached to a genpd. */ + if (!(dev->pm_domain && dev->pm_domain->detach == genpd_dev_pm_detach)) + return; + + genpd_dev_pm_detach(dev, true); + + pm_runtime_disable(dev); + pm_runtime_put_noidle(dev); + pm_runtime_reinit(dev); + + dev_info(dev, "genpd: detached cpu\n"); +} +EXPORT_SYMBOL(of_genpd_detach_cpu); + static const struct of_device_id idle_state_match[] = { { .compatible = "domain-idle-state", }, { } diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h index 3f67ff0c1c69..2c09cf80b285 100644 --- a/include/linux/pm_domain.h +++ b/include/linux/pm_domain.h @@ -243,6 +243,8 @@ unsigned int of_genpd_opp_to_performance_state(struct device *dev, int genpd_dev_pm_attach(struct device *dev); struct device *genpd_dev_pm_attach_by_id(struct device *dev, unsigned int index); +int of_genpd_attach_cpu(int cpu); +void of_genpd_detach_cpu(int cpu); #else /* !CONFIG_PM_GENERIC_DOMAINS_OF */ static inline int of_genpd_add_provider_simple(struct device_node *np, struct generic_pm_domain *genpd) @@ -294,6 +296,13 @@ static inline struct device *genpd_dev_pm_attach_by_id(struct device *dev, return NULL; } +static inline int of_genpd_attach_cpu(int cpu) +{ + return -ENODEV; +} + +static inline void of_genpd_detach_cpu(int cpu) {} + static inline struct generic_pm_domain *of_genpd_remove_last(struct device_node *np) {