From patchwork Wed Jul 2 04:03:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 32940 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f199.google.com (mail-ob0-f199.google.com [209.85.214.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8B6DB20672 for ; Wed, 2 Jul 2014 04:04:00 +0000 (UTC) Received: by mail-ob0-f199.google.com with SMTP id va2sf63667904obc.6 for ; Tue, 01 Jul 2014 21:04:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:in-reply-to:references :sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=Hyg/3XhpCa/pCw/cDDFkrXx8P5NeknMK6hR7L37WkPA=; b=Y43V28ynftIG5pELFkjPDRrkmq0XbCtv5vEBEj9LkA53fr5AS6ewSXoJZzi+ojnmav cFZrletHEhtHtuxI4uzFYPrjaEYGSGi88ePhcCMiBLiqILvWfI2H07uojjrDds/Xo8O9 UP5tYW71A4F26pIRY9BnazyyO0YBye0UbMPVSNR+MRSKId0Ep+dXibRdxQhllo5k/kVZ 6/llDJhJqpw68PM4dr/4Hyztm/fY+9Poxf0AuR4k33/JAK65E2pbW0FdPSPxf5bYfUKm SlCE7KYdyY13/ZvBXagh6ORt9AUtFDH4P5j7XhKvU147URmBF225qj2reg9C/d9d8rfK /9Bw== X-Gm-Message-State: ALoCoQkQMyDo/D5IeRwEqx/2tIGA4srb4RnMjlYkZUdI40QmAAqSy5H8nNym+oR9+5eLVx+ySbdb X-Received: by 10.182.112.202 with SMTP id is10mr28409857obb.47.1404273839975; Tue, 01 Jul 2014 21:03:59 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.96.201 with SMTP id k67ls2450806qge.22.gmail; Tue, 01 Jul 2014 21:03:59 -0700 (PDT) X-Received: by 10.52.172.5 with SMTP id ay5mr19331vdc.38.1404273839819; Tue, 01 Jul 2014 21:03:59 -0700 (PDT) Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by mx.google.com with ESMTPS id vw2si12362168vcb.54.2014.07.01.21.03.59 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 01 Jul 2014 21:03:59 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.169 as permitted sender) client-ip=209.85.220.169; Received: by mail-vc0-f169.google.com with SMTP id la4so10069448vcb.0 for ; Tue, 01 Jul 2014 21:03:59 -0700 (PDT) X-Received: by 10.58.208.170 with SMTP id mf10mr29524382vec.22.1404273839711; Tue, 01 Jul 2014 21:03:59 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp264213vcb; Tue, 1 Jul 2014 21:03:59 -0700 (PDT) X-Received: by 10.66.161.4 with SMTP id xo4mr62428510pab.36.1404273838727; Tue, 01 Jul 2014 21:03:58 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id yt8si18909030pab.118.2014.07.01.21.03.57; Tue, 01 Jul 2014 21:03:58 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751602AbaGBEDv (ORCPT + 27 others); Wed, 2 Jul 2014 00:03:51 -0400 Received: from mail-qc0-f176.google.com ([209.85.216.176]:39757 "EHLO mail-qc0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751228AbaGBEDt (ORCPT ); Wed, 2 Jul 2014 00:03:49 -0400 Received: by mail-qc0-f176.google.com with SMTP id w7so9247881qcr.7 for ; Tue, 01 Jul 2014 21:03:48 -0700 (PDT) X-Received: by 10.140.101.245 with SMTP id u108mr6292838qge.48.1404273828427; Tue, 01 Jul 2014 21:03:48 -0700 (PDT) Received: from localhost (ec2-23-23-178-99.compute-1.amazonaws.com. [23.23.178.99]) by mx.google.com with ESMTPSA id b9sm493310qge.17.2014.07.01.21.03.42 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 01 Jul 2014 21:03:47 -0700 (PDT) From: Viresh Kumar To: rjw@rjwysocki.net, shawn.guo@linaro.org Cc: linaro-kernel@lists.linaro.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, arvind.chauhan@arm.com, sboyd@codeaurora.org, linux-arm-msm@vger.kernel.org, spk.linux@gmail.com, thomas.ab@samsung.com, nm@ti.com, t.figa@samsung.com, Viresh Kumar , devicetree@vger.kernel.org Subject: [PATCH V2 Resend 12/14] cpufreq: cpu0: Extend support beyond CPU0 Date: Wed, 2 Jul 2014 09:33:24 +0530 Message-Id: <3644ffb33bc8f4f5aac56f553c228361a9934d79.1404273178.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.0.0.rc2 In-Reply-To: References: In-Reply-To: <89da404a3b8f545774f5782d901b8381caf02c07.1404231535.git.viresh.kumar@linaro.org> References: Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: viresh.kumar@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.169 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Most of the infrastructure is in place now, with only little left. How to find siblings ? Stephen Boyd suggested to compare "clocks" properties from CPU's DT node and siblings should match. This patch adds another routine find_siblings() which calls of_property_match() to find if CPUs share clock line or not. If of_property_match() returns error, we fallback to all CPUs sharing clock line assumption as existing platforms don't have "clocks" property in all CPU nodes and would fail from of_property_match(). Cc: devicetree@vger.kernel.org Signed-off-by: Viresh Kumar --- V2 Resend: Use of_property_match() directly instead of of_clk_shared_by_cpus() which would be dropped now. .../devicetree/bindings/cpufreq/cpufreq-cpu0.txt | 72 ++++++++++++++++++++-- drivers/cpufreq/cpufreq-cpu0.c | 62 ++++++++++++++++++- 2 files changed, 128 insertions(+), 6 deletions(-) diff --git a/Documentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt b/Documentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt index 366690c..9d65799 100644 --- a/Documentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt +++ b/Documentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt @@ -1,11 +1,11 @@ -Generic CPU0 cpufreq driver +Generic cpufreq driver -It is a generic cpufreq driver for CPU0 frequency management. It +It is a generic cpufreq driver for frequency management. It supports both uniprocessor (UP) and symmetric multiprocessor (SMP) -systems which share clock and voltage across all CPUs. +systems which may or maynot share clock and voltage across all CPUs. Both required and optional properties listed below must be defined -under node /cpus/cpu@0. +under node /cpus/cpu@x. Where x is the first cpu inside a cluster. Required properties: - None @@ -21,9 +21,16 @@ Optional properties: - cooling-min-level: - cooling-max-level: Please refer to Documentation/devicetree/bindings/thermal/thermal.txt. +- clocks: If CPU clock is populated from DT, "clocks" property must be copied to + every cpu node sharing clock with cpu@x. Generic cpufreq driver compares + "clocks" to find siblings, i.e. to see which CPUs share clock/voltages. If + only cpu@0 contains "clocks" property it is assumed that all CPUs share clock + line. Examples: +1. All CPUs share clock/voltages + cpus { #address-cells = <1>; #size-cells = <0>; @@ -38,6 +45,8 @@ cpus { 396000 950000 198000 850000 >; + clocks = <&clock CLK_ARM_CLK>; + clock-names = "cpu"; clock-latency = <61036>; /* two CLK32 periods */ #cooling-cells = <2>; cooling-min-level = <0>; @@ -48,17 +57,72 @@ cpus { compatible = "arm,cortex-a9"; reg = <1>; next-level-cache = <&L2>; + clocks = <&clock CLK_ARM_CLK>; }; cpu@2 { compatible = "arm,cortex-a9"; reg = <2>; next-level-cache = <&L2>; + clocks = <&clock CLK_ARM_CLK>; }; cpu@3 { compatible = "arm,cortex-a9"; reg = <3>; next-level-cache = <&L2>; + clocks = <&clock CLK_ARM_CLK>; + }; +}; + + +2. All CPUs inside a cluster share clock/voltages, there are multiple clusters. + +cpus { + #address-cells = <1>; + #size-cells = <0>; + + cpu@0 { + compatible = "arm,cortex-a15"; + reg = <0>; + next-level-cache = <&L2>; + operating-points = < + /* kHz uV */ + 792000 1100000 + 396000 950000 + 198000 850000 + >; + clocks = <&clock CLK_ARM1_CLK>; + clock-names = "cpu"; + clock-latency = <61036>; /* two CLK32 periods */ + }; + + cpu@1 { + compatible = "arm,cortex-a15"; + reg = <1>; + next-level-cache = <&L2>; + clocks = <&clock CLK_ARM1_CLK>; + }; + + cpu@100 { + compatible = "arm,cortex-a7"; + reg = <100>; + next-level-cache = <&L2>; + operating-points = < + /* kHz uV */ + 792000 950000 + 396000 750000 + 198000 450000 + >; + clocks = <&clock CLK_ARM2_CLK>; + clock-names = "cpu"; + clock-latency = <61036>; /* two CLK32 periods */ + }; + + cpu@101 { + compatible = "arm,cortex-a7"; + reg = <101>; + next-level-cache = <&L2>; + clocks = <&clock CLK_ARM2_CLK>; }; }; diff --git a/drivers/cpufreq/cpufreq-cpu0.c b/drivers/cpufreq/cpufreq-cpu0.c index 44633f6..0f2fe76 100644 --- a/drivers/cpufreq/cpufreq-cpu0.c +++ b/drivers/cpufreq/cpufreq-cpu0.c @@ -177,6 +177,57 @@ try_again: return ret; } +/* + * Sets all CPUs as sibling if any cpu doesn't have a "clocks" property, + * Otherwise it matches "clocks" property to find siblings. + */ +static void find_siblings(struct cpufreq_policy *policy) +{ + struct private_data *priv = policy->driver_data; + struct device *cpu1_dev = priv->cpu_dev, *cpu2_dev; + struct device_node *np1, *np2; + int cpu, ret, set_all = 1; + + np1 = of_node_get(cpu1_dev->of_node); + + for_each_possible_cpu(cpu) { + if (cpu == policy->cpu) + continue; + + cpu2_dev = get_cpu_device(cpu); + if (!cpu2_dev) { + dev_err(cpu1_dev, "%s: failed to cpu_dev for cpu%d\n", + __func__, cpu); + goto out_set_all; + } + + np2 = of_node_get(cpu2_dev->of_node); + if (!np2) { + dev_err(cpu1_dev, "failed to find cpu%d node\n", cpu); + goto out_set_all; + } + + ret = of_property_match(np1, np2, "clocks"); + of_node_put(np2); + + /* Error while parsing nodes, fallback to set-all */ + if (ret < 0) + goto out_set_all; + else if (ret == 1) + cpumask_set_cpu(cpu, policy->cpus); + } + + /* All processors don't share clock and voltage */ + set_all = 0; + +out_set_all: + /* All processors share clock and voltage */ + if (set_all) + cpumask_setall(policy->cpus); + + of_node_put(np1); +} + static int cpu0_cpufreq_init(struct cpufreq_policy *policy) { struct cpufreq_frequency_table *freq_table; @@ -266,9 +317,16 @@ static int cpu0_cpufreq_init(struct cpufreq_policy *policy) policy->driver_data = priv; policy->clk = cpu_clk; - ret = cpufreq_generic_init(policy, freq_table, transition_latency); - if (ret) + + find_siblings(policy); + ret = cpufreq_table_validate_and_show(policy, freq_table); + if (ret) { + dev_err(cpu_dev, "%s: invalid frequency table: %d\n", __func__, + ret); goto out_cooling_unregister; + } + + policy->cpuinfo.transition_latency = transition_latency; return 0;