From patchwork Thu Apr 12 11:14:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 133254 Delivered-To: patches@linaro.org Received: by 10.46.84.29 with SMTP id i29csp1573787ljb; Thu, 12 Apr 2018 04:15:06 -0700 (PDT) X-Received: by 10.46.50.11 with SMTP id y11mr378639ljy.149.1523531706928; Thu, 12 Apr 2018 04:15:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523531706; cv=none; d=google.com; s=arc-20160816; b=QZ1yUEGR9euVlv4C+fJJRbcw+OQrQvoNvN5Rbr3INgI4eSwD8UdEYGXuigqAnBtyN8 u0ObYeVj9XqoTEbVcB6uDAynKn8Kq3spjxVgWkevvUpOHsxUHF4OV/SX/qHDfWFoyGqM mC5h7fBgO0drJFrdpUj8n+jyjGWiEek0ZOJ1tGCG7E+6Kl/ljTBHFi35G5ZlTezgirz2 DZRD9eF5n+a+SAEHVC/5/+b3Du4dNLVn65S1DaYYuiwovqTj4jYKlsOxWabzJNqXmIv7 j5eVeF0m0EzjPcNd4L4Ai9Qc8bmbBDs2hC7s1+tfWIh6cBuGichoi2CN1r/w3tbGlZJR 9A+A== 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=2LpY14KKtV2T2Pymd99d2r4VUa+0CGWSlM2NsNRxYZk=; b=snDJEBV3F1yy46owI+EzOu2I6WMJkO5u8vdZ/1c8oAjpql3CeczXaGwiJhtWKKka71 dy/8zU4WFUtBs/hSwD+SXXNUReQCzOiWOgSe29eoW9eVtbsXK2Cxv13OKw90qPGIIMLC sQitwBPxBlxhVDEo0ncVKGFolSBREAfRLYttcpusPmGb5GUnhowZWk3QLRoZXSrpNdWj AcS7/rQ/VCRfgKnxnoc8M6ITVhKi7LZfKSDyjSNNjxBtu96U9PpXk1JAzbhHF8yJbVeA BHMFFegTTIT2+l+RwQvUvE3Fk2hdyB9mthm4c7JcBEzuRK4EGGWeyo96O3frDPRmo8OQ chpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=F+PrMGzP; 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 n5sor906827ljj.80.2018.04.12.04.15.06 for (Google Transport Security); Thu, 12 Apr 2018 04:15:06 -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=F+PrMGzP; 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=2LpY14KKtV2T2Pymd99d2r4VUa+0CGWSlM2NsNRxYZk=; b=F+PrMGzPM0c59NpwIkVVRgJZsDbtLvyWLGfI1iQFyctYpNN7zLpP7DueH3aPDpbYhv 6NBcl06puVrFm63vo47Cx2nuCiVojwRFwhDUnLIML+I/SsPtk4PQf23NOJMTEcChm3jt IT+Fk3nodp91ZSrKmmmS+Yoj9dI4eoAMD5ZtA= 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=2LpY14KKtV2T2Pymd99d2r4VUa+0CGWSlM2NsNRxYZk=; b=MWNTlC048qBL4b5V0ktKMQjODMo5P6htkFV7ySozVo/0mL+gDTCFU/dIAGng4SpoZ4 K28Td72IDpXBo/cjG5xaj5CEWPBFSlCw1L6Fg2wVWagdBoJYOJteyjgmNTCoOh3hUJMJ oc3PBgD+7fXgl8dBtwhoeNO186/wQzDMEp+iSps30gdM2iY0aNZkBhzHIhMEAIORz8Ic p8zxQj2orBxkWotD5TiuD1e2W0Fiu387jG0EQrorZBnXYv22nxoSBWuMxJnC0vEGUPtT dCCJN4l9KBl++lUvXOKVBemXNoQoS9zYekS8MC+2g7YcoHzj+k1OFmrzjMhDNM78bXYM sr/A== X-Gm-Message-State: ALQs6tD7M8foWa5dhujCTUK2GM+nmo4HNu/kH0ZUSYUMfCUBJpNoMPmR PML7P1Rj0P5yLMeenzkLdvcjRupS X-Google-Smtp-Source: AIpwx48q+0SbjQGtw8GIqDgvRWNy9Kw89bB4FSX5hRuftijbVRAEPwlor5gujE4rj0Olxae+55DTBQ== X-Received: by 10.46.65.73 with SMTP id o70mr403882lja.140.1523531706720; Thu, 12 Apr 2018 04:15:06 -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.15.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 12 Apr 2018 04:15:06 -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 16/26] drivers: firmware: psci: Support hierarchical CPU idle states Date: Thu, 12 Apr 2018 13:14:21 +0200 Message-Id: <1523531671-27491-17-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> From: Lina Iyer Currently CPU's idle states are represented in a flattened model, via the "cpu-idle-states" binding from within the CPU's device nodes. Support the hierarchical layout, simply by converting to calling the new OF helper, of_get_cpu_state_node(). Cc: Lina Iyer Suggested-by: Sudeep Holla Signed-off-by: Lina Iyer Co-developed-by: Ulf Hansson Signed-off-by: Ulf Hansson --- drivers/firmware/psci/psci.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- 2.7.4 diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c index 9788bfc..256b4ed 100644 --- a/drivers/firmware/psci/psci.c +++ b/drivers/firmware/psci/psci.c @@ -294,8 +294,7 @@ static int psci_dt_cpu_init_idle(struct device_node *cpu_node, int cpu) struct device_node *state_node; /* Count idle states */ - while ((state_node = of_parse_phandle(cpu_node, "cpu-idle-states", - count))) { + while ((state_node = of_get_cpu_state_node(cpu_node, count))) { count++; of_node_put(state_node); } @@ -308,7 +307,7 @@ static int psci_dt_cpu_init_idle(struct device_node *cpu_node, int cpu) return -ENOMEM; for (i = 0; i < count; i++) { - state_node = of_parse_phandle(cpu_node, "cpu-idle-states", i); + state_node = of_get_cpu_state_node(cpu_node, i); ret = psci_dt_parse_state_node(state_node, &psci_states[i]); of_node_put(state_node);