From patchwork Mon May 13 19:22:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 164051 Delivered-To: patches@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp1728189ili; Mon, 13 May 2019 12:23:09 -0700 (PDT) X-Received: by 2002:ac2:55a9:: with SMTP id y9mr9390094lfg.58.1557775389700; Mon, 13 May 2019 12:23:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557775389; cv=none; d=google.com; s=arc-20160816; b=JGd1VlDD/BtbOLK6QAB0yxT3wmEPBJUEnA4e9CTqLruFa2eXjZEfEKjEw3BebF/4WV 1bXNmLYGwfo/Gu0MgY7yuBPzPajTBkbFV+Ad/3fE3wTqKVjSTRTqIfWVgeds1bUjy3tG xCk8OBpkGic8wbX1t4zklZECcc5GyGUdBiI9d/aO0Wde/WPDKFAvz1RH3bI+E0qHWO8J CjIjb9B3yms/y7Or4x0ZLZKTq4aQ1AP5X3Gm5LFjghtC/7QP9Ah8Z6s6G+dM3x9cfOPI MtfCfY8SdJiT7kQhZYTLTU7RsPz8+M7ExQxbh3hnHtmJG0gReHqRJAqqKjRpsO2/uJsn WrpA== 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; bh=Y7css3ZNjj71s6qH3VZ02Gz19f8ZGlmnEuYgt6KvYro=; b=J0IV+nNZ4Dfr7KgvnjPnQP1DLY8kjSzsU8rUKTYjxW9OaIVgX0uhVYkFsjeKi9kc7n TlygJYmzNOhGy9r5yTLIMQl8hLYllZdRECelsaLnZ4WoTXvPndske0YbzzXwCw8voSno yjnbS9avDh6tfn58MkS5LPAd+TyCo8upoRZxoRGyeLx4H7bqLWWl3Rb7dUlefRPZYkS3 HYpsrXDmYuE80/JLh1WON7uXzyT4Oe918GVh9ulU4uIPFeetI6vTOf0PVqvcnqiCAt0F hH/s3IbdI8l8YLV7vDnssG6tDN1kAA92tGH3vZNNK9DJU/HCL66fObCd5Wu9gVlbRMAz ZWzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JQDERog4; 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 y17sor4132744lfh.61.2019.05.13.12.23.09 for (Google Transport Security); Mon, 13 May 2019 12:23:09 -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=JQDERog4; 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=Y7css3ZNjj71s6qH3VZ02Gz19f8ZGlmnEuYgt6KvYro=; b=JQDERog4rov3X+DqEg2H7/3Odpqc2zC02GWbC2dA3cdRByYxi61kDxumi6NKwfVrRo MthcOUmpimuvOLKrvD0vrkrnD69QBrGcqvLE2ekX0Ag1GhHhK8CeFO3PPP/rY48StudY uvMfjdjZJgcj/HMAcKg56hIjoXHwqFwxeas8Q/zJXHNh/9VUNbu2dAIaiKo7Pc+MwALa 9SWhEPexpgP2e3ql1zXtp3jydNVwmcUGR79PdmwSfMGqrslIYLqcKywJk7qgkw396soe HPSSW/N9cuYmE47cwNMWq0RyVq2SCoJKdaaGjnwEZbeXCXeUlh1q2N/e+59FIltHYDFZ Milg== 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=Y7css3ZNjj71s6qH3VZ02Gz19f8ZGlmnEuYgt6KvYro=; b=DL4v402zB2bp8uRhOOsAYSX4ElfhhNpg8Bf2Q+qDN6dS/tdpeBgW4iM3QzBKm78ly9 KWl7D4+ZIwim4LSK4wbgwIUiEDJ+StKQnp/rD6xhjokaH0USbAbf5iSuH9mvYjzU3YXA Ad+MjkVSlyaooW39G415MTQE2UAEVk3JMrPst1cRF8b+GuQJWItkFdJjleZ4tmsl1sDs MDQYcpeyCYMCfpWZoqTLFp6suIfRAxe3E8eAEQU4T2aEIHGcvYy+BpVqCNLCjasFK6b9 3LUW8ho3BeOf1oE62w81NKopSTPbk9+2EyGNeuE8y9JCiz197QGnzUYmg+TyY0pG28d1 ASYQ== X-Gm-Message-State: APjAAAVRYCClQio+Zkudyay4QsGw5oT8QqMocATsQd0dKF4XAw1FfX/J S5LQiYsUhsCUGM3XAfjnAx5+Lt+x X-Google-Smtp-Source: APXvYqwTyaAA0SKlYfwt/EkTngvPeOt4VBe6xlPqr7JTEF8fvJF80/c14TQZyy9mXnggagGHR0SUYw== X-Received: by 2002:ac2:457a:: with SMTP id k26mr14042867lfm.161.1557775389309; Mon, 13 May 2019 12:23:09 -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 q21sm3449365lfa.84.2019.05.13.12.23.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 May 2019 12:23:08 -0700 (PDT) From: Ulf Hansson To: Sudeep Holla , Lorenzo Pieralisi , Mark Rutland , linux-arm-kernel@lists.infradead.org Cc: "Rafael J . Wysocki" , Daniel Lezcano , "Raju P . L . S . S . S . N" , Amit Kucheria , Bjorn Andersson , Stephen Boyd , Niklas Cassel , Tony Lindgren , Kevin Hilman , Lina Iyer , Viresh Kumar , Vincent Guittot , Geert Uytterhoeven , Souvik Chakravarty , linux-pm@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Ulf Hansson , Lina Iyer Subject: [PATCH 02/18] of: base: Add of_get_cpu_state_node() to get idle states for a CPU node Date: Mon, 13 May 2019 21:22:44 +0200 Message-Id: <20190513192300.653-3-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190513192300.653-1-ulf.hansson@linaro.org> References: <20190513192300.653-1-ulf.hansson@linaro.org> The CPU's idle state nodes are currently parsed at the common cpuidle DT library, but also when initializing back-end data for the arch specific CPU operations, as in the PSCI driver case. To avoid open-coding, let's introduce of_get_cpu_state_node(), which takes the device node for the CPU and the index to the requested idle state node, as in-parameters. In case a corresponding idle state node is found, it returns the node with the refcount incremented for it, else it returns NULL. Moreover, for ARM, there are two generic methods, to describe the CPU's idle states, either via the flattened description through the "cpu-idle-states" binding [1] or via the hierarchical layout, using the "power-domains" and the "domain-idle-states" bindings [2]. Hence, let's take both options into account. [1] Documentation/devicetree/bindings/arm/idle-states.txt [2] Documentation/devicetree/bindings/arm/psci.txt Suggested-by: Sudeep Holla Co-developed-by: Lina Iyer Signed-off-by: Lina Iyer Reviewed-by: Rob Herring Reviewed-by: Daniel Lezcano Signed-off-by: Ulf Hansson --- Changes: - Fixed some kernel docs typos. - Fall-back to use "cpu-idle-states" when "power-domains" is present but "domain-idle-states" is missing. --- drivers/of/base.c | 36 ++++++++++++++++++++++++++++++++++++ include/linux/of.h | 8 ++++++++ 2 files changed, 44 insertions(+) -- 2.17.1 diff --git a/drivers/of/base.c b/drivers/of/base.c index 20e0e7ee4edf..05866f0c65b4 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -477,6 +477,42 @@ int of_cpu_node_to_id(struct device_node *cpu_node) } EXPORT_SYMBOL(of_cpu_node_to_id); +/** + * of_get_cpu_state_node - Get CPU's idle state node at the given index + * + * @cpu_node: The device node for the CPU + * @index: The index in the list of the idle states + * + * Two generic methods can be used to describe a CPU's idle states, either via + * a flattened description through the "cpu-idle-states" binding or via the + * hierarchical layout, using the "power-domains" and the "domain-idle-states" + * bindings. This function check for both and returns the idle state node for + * the requested index. + * + * In case an idle state node is found at @index, the refcount is incremented + * for it, so call of_node_put() on it when done. Returns NULL if not found. + */ +struct device_node *of_get_cpu_state_node(struct device_node *cpu_node, + int index) +{ + struct of_phandle_args args; + int err; + + err = of_parse_phandle_with_args(cpu_node, "power-domains", + "#power-domain-cells", 0, &args); + if (!err) { + struct device_node *state_node = + of_parse_phandle(args.np, "domain-idle-states", index); + + of_node_put(args.np); + if (state_node) + return state_node; + } + + return of_parse_phandle(cpu_node, "cpu-idle-states", index); +} +EXPORT_SYMBOL(of_get_cpu_state_node); + /** * __of_device_is_compatible() - Check if the node matches given constraints * @device: pointer to node diff --git a/include/linux/of.h b/include/linux/of.h index 0cf857012f11..6ae5c2c4b104 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -351,6 +351,8 @@ extern const void *of_get_property(const struct device_node *node, int *lenp); extern struct device_node *of_get_cpu_node(int cpu, unsigned int *thread); extern struct device_node *of_get_next_cpu_node(struct device_node *prev); +extern struct device_node *of_get_cpu_state_node(struct device_node *cpu_node, + int index); #define for_each_property_of_node(dn, pp) \ for (pp = dn->properties; pp != NULL; pp = pp->next) @@ -765,6 +767,12 @@ static inline struct device_node *of_get_next_cpu_node(struct device_node *prev) return NULL; } +static inline struct device_node *of_get_cpu_state_node(struct device_node *cpu_node, + int index) +{ + return NULL; +} + static inline int of_n_addr_cells(struct device_node *np) { return 0;