From patchwork Thu Apr 12 11:14:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 133242 Delivered-To: patches@linaro.org Received: by 10.46.84.29 with SMTP id i29csp1573466ljb; Thu, 12 Apr 2018 04:14:45 -0700 (PDT) X-Received: by 2002:a19:d9d4:: with SMTP id s81-v6mr5175370lfi.49.1523531685741; Thu, 12 Apr 2018 04:14:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523531685; cv=none; d=google.com; s=arc-20160816; b=wsyMV+pf+BMD05HtS5CcumMMvxqg08XbxWClc5GoaJGPP6Z6NlnYcn6K1dQruoX/Ll VrLHRcNk6uRb2G2Opa6mEDdE5aXlDiygysj0pFYFY0WLjoZUlK6fKAKKcw1sh4Vsaw5v YREOV+lG68eCn9NbQoMbuJEbJvvq0YAjGncfM+giocCVtQmpYu6EW9G1FR/bOWG1SYHR 6Bz9F9mchggbDPl/OJwbqLaMRKDEyYVqNhPigD3SuP0uVGC0+WG346ycaTVZpw4mXt0O g/jUkQBGhB5CWhze70l6ZoKJacdQi/p4T5B1WhJXXWXOZoEmk098YyQfGHyrw7jMxh2e 2VrQ== 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=ep8w3XyIku7Xg7WOU6YAHfRgEUqb1IPra7Q7nLKsmvU=; b=JWnNnsMSgSC2poFkvqQM9DR1Try+GRYpQQXR1ypIqZQHFcFK+sWg0DGh7P1WqLIhzj YIL058VLmZ+fXb/m+PdoNNAe74PthhBSpIF1+okYqnJtH/oMQzyifdV68PT+gKSk/Y4E CLNqOD+jyOyQ9N5o2ju5M0dZnkDjF8JYe73lhpj7EWEOAYYFgFcEPyTeyO86Gmmba0hZ puYDLCPwJhU9GojA6OPNPeko2a4Xj9FzbbZ9BaSikrYHWEp81EJ1Pidh6v5F6IIYRhwz L/noSzlvT9fkVEWF1qEK4nM/n1QQ/P69Fnnzfw/uNgAKiZ4HheFCf2/OQqEW8rDjQ3aW otvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Im7e88Z0; 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 g77-v6sor949959lfl.87.2018.04.12.04.14.45 for (Google Transport Security); Thu, 12 Apr 2018 04:14:45 -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=Im7e88Z0; 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=ep8w3XyIku7Xg7WOU6YAHfRgEUqb1IPra7Q7nLKsmvU=; b=Im7e88Z0gYEuCCSqRUgOqQIckI7CnYMmK/eZljGPSP6xOVZ7lkHd4A+fbaXcagqqap ZGLCkR8YX0FPRQDiFtkDb+wFMiUaBLYpcELL+EkiQ6Zzb0qfdgQQEeoHhT4/oeHnABqp B7SKq8RBsEtspg0kOfdCoZ0P8UUFTkTmmeyo8= 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=ep8w3XyIku7Xg7WOU6YAHfRgEUqb1IPra7Q7nLKsmvU=; b=OJpSet9lYZe5pFBpuM9BBVI48kgIm3RM9ira7uZBXJBjF/l2zG+5eiOICFYcKLRlOd tBg987q6g1pF2HPsorQVX4hcEsld7ePZ1IP0bTTPESkDM0l1CAZ4RxGVQsVINveI0D9k hmMlSyE7j7WA2B/D27iaAl9iSxCYfBHiAfdFlAm1ewOTyzpNCmSyMaBCc35ZG3wgDi8I lbYeG4ANKVZGfUgADMYx6Z90ee2HtUWqQyPn3hE2RqqI1HSUHnaWk0EvX4i/zgytJGYf RZLW0dJmMhASe3CxJhLOhq8bquveCYvRP+dJzprZrgGkT/O8maoP+TBioQlSvBjnmdOe zq/w== X-Gm-Message-State: ALQs6tAwou5T2KUZAHsotw3tzOnhwGBKSG6Dmn2gZhjGvebmMwGlDHH6 NKjRUeqo+nEngRO7nAkxEmGgjv5C X-Google-Smtp-Source: AIpwx4/G3bzENOcM0wSL0k6p8UtTUOq0ZuHsbaScpkrZ+HbXKFLWaTBLGXJdNbaCGXQNaJCN7LRXRg== X-Received: by 2002:a19:5308:: with SMTP id h8-v6mr2914230lfb.85.1523531685345; Thu, 12 Apr 2018 04:14:45 -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 r29sm543187lje.72.2018.04.12.04.14.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 12 Apr 2018 04:14:44 -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 v7 04/26] PM / Domains: Add support for CPU devices to genpd Date: Thu, 12 Apr 2018 13:14:09 +0200 Message-Id: <1523531671-27491-5-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1523531671-27491-1-git-send-email-ulf.hansson@linaro.org> References: <1523531671-27491-1-git-send-email-ulf.hansson@linaro.org> To enable a device belonging to a CPU to be attached to a PM domain managed by genpd, let's do a few changes to genpd as to make it convenient to manage the specifics around CPUs. First, as to be able to quickly find out what CPUs that are attached to a genpd, which typically becomes useful from a genpd governor as following changes is about to show, let's add a cpumask 'cpus' to the struct generic_pm_domain. At the point when a device that belongs to a CPU, is attached/detached to its corresponding PM domain via genpd_add_device(), let's update the cpumask in genpd->cpus. Moreover, propagate the update of the cpumask to the master domains, which makes the genpd->cpus to contain a cpumask that hierarchically reflect all CPUs for a genpd, including CPUs attached to subdomains. Second, to unconditionally manage CPUs and the cpumask in genpd->cpus, is unnecessary for cases when only non-CPU devices are parts of a genpd. Let's avoid this by adding a new configuration bit, GENPD_FLAG_CPU_DOMAIN. Clients must set the bit before they call pm_genpd_init(), as to instruct genpd that it shall deal with CPUs and thus manage the cpumask in genpd->cpus. Cc: Lina Iyer Co-developed-by: Lina Iyer Signed-off-by: Ulf Hansson --- drivers/base/power/domain.c | 69 ++++++++++++++++++++++++++++++++++++++++++++- include/linux/pm_domain.h | 3 ++ 2 files changed, 71 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 9aff79d..e178521 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -19,6 +19,7 @@ #include #include #include +#include #include "power.h" @@ -125,6 +126,7 @@ static const struct genpd_lock_ops genpd_spin_ops = { #define genpd_is_irq_safe(genpd) (genpd->flags & GENPD_FLAG_IRQ_SAFE) #define genpd_is_always_on(genpd) (genpd->flags & GENPD_FLAG_ALWAYS_ON) #define genpd_is_active_wakeup(genpd) (genpd->flags & GENPD_FLAG_ACTIVE_WAKEUP) +#define genpd_is_cpu_domain(genpd) (genpd->flags & GENPD_FLAG_CPU_DOMAIN) static inline bool irq_safe_dev_in_no_sleep_domain(struct device *dev, const struct generic_pm_domain *genpd) @@ -1377,6 +1379,62 @@ static void genpd_free_dev_data(struct device *dev, dev_pm_put_subsys_data(dev); } +static void __genpd_update_cpumask(struct generic_pm_domain *genpd, + int cpu, bool set, unsigned int depth) +{ + struct gpd_link *link; + + if (!genpd_is_cpu_domain(genpd)) + return; + + list_for_each_entry(link, &genpd->slave_links, slave_node) { + struct generic_pm_domain *master = link->master; + + genpd_lock_nested(master, depth + 1); + __genpd_update_cpumask(master, cpu, set, depth + 1); + genpd_unlock(master); + } + + if (set) + cpumask_set_cpu(cpu, genpd->cpus); + else + cpumask_clear_cpu(cpu, genpd->cpus); +} + +static void genpd_update_cpumask(struct generic_pm_domain *genpd, + struct device *dev, bool set) +{ + bool is_cpu = false; + int cpu; + + if (!genpd_is_cpu_domain(genpd)) + return; + + for_each_possible_cpu(cpu) { + if (get_cpu_device(cpu) == dev) { + is_cpu = true; + break; + } + } + + if (!is_cpu) + return; + + __genpd_update_cpumask(genpd, cpu, set, 0); +} + +static void genpd_set_cpumask(struct generic_pm_domain *genpd, + struct device *dev) +{ + genpd_update_cpumask(genpd, dev, true); +} + +static void genpd_clear_cpumask(struct generic_pm_domain *genpd, + struct device *dev) +{ + genpd_update_cpumask(genpd, dev, false); +} + static int genpd_add_device(struct generic_pm_domain *genpd, struct device *dev, struct gpd_timing_data *td) { @@ -1403,6 +1461,8 @@ static int genpd_add_device(struct generic_pm_domain *genpd, struct device *dev, if (ret) goto out; + genpd_set_cpumask(genpd, dev); + dev_pm_domain_set(dev, &genpd->domain); genpd->device_count++; @@ -1466,6 +1526,7 @@ static int genpd_remove_device(struct generic_pm_domain *genpd, if (genpd->detach_dev) genpd->detach_dev(genpd, dev); + genpd_clear_cpumask(genpd, dev); dev_pm_domain_set(dev, NULL); list_del_init(&pdd->list_node); @@ -1693,11 +1754,16 @@ int pm_genpd_init(struct generic_pm_domain *genpd, if (genpd_is_always_on(genpd) && !genpd_status_on(genpd)) return -EINVAL; + if (!zalloc_cpumask_var(&genpd->cpus, GFP_KERNEL)) + return -ENOMEM; + /* Use only one "off" state if there were no states declared */ if (genpd->state_count == 0) { ret = genpd_set_default_power_state(genpd); - if (ret) + if (ret) { + free_cpumask_var(genpd->cpus); return ret; + } } else if (!gov) { pr_warn("%s : no governor for states\n", genpd->name); } @@ -1740,6 +1806,7 @@ static int genpd_remove(struct generic_pm_domain *genpd) list_del(&genpd->gpd_list_node); genpd_unlock(genpd); cancel_work_sync(&genpd->power_off_work); + free_cpumask_var(genpd->cpus); kfree(genpd->free); pr_debug("%s: removed %s\n", __func__, genpd->name); diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h index 55ad34d..29ab00c 100644 --- a/include/linux/pm_domain.h +++ b/include/linux/pm_domain.h @@ -16,12 +16,14 @@ #include #include #include +#include /* Defines used for the flags field in the struct generic_pm_domain */ #define GENPD_FLAG_PM_CLK (1U << 0) /* PM domain uses PM clk */ #define GENPD_FLAG_IRQ_SAFE (1U << 1) /* PM domain operates in atomic */ #define GENPD_FLAG_ALWAYS_ON (1U << 2) /* PM domain is always powered on */ #define GENPD_FLAG_ACTIVE_WAKEUP (1U << 3) /* Keep devices active if wakeup */ +#define GENPD_FLAG_CPU_DOMAIN (1U << 4) /* PM domain manages CPUs */ enum gpd_status { GPD_STATE_ACTIVE = 0, /* PM domain is active */ @@ -66,6 +68,7 @@ struct generic_pm_domain { unsigned int suspended_count; /* System suspend device counter */ unsigned int prepared_count; /* Suspend counter of prepared devices */ unsigned int performance_state; /* Aggregated max performance state */ + cpumask_var_t cpus; /* A cpumask of the attached CPUs */ int (*power_off)(struct generic_pm_domain *domain); int (*power_on)(struct generic_pm_domain *domain); int (*set_performance_state)(struct generic_pm_domain *genpd,