From patchwork Wed Jun 24 13:59:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 50271 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 78AF121575 for ; Wed, 24 Jun 2015 14:00:40 +0000 (UTC) Received: by wiea6 with SMTP id a6sf13748210wie.1 for ; Wed, 24 Jun 2015 07:00:39 -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:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=X4UVt5zSL2OkWTr962MH8KwUp159pZGMOmOIAaymJJ0=; b=PKKkwOfekFOY7+3buoesKAC8yvYa+BRvLM+W4o8tGE6um0p2keCVnmnP/C7w69cTIU SKG8HmBL5Rww0GyaesBzHYtyONiEwpjG8LPk3kFgko5QGhM8aoa1h5oJ+NgRaraQMtew FVY/z+DMY+mCSDsVnO6FKedcdqrTaAOAqzifyA4p8AEzBb/dQc0FPs9swR5+naRLEwM9 f31K68Sakm6mdeWLKOIyNKAhH7me5h0wmBUNI1GzX9FPfbHx6Wfyu8k3PTrLZ4bu+ntR ctevPK/hugras2Ii3azchZW/JJopQ9EP7j//frzq0guoGOkriv/ICzFjAo0xU8+COl7E 3zFw== X-Gm-Message-State: ALoCoQmlOOJ1cwJXocfe5/YYSg0ZLZNWO4dGy+SqLdiX0TOculc5wTRZgYStA7ge6pzIKDCS2oWZ X-Received: by 10.112.53.102 with SMTP id a6mr36140981lbp.16.1435154439816; Wed, 24 Jun 2015 07:00:39 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.120.71 with SMTP id la7ls196023lab.25.gmail; Wed, 24 Jun 2015 07:00:39 -0700 (PDT) X-Received: by 10.152.1.40 with SMTP id 8mr41062098laj.56.1435154439666; Wed, 24 Jun 2015 07:00:39 -0700 (PDT) Received: from mail-la0-f41.google.com (mail-la0-f41.google.com. [209.85.215.41]) by mx.google.com with ESMTPS id p2si22096421lap.75.2015.06.24.07.00.39 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Jun 2015 07:00:39 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.41 as permitted sender) client-ip=209.85.215.41; Received: by laka10 with SMTP id a10so26648447lak.0 for ; Wed, 24 Jun 2015 07:00:39 -0700 (PDT) X-Received: by 10.152.88.68 with SMTP id be4mr39236567lab.76.1435154439525; Wed, 24 Jun 2015 07:00:39 -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.112.108.230 with SMTP id hn6csp3809864lbb; Wed, 24 Jun 2015 07:00:37 -0700 (PDT) X-Received: by 10.70.92.34 with SMTP id cj2mr11032851pdb.116.1435154426395; Wed, 24 Jun 2015 07:00:26 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id hs9si40092089pdb.189.2015.06.24.07.00.25; Wed, 24 Jun 2015 07:00:26 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753275AbbFXOAX (ORCPT + 11 others); Wed, 24 Jun 2015 10:00:23 -0400 Received: from mail-wi0-f170.google.com ([209.85.212.170]:32908 "EHLO mail-wi0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752885AbbFXN7b (ORCPT ); Wed, 24 Jun 2015 09:59:31 -0400 Received: by wiwl6 with SMTP id l6so96292130wiw.0 for ; Wed, 24 Jun 2015 06:59:29 -0700 (PDT) X-Received: by 10.180.9.7 with SMTP id v7mr5230870wia.60.1435154369700; Wed, 24 Jun 2015 06:59:29 -0700 (PDT) Received: from localhost.localdomain (host81-129-169-163.range81-129.btcentralplus.com. [81.129.169.163]) by mx.google.com with ESMTPSA id q2sm40833925wjz.15.2015.06.24.06.59.28 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 24 Jun 2015 06:59:28 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: kernel@stlinux.com, rjw@rjwysocki.net, viresh.kumar@linaro.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, ajitpal.singh@st.com, Lee Jones Subject: [PATCH v2 9/9] cpufreq: st: Provide runtime initialised driver for ST's platforms Date: Wed, 24 Jun 2015 14:59:08 +0100 Message-Id: <1435154348-28840-10-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1435154348-28840-1-git-send-email-lee.jones@linaro.org> References: <1435154348-28840-1-git-send-email-lee.jones@linaro.org> Sender: linux-pm-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: lee.jones@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.215.41 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: , The bootloader is charged with the responsibility to provide platform specific Dynamic Voltage and Frequency Scaling (DVFS) information via Device Tree. This driver takes the supplied configuration and loads it into the generic OPP subsystem to it can be used as part of the CPUFreq framework. Signed-off-by: Lee Jones --- drivers/cpufreq/Kconfig.arm | 7 + drivers/cpufreq/Makefile | 1 + drivers/cpufreq/sti-cpufreq.c | 447 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 455 insertions(+) create mode 100644 drivers/cpufreq/sti-cpufreq.c diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm index 4f3dbc8..cd0e4e5 100644 --- a/drivers/cpufreq/Kconfig.arm +++ b/drivers/cpufreq/Kconfig.arm @@ -258,6 +258,13 @@ config ARM_SPEAR_CPUFREQ help This adds the CPUFreq driver support for SPEAr SOCs. +config ARM_STI_CPUFREQ + tristate "STi CPUFreq support" + depends on SOC_STIH407 + help + OPP list for cpufreq-dt driver can be provided through DT or can be + created at runtime. Select this if you want create OPP list at runtime. + config ARM_TEGRA_CPUFREQ bool "TEGRA CPUFreq support" depends on ARCH_TEGRA diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile index cdce92a..557a22c 100644 --- a/drivers/cpufreq/Makefile +++ b/drivers/cpufreq/Makefile @@ -77,6 +77,7 @@ obj-$(CONFIG_ARM_S5PV210_CPUFREQ) += s5pv210-cpufreq.o obj-$(CONFIG_ARM_SA1100_CPUFREQ) += sa1100-cpufreq.o obj-$(CONFIG_ARM_SA1110_CPUFREQ) += sa1110-cpufreq.o obj-$(CONFIG_ARM_SPEAR_CPUFREQ) += spear-cpufreq.o +obj-$(CONFIG_ARM_STI_CPUFREQ) += sti-cpufreq.o obj-$(CONFIG_ARM_TEGRA_CPUFREQ) += tegra-cpufreq.o obj-$(CONFIG_ARM_VEXPRESS_SPC_CPUFREQ) += vexpress-spc-cpufreq.o diff --git a/drivers/cpufreq/sti-cpufreq.c b/drivers/cpufreq/sti-cpufreq.c new file mode 100644 index 0000000..48a3410 --- /dev/null +++ b/drivers/cpufreq/sti-cpufreq.c @@ -0,0 +1,447 @@ +/* + * Create CPUFreq OPP list + * + * Author: Ajit Pal Singh + * Lee Jones + * + * Copyright (C) 2015 STMicroelectronics (R&D) Limited + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#define VERSION_SHIFT 28 +#define PCODE_INDEX 1 +#define MAJOR_ID_INDEX 1 +#define MINOR_ID_INDEX 2 + +enum { + PCODE = 0, + SUBSTRATE, + DVFS_MAX_REGFIELDS, +}; + +#define STI_DVFS_TAB_MAX 8 + +struct st_dvfs_tab { + unsigned int freq; + unsigned int avs; +}; + +/** + * ST CPUFreq Driver Data + * + * @dvfs_tab Supported Voltage/Frequency table + * @dvfs_tab_count Number of entries in the table above + * @pcode Device's Process Code determines the running voltage + * @substrate Device's Substrate version -- as above + * @regmap_eng Engineering Syscon register map + * + */ +struct st_cpufreq_ddata { + struct device *cpu; + struct st_dvfs_tab dvfs_tab[STI_DVFS_TAB_MAX]; + int dvfs_tab_count; + int pcode; + int substrate; + struct regmap *regmap_eng; + +}; + +struct sti_dvfs_cdata { + const struct reg_field *reg_fields; +}; + +static int st_cpufreq_cmp(const void *a, const void *b) +{ + const struct st_dvfs_tab *a_tab = a, *b_tab = b; + + if (a_tab->freq > b_tab->freq) + return -1; + + if (a_tab->freq < b_tab->freq) + return 1; + + return 0; +} + +static int st_cpufreq_check_if_matches(struct device_node *child, + const char *prop, + unsigned int match) +{ + unsigned int dt_major, dt_minor; + unsigned int soc_major, soc_minor; + const __be32 *tmp; + unsigned int val; + int len = 0; + int i; + + tmp = of_get_property(child, prop , &len); + if (!tmp || !len) + return -EINVAL; + + val = be32_to_cpup(tmp); + + len /= sizeof(u32); + if (len == 1 && val == 0xff) + /* + * If 'cuts' or 'substrate' value is 0xff, it means that + * the entry is valid for ALL cuts and substrates + */ + goto matchfound; + + /* Check if this opp node is for us */ + for (i = 0; i < len; i++) { + if (match == val) + goto matchfound; + + if (!strcmp(prop, "st,cuts")) { + dt_major = val & 0xff;; + dt_minor = val >> 8 & 0xff; + soc_major = match & 0xff; + soc_minor = match >> 8 & 0xff; + + if (dt_major == soc_major && + (!dt_minor || (dt_minor == soc_minor))) + goto matchfound; + } + val++; + } + + /* No match found */ + return -EINVAL; + +matchfound: + return 0; +} + +static int st_cpufreq_get_version(struct platform_device *pdev, + unsigned int *minor, unsigned int *major) +{ + struct st_cpufreq_ddata *ddata = platform_get_drvdata(pdev); + struct device_node *cpu = ddata->cpu->of_node; + struct regmap *syscfg_regmap; + unsigned int minor_offset, major_offset; + unsigned int socid, minid; + int ret; + + /* Get Major */ + syscfg_regmap = syscon_regmap_lookup_by_phandle(cpu, "st,syscfg"); + if (IS_ERR(syscfg_regmap)) { + dev_err(&pdev->dev, + "No syscfg phandle specified in %s [%li]\n", + cpu->full_name, PTR_ERR(syscfg_regmap)); + return PTR_ERR(syscfg_regmap); + } + + ret = of_property_read_u32_index(cpu, "st,syscfg", + MAJOR_ID_INDEX, &major_offset); + if (ret) { + dev_err(&pdev->dev, + "No minor number offset provided in %s [%d]\n", + cpu->full_name, ret); + return ret; + } + + ret = regmap_read(syscfg_regmap, major_offset, &socid); + if (ret) + return ret; + + /* Get Minor */ + ret = of_property_read_u32_index(cpu, "st,syscfg-eng", + MINOR_ID_INDEX, &minor_offset); + if (ret) { + dev_err(&pdev->dev, "No minor number offset provided %s [%d]\n", + cpu->full_name, ret); + return ret; + } + + ret = regmap_read(ddata->regmap_eng, minor_offset, &minid); + if (ret) { + dev_err(&pdev->dev, + "Failed to read the minor number from syscon [%d]\n", + ret); + return ret; + } + + *major = ((socid >> VERSION_SHIFT) & 0xf) + 1; + *minor = minid & 0xf; + + return 0; +} + +static int st_cpufreq_get_dvfs_info(struct platform_device *pdev) +{ + struct st_cpufreq_ddata *ddata = platform_get_drvdata(pdev); + struct st_dvfs_tab *dvfs_tab = &ddata->dvfs_tab[0]; + struct device_node *cpu = ddata->cpu->of_node; + struct device_node *opplist, *opp; + unsigned int minor = 0, major = 0; + int err, ret = 0; + + opplist = of_get_child_by_name(cpu, "st,opp-list"); + if (!opplist) { + dev_err(&pdev->dev, "st,opp-list node missing\n"); + return -ENODATA; + } + + ret = st_cpufreq_get_version(pdev, &minor, &major); + if (ret) { + dev_err(&pdev->dev, "No OPP match found for this platform\n"); + return ret; + } + + for_each_child_of_node(opplist, opp) { + if (ddata->dvfs_tab_count == STI_DVFS_TAB_MAX) { + dev_err(&pdev->dev, "Too many DVFS entries found\n"); + ret = -EOVERFLOW; + break; + } + + /* Cut version e.g. 2.0 [major.minor] */ + err = st_cpufreq_check_if_matches(opp, "st,cuts", + (minor << 8) | major); + if (err) + continue; + + ret = st_cpufreq_check_if_matches(opp, "st,substrate", + ddata->substrate); + if (err) + continue; + + ret = of_property_read_u32(opp, "st,freq", &dvfs_tab->freq); + if (ret) { + dev_err(&pdev->dev, "Can't read frequency: %d\n", ret); + goto out; + } + dvfs_tab->freq *= 1000; + + ret = of_property_read_u32_index(opp, "st,avs", + ddata->pcode, + &dvfs_tab->avs); + if (ret) { + dev_err(&pdev->dev, "Can't read AVS: %d\n", ret); + goto out; + } + + dvfs_tab++; + ddata->dvfs_tab_count++; + } + + sort(&ddata->dvfs_tab[0], ddata->dvfs_tab_count, + sizeof(struct st_dvfs_tab), st_cpufreq_cmp, NULL); + +out: + of_node_put(opplist); + + if (!ddata->dvfs_tab_count) { + dev_err(&pdev->dev, "No suitable AVS table found\n"); + return -EINVAL; + } + + return ret; +} + +static int sti_cpufreq_voltage_scaling_init(struct platform_device *pdev) +{ + struct st_cpufreq_ddata *ddata = platform_get_drvdata(pdev); + struct st_dvfs_tab *dvfs_tab = &ddata->dvfs_tab[0]; + struct dev_pm_opp *opp; + unsigned long highest_freq = 0; + int ret; + int i; + + /* Populate OPP table with default non-AVS frequency values */ + of_init_opp_table(ddata->cpu); + + /* + * Disable, but keep default values -- this prevents the framework from + * erroneously re-adding and enabling entries with missing voltage rates + */ + while (1) { + highest_freq++; + + opp = dev_pm_opp_find_freq_ceil(ddata->cpu, &highest_freq); + if (IS_ERR(opp)) + break; + + ret = dev_pm_opp_disable(ddata->cpu, highest_freq); + if (ret) { + dev_err(&pdev->dev, "Failed to disable freq: %li\n", + highest_freq); + return ret; + } + } + + for (i = 0; i < ddata->dvfs_tab_count; i++, dvfs_tab++) { + unsigned int f = dvfs_tab->freq * 1000; + unsigned int v = dvfs_tab->avs * 1000; + + opp = dev_pm_opp_find_freq_exact(ddata->cpu, f, false); + + /* Remove existing voltage-less OPP entry */ + if (!IS_ERR(opp)) + dev_pm_opp_remove(ddata->cpu, f); + + /* Supply new fully populated OPP entry */ + ret = dev_pm_opp_add(ddata->cpu, f, v); + if (ret) { + dev_err(&pdev->dev, "Failed to add OPP %u\n", f); + return ret; + } + } + + return 0; +} + +static int st_cpufreq_fetch_regmap_field(struct platform_device *pdev, + const struct reg_field *reg_fields, + int pcode_offset, int field) +{ + struct st_cpufreq_ddata *ddata = platform_get_drvdata(pdev); + struct regmap_field *regmap_field; + struct reg_field reg_field = reg_fields[field]; + unsigned int value; + int ret; + + reg_field.reg = pcode_offset; + regmap_field = devm_regmap_field_alloc(&pdev->dev, + ddata->regmap_eng, + reg_field); + if (IS_ERR(regmap_field)) { + dev_err(&pdev->dev, "Failed to allocate reg field\n"); + return PTR_ERR(regmap_field); + } + + ret = regmap_field_read(regmap_field, &value); + if (ret) { + dev_err(&pdev->dev, "Failed to read %s code\n", + field ? "SUBSTRATE" : "PCODE"); + return ret; + } + + return value; +} + +static const struct reg_field sti_stih407_dvfs_regfields[DVFS_MAX_REGFIELDS] = { + [PCODE] = REG_FIELD(0, 16, 19), + [SUBSTRATE] = REG_FIELD(0, 0, 2), +}; + +static const struct reg_field *sti_cpufreq_match(struct platform_device *pdev) +{ + if (of_machine_is_compatible("st,stih407") || + of_machine_is_compatible("st,stih410")) + return sti_stih407_dvfs_regfields; + + return NULL; +} + +/* Find process code -- calibrated per-SoC */ +static void sti_cpufreq_get_pcode(struct platform_device *pdev) +{ + struct st_cpufreq_ddata *ddata = platform_get_drvdata(pdev); + struct device_node *cpu = ddata->cpu->of_node; + const struct reg_field *reg_fields; + int pcode_offset; + int ret; + + ddata->regmap_eng = syscon_regmap_lookup_by_phandle(cpu, "st,syscfg-eng"); + if (IS_ERR(ddata->regmap_eng)) { + dev_warn(&pdev->dev, "\"st,syscfg-eng\" not supplied\n"); + goto set_default; + } + + ret = of_property_read_u32_index(cpu, "st,syscfg-eng", + PCODE_INDEX, &pcode_offset); + if (ret) { + dev_warn(&pdev->dev, "Process code offset is required\n"); + goto set_default; + } + + reg_fields = sti_cpufreq_match(pdev); + if (!reg_fields) { + dev_warn(&pdev->dev, "Machine not supported\n"); + goto set_default; + } + + ddata->pcode = st_cpufreq_fetch_regmap_field(pdev, reg_fields, + pcode_offset, + PCODE); + if (ddata->pcode < 0) + goto set_default; + + ddata->substrate = st_cpufreq_fetch_regmap_field(pdev, reg_fields, + pcode_offset, + SUBSTRATE); + if (ddata->substrate < 0) + goto set_default; + + return; + +set_default: + dev_warn(&pdev->dev, + "Setting pcode to highest tolerance/voltage for safety\n"); + ddata->pcode = 0; + ddata->substrate = 0; +} + +static int sti_cpufreq_probe(struct platform_device *pdev) +{ + struct st_cpufreq_ddata *ddata; + int ret; + + ddata = devm_kzalloc(&pdev->dev, sizeof(*ddata), GFP_KERNEL); + if (!ddata) + return -ENOMEM; + + platform_set_drvdata(pdev, ddata); + + ddata->cpu = get_cpu_device(0); + if (!ddata->cpu) { + dev_err(&pdev->dev, "Failed to get cpu0 device\n"); + return -ENODEV; + } + + sti_cpufreq_get_pcode(pdev); + + ret = st_cpufreq_get_dvfs_info(pdev); + if (ret) + dev_warn(&pdev->dev, "Not doing voltage scaling [%d]\n", ret); + else + sti_cpufreq_voltage_scaling_init(pdev); + + platform_device_register_simple("cpufreq-dt", -1, NULL, 0); + + return 0; +} + +static struct platform_driver sti_cpufreq = { + .driver = { + .name = "sti-cpufreq", + }, + .probe = sti_cpufreq_probe, +}; +module_platform_driver(sti_cpufreq); + +MODULE_AUTHOR("Ajitpal Singh "); +MODULE_DESCRIPTION("Creates an OPP list for cpufreq-cpu0 at runtime"); +MODULE_LICENSE("GPL"); +