From patchwork Thu Apr 12 11:14:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 133249 Delivered-To: patches@linaro.org Received: by 10.46.84.29 with SMTP id i29csp1573669ljb; Thu, 12 Apr 2018 04:14:58 -0700 (PDT) X-Received: by 2002:a19:23c5:: with SMTP id j188-v6mr5072381lfj.122.1523531698051; Thu, 12 Apr 2018 04:14:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523531698; cv=none; d=google.com; s=arc-20160816; b=QLjSlrPrIJaLVd5L3iNrIfDmZLx+Q+T5tlvTbHmB5PfBhO2LCXNb5ELcmfJdfGKwHn NWxz0q5WlLHLFgrexoLDRiYFt/Q0tO04+TtfBxvJJF6sYBAwZOBQiRQdZ69N7QcW9+oE 9fZntl8RQEQAwXRW0laO4Hp9zYyy8mFmcAUML2B4ZzPxHnAIHtH1kvhqyshjrh0gN+2+ HJELVk9B9vgwxvV1THMd8Q6ZL42undJofA65+mvNZlSiEkE4QfFPFPpkZsC1hUMBiBwq NyIdMfANd/ReMKI7akiOxCJJV0PqO/8o4Jnfb/wPHQ/U55u18oWi0gycX9MTcgOcluRc hu4A== 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=Q8CKCINBtP8hfFNpVArvLjHKLRPd0Kn9ZUGR2WlDOW0=; b=LMyN/Xqsm5Gke/2gs/pK9vIEoVwZR3LCFYT4XejyFS5hmZ/eFbuaxgr5Gpyowvy8aQ KCHxPj6dwiJkJqqjVkD+sS14VcBFYpqQaFY5t1yhRUW6RG4FLhw0S9MVtvQduoBVG2XZ /YpGz+SXa0YPteoRyjAH2XxZ7TeWbzTsQAQNASimsNyD9vsnbxuoWxZ1TP5drReAec56 HykbfwcBZh1hSdjX0n87CAZa2xZVOHDB59yj0HWWqBmUJk+9H53flbT0tLdMvRhSHGJn EkPK8AQeXZwEDlf2H1DI72Rm7Jvnpgwmf77WtHhiKhwSwAD0hDb4KjHNe6/L2XwTCeVH wgSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BjhIoC2/; 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 j19-v6sor882788lfk.58.2018.04.12.04.14.58 for (Google Transport Security); Thu, 12 Apr 2018 04:14:58 -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=BjhIoC2/; 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=Q8CKCINBtP8hfFNpVArvLjHKLRPd0Kn9ZUGR2WlDOW0=; b=BjhIoC2/wslgVNTKVW8HPq2Mv0pNJDZm1C2IQkI8ETfRPHMrc0xheHU7gPoG7EPxo8 oXaM0TFJYdSdabmhqOXhISz1rm66SZK4WzDwte0YiRCr1Zqk32UJ2y36VVPly0prKcMB zxCebtCeF3W6WzpgTP7XuW9gC1HsOrMI5cIUw= 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=Q8CKCINBtP8hfFNpVArvLjHKLRPd0Kn9ZUGR2WlDOW0=; b=jHMxJv3aVLX1QJxCz4cOh23Wp46b6piBEID/tGEVJN/3ehCXEYP2+U5dLUudkDrMpK ZQ6hNEjVO1V/CwKCnrGC0dtEKPizY4XT9IDotZYtCFqPQNINWCy7+TjE2aTQs6PSrHys LlqOmLNt2jzMDZ94I8bDMHble/35MGWAOqyPvRvQNMh0GMFpanPD6+6C47yttRVxfWoX HihJbrDR7TvNJURL46447KikF6EIXWDBtfPMPMspi+8oev9Gkmimjv/UL/r1vwZurnQ8 KZ422ypPpn28eVqXWyJOcrovlfRbM9ic0QvSLJ++xvvEvTIQwbHM9386F99g0X06oxDq SpaA== X-Gm-Message-State: ALQs6tD+xuDRc9Ad3HRpsvf4imBl0vFAXZsasYeLj4yIxWMeHmUUnOqO j0ONVZ500Z4gl7LjlPr8DD1Whic6 X-Google-Smtp-Source: AIpwx48Z+Ekp57qDUNM9ouFDrsP6foIHTjb1W5Fbj5jEEg730hrWSccVqo1qNC3tBjioqU4J83wgxw== X-Received: by 2002:a19:5750:: with SMTP id l77-v6mr5578338lfb.10.1523531697790; Thu, 12 Apr 2018 04:14:57 -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.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 12 Apr 2018 04:14:57 -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, devicetree@vger.kernel.org Subject: [PATCH v7 11/26] of: base: Add of_get_cpu_state_node() to get idle states for a CPU node Date: Thu, 12 Apr 2018 13:14:16 +0200 Message-Id: <1523531671-27491-12-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> 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 Cc: Rob Herring Cc: devicetree@vger.kernel.org Cc: Lina Iyer Suggested-by: Sudeep Holla Co-developed-by: Lina Iyer Signed-off-by: Ulf Hansson --- drivers/of/base.c | 35 +++++++++++++++++++++++++++++++++++ include/linux/of.h | 8 ++++++++ 2 files changed, 43 insertions(+) -- 2.7.4 diff --git a/drivers/of/base.c b/drivers/of/base.c index 848f549..97350cc 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -400,6 +400,41 @@ 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 and idle state node is found at index, the refcount 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); + 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 * @compat: required compatible string, NULL or "" for any match diff --git a/include/linux/of.h b/include/linux/of.h index 4d25e4f..15072b1 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -348,6 +348,8 @@ extern const void *of_get_property(const struct device_node *node, const char *name, int *lenp); extern struct device_node *of_get_cpu_node(int cpu, unsigned int *thread); +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) @@ -733,6 +735,12 @@ static inline struct device_node *of_get_cpu_node(int cpu, 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;