From patchwork Wed Oct 3 14:38:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 148060 Delivered-To: patches@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp6557585lji; Wed, 3 Oct 2018 07:38:48 -0700 (PDT) X-Received: by 2002:a19:1188:: with SMTP id 8-v6mr1300066lfr.32.1538577528685; Wed, 03 Oct 2018 07:38:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538577528; cv=none; d=google.com; s=arc-20160816; b=j4CmIEb0PFnt8VX9zaERKneqSmPMPv0qWLuPvpqwfoItTiYjJZ4na1sqwkDYg+koGd B3XA35SOUl+3DTLwT4PzZHjGBingZ9MDou60V9wd6RlsvVTG4n+8YQg5mU0ycBlb3atp VXt+/Y+diWbMnPwYyBvpzl2UAnTHZA60b0mMioijS9HZDz+TWkWnZ2saawaeJeQ247em QY/pdDWTUAkNCT8meiPyirLNcZsV/WKN4Nzu1OkLig9Pyo26CXK5M2b9d9HZKCjkLG6Z OImHJPMYf/LpOzFa++rZTmrRWUAaIfcL804EtsXAFERAcKZNIze7+fBd7p9jO7j48mgV wezg== 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=cS7yfKOveXJgyBYsXQ8YQO6oBGRBpzCQCXH8+3mFFEo=; b=N0GPdHoFbpqF6FbNVtuXqcZ8/OCfWwAynezirEwVb1gOWwd8Gsk0kcxWt5W3/zof1o ZRjNlrkHIG5jGHTC0u+Aua2AUKkeQg+1h/r7XogDbfPG+Z7jrJGWhrQf2pSJuZWFMd82 cWVSMcN9fCf73NLm0fHPMo8Z7OUNB9rXl6IUHbwzdLm2AJFQV0z+IVvvNbt6D4szyYN1 Qsg4AxpV77hQ0QuzH65RzxcX+gtePZXMnXPQidrNjaaX0iD2iAlnOYB1OwdM9l28b+a1 ncIrPBo4PT22KIljWJqODHsF/gSly/oA6tuU5DVuGp+4xlnrY1/J8NnWL0+JEBtMiZbV 2eNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fx8drnSO; 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 33-v6sor961131ljb.42.2018.10.03.07.38.48 for (Google Transport Security); Wed, 03 Oct 2018 07:38:48 -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=fx8drnSO; 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=cS7yfKOveXJgyBYsXQ8YQO6oBGRBpzCQCXH8+3mFFEo=; b=fx8drnSOtxA3anI913lckFGxRqtRu9w78vmnWNXJmbewRUm68yE+tLRZwARZiLhlbp 8s2PeeUM6AktExnm3R52LXidDskn4om25dn5FRc/BgLRDtDTAc6QkltsvqzkgyCSrEaP JRgkyom0mn8LCuWB9BTRe59/wnvMkVSCX+CA4= 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=cS7yfKOveXJgyBYsXQ8YQO6oBGRBpzCQCXH8+3mFFEo=; b=XqKsKQrFOdvYfbcZlQ8XWo4Pp0vCaNKony+4JkJZPL+xvhjDBQx4VKatxciXhbiiMo u1xQhDsyDzvYyXgwhbwZVplo3IeK4PJb4r2twbY2UlSfCYH/oIfy9iy1D/9fBSKrOeLR jpHKjgVfFPNndZP+VcVDfft1e2dHJD61EW+J3xkwWuVlMkXPJMH7353DCsAOTgFdFRbJ qI7f+hAOZViI+iNnwTjyUJPXqzG0wjX1hqw/tg7J310TOxCPXJjUQoZ9Z/2hvrf+D5hM 5xKIItlc5WOXFsBjvduMQVhi/YGHfUz/GAH1JLGhcgraLH337zq0iOZ//RwKoc03gZEr joNg== X-Gm-Message-State: ABuFfohOzPm0BOE2gW+LtYQX+gLbsjR1H5uirwxSkCWz0Yko6b/MnB/h 6Xn+xofqRTRRCfeoSUIqS3fBh8n8T2BgXQ== X-Google-Smtp-Source: ACcGV60jlY8/LrhTbGcUaUP2h57fyQo8XWU2VREO/R04Mmves3FRLEypNxsuTv3kNJxTH2FkfaaWHg== X-Received: by 2002:a2e:6a19:: with SMTP id f25-v6mr1412659ljc.50.1538577528355; Wed, 03 Oct 2018 07:38:48 -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 18-v6sm380867ljo.74.2018.10.03.07.38.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Oct 2018 07:38:47 -0700 (PDT) From: Ulf Hansson To: "Rafael J . Wysocki" , Sudeep Holla , Lorenzo Pieralisi , Mark Rutland , Daniel Lezcano , linux-pm@vger.kernel.org Cc: Tony Lindgren , Kevin Hilman , Lina Iyer , Ulf Hansson , Rob Herring , Viresh Kumar , Vincent Guittot , 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 v9 05/11] of: base: Add of_get_cpu_state_node() to get idle states for a CPU node Date: Wed, 3 Oct 2018 16:38:18 +0200 Message-Id: <20181003143824.13059-6-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181003143824.13059-1-ulf.hansson@linaro.org> References: <20181003143824.13059-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 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 Reviewed-by: Rob Herring --- drivers/of/base.c | 35 +++++++++++++++++++++++++++++++++++ include/linux/of.h | 8 ++++++++ 2 files changed, 43 insertions(+) -- 2.17.1 diff --git a/drivers/of/base.c b/drivers/of/base.c index 74eaedd5b860..bf1d5fa34899 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -424,6 +424,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 diff --git a/include/linux/of.h b/include/linux/of.h index 99b0ebf49632..42dae048674c 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -353,6 +353,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) @@ -754,6 +756,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;