PM / AVS: rockchip-cpu-avs: remove driver
authorFinley Xiao <finley.xiao@rock-chips.com>
Wed, 12 Apr 2017 10:29:47 +0000 (18:29 +0800)
committerHuang, Tao <huangtao@rock-chips.com>
Tue, 18 Apr 2017 08:10:31 +0000 (16:10 +0800)
The CPUFREQ_CREATE_POLICY and CPUFREQ_START had removed on 'master'
of git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git.
So the driver will be unused in the future.

Change-Id: I7e26a8050c4745d3390302babeafbbc40ff5e707
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
arch/arm64/configs/rockchip_defconfig
drivers/base/power/opp/core.c
drivers/power/avs/Kconfig
drivers/power/avs/Makefile
drivers/power/avs/rockchip-cpu-avs.c [deleted file]
include/linux/pm_opp.h

index 8bef4e18f451e91e315c95aaabe9868590a9cbff..b744772d80d467149f3cb0418a7cf545ae900ffb 100644 (file)
@@ -400,7 +400,6 @@ CONFIG_POWER_RESET_GPIO=y
 CONFIG_SYSCON_REBOOT_MODE=y
 CONFIG_POWER_AVS=y
 CONFIG_ROCKCHIP_IODOMAIN=y
-CONFIG_ROCKCHIP_CPU_AVS=y
 CONFIG_THERMAL=y
 CONFIG_THERMAL_WRITABLE_TRIPS=y
 CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR=y
index 2050ded41ef7c528731d912c787ecf1b91260695..f5be560858cba71c9cc566eecc31ca60bfda7f81 100644 (file)
@@ -1877,94 +1877,6 @@ unlock:
        return r;
 }
 
-/*
- * dev_pm_opp_adjust_voltage() - helper to change the voltage of an OPP
- * @dev:               device for which we do this operation
- * @freq:              OPP frequency to adjust voltage of
- * @u_volt:            new OPP voltage
- *
- * Change the voltage of an OPP with an RCU operation.
- *
- * Return: -EINVAL for bad pointers, -ENOMEM if no memory available for the
- * copy operation, returns 0 if no modifcation was done OR modification was
- * successful.
- *
- * Locking: The internal device_opp and opp structures are RCU protected.
- * Hence this function internally uses RCU updater strategy with mutex locks to
- * keep the integrity of the internal data structures. Callers should ensure
- * that this function is *NOT* called under RCU protection or in contexts where
- * mutex locking or synchronize_rcu() blocking calls cannot be used.
- */
-int dev_pm_opp_adjust_voltage(struct device *dev, unsigned long freq,
-                             unsigned long u_volt)
-{
-       struct opp_table *opp_table;
-       struct dev_pm_opp *new_opp, *tmp_opp, *opp = ERR_PTR(-ENODEV);
-       int r = 0;
-
-       /* keep the node allocated */
-       new_opp = kmalloc(sizeof(*new_opp), GFP_KERNEL);
-       if (!new_opp)
-               return -ENOMEM;
-
-       mutex_lock(&opp_table_lock);
-
-       /* Find the opp_table */
-       opp_table = _find_opp_table(dev);
-       if (IS_ERR(opp_table)) {
-               r = PTR_ERR(opp_table);
-               dev_warn(dev, "%s: Device OPP not found (%d)\n", __func__, r);
-               goto unlock;
-       }
-
-       /* Do we have the frequency? */
-       list_for_each_entry(tmp_opp, &opp_table->opp_list, node) {
-               if (tmp_opp->rate == freq) {
-                       opp = tmp_opp;
-                       break;
-               }
-       }
-       if (IS_ERR(opp)) {
-               r = PTR_ERR(opp);
-               goto unlock;
-       }
-
-       /* Is update really needed? */
-       if (opp->u_volt == u_volt)
-               goto unlock;
-       /* copy the old data over */
-       *new_opp = *opp;
-
-       /* plug in new node */
-       new_opp->u_volt = u_volt;
-
-       if (new_opp->u_volt_min > u_volt)
-               new_opp->u_volt_min = u_volt;
-       if (new_opp->u_volt_max < u_volt)
-               new_opp->u_volt_max = u_volt;
-
-       _opp_remove(opp_table, opp, false);
-       r = _opp_add(dev, new_opp, opp_table);
-       if (r) {
-               dev_err(dev, "Failed to add new_opp (u_volt=%lu)\n", u_volt);
-               _opp_add(dev, opp, opp_table);
-               goto unlock;
-       }
-
-       mutex_unlock(&opp_table_lock);
-
-       /* Notify the change of the OPP */
-       srcu_notifier_call_chain(&opp_table->srcu_head,
-                                OPP_EVENT_ADJUST_VOLTAGE, new_opp);
-
-       return 0;
-
-unlock:
-       mutex_unlock(&opp_table_lock);
-       kfree(new_opp);
-       return r;
-}
-
 /**
  * dev_pm_opp_enable() - Enable a specific OPP
  * @dev:       device for which we do this operation
index 694e524cf3e5170e5c170e3832acad9a553ecc82..a67eeace6a89b897fdd442770d32cb0410de34b3 100644 (file)
@@ -18,12 +18,3 @@ config ROCKCHIP_IODOMAIN
           Say y here to enable support io domains on Rockchip SoCs. It is
           necessary for the io domain setting of the SoC to match the
           voltage supplied by the regulators.
-
-config ROCKCHIP_CPU_AVS
-       bool "Rockchip CPU AVS support"
-       depends on POWER_AVS && ARCH_ROCKCHIP && OF && CPU_FREQ
-       depends on (ARM_CPU_TOPOLOGY || ARM64) && ROCKCHIP_EFUSE
-       help
-         Say y here to enable support CPU AVS on Rockchip SoCs.
-         The cpu's operating voltage is adapted depending on leakage
-         or pvtm.
index 11ce242470c7bcb0e7cf02ac964e39b54dc31a3d..ba4c7bc6922533dcc15627ecaff584a0e3d122e9 100644 (file)
@@ -1,3 +1,2 @@
 obj-$(CONFIG_POWER_AVS_OMAP)           += smartreflex.o
 obj-$(CONFIG_ROCKCHIP_IODOMAIN)                += rockchip-io-domain.o
-obj-$(CONFIG_ROCKCHIP_CPU_AVS)         += rockchip-cpu-avs.o
diff --git a/drivers/power/avs/rockchip-cpu-avs.c b/drivers/power/avs/rockchip-cpu-avs.c
deleted file mode 100644 (file)
index 0f14d69..0000000
+++ /dev/null
@@ -1,424 +0,0 @@
-/*
- * Rockchip CPU AVS support.
- *
- * Copyright (c) 2016 Rockchip Electronics Co. Ltd.
- * Author: Finley Xiao <finley.xiao@rock-chips.com>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/cpu.h>
-#include <linux/cpufreq.h>
-#include <linux/cpumask.h>
-#include <linux/err.h>
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/nvmem-consumer.h>
-#include <linux/of.h>
-#include <linux/platform_device.h>
-#include <linux/pm_opp.h>
-#include <linux/slab.h>
-#include <linux/types.h>
-
-#define MAX_CLUSTERS           2
-#define LEAKAGE_TABLE_END      ~1
-#define INVALID_VALUE          0xff
-
-struct leakage_volt_table {
-       unsigned int min;
-       unsigned int max;
-       int volt;
-};
-
-struct cluster_info {
-       unsigned int id;
-       int offset_volt;
-       unsigned char leakage;
-       unsigned int min_freq;
-       unsigned int min_volt;
-       struct leakage_volt_table *table;
-       unsigned int adjust_done;
-};
-
-struct rockchip_cpu_avs {
-       unsigned int num_clusters;
-       struct cluster_info *cluster;
-       struct notifier_block cpufreq_notify;
-       unsigned int check_done[MAX_CLUSTERS];
-       struct cpumask allowed_cpus[MAX_CLUSTERS];
-};
-
-#define notifier_to_avs(_n) container_of(_n, struct rockchip_cpu_avs, \
-       cpufreq_notify)
-
-static void rockchip_leakage_adjust_table(struct device *cpu_dev,
-                                         struct cpufreq_frequency_table *table,
-                                         struct cluster_info *cluster)
-{
-       struct cpufreq_frequency_table *pos;
-       struct dev_pm_opp *opp;
-       unsigned long adjust_volt;
-
-       if (!cluster->offset_volt)
-               return;
-
-       cpufreq_for_each_valid_entry(pos, table) {
-               if (pos->frequency < cluster->min_freq)
-                       continue;
-
-               rcu_read_lock();
-
-               opp = dev_pm_opp_find_freq_exact(cpu_dev, pos->frequency * 1000,
-                                                true);
-               if (IS_ERR(opp)) {
-                       rcu_read_unlock();
-                       continue;
-               }
-
-               adjust_volt = dev_pm_opp_get_voltage(opp) +
-                       cluster->offset_volt;
-
-               rcu_read_unlock();
-
-               if (adjust_volt < cluster->min_volt)
-                       continue;
-
-               dev_pm_opp_adjust_voltage(cpu_dev, pos->frequency * 1000,
-                                         adjust_volt);
-       }
-}
-
-static int rockchip_cpu_avs_notifier(struct notifier_block *nb,
-                                    unsigned long event, void *data)
-{
-       struct rockchip_cpu_avs *avs = notifier_to_avs(nb);
-       struct cpufreq_policy *policy = data;
-       struct cluster_info *cluster;
-       struct device *cpu_dev;
-       unsigned long cur_freq;
-       int i, id, cpu = policy->cpu;
-       int ret;
-
-       if (event != CPUFREQ_CREATE_POLICY && event  != CPUFREQ_START)
-               goto out;
-
-       for (id = 0; id < MAX_CLUSTERS; id++) {
-               if (cpumask_test_cpu(cpu, &avs->allowed_cpus[id]))
-                       break;
-               if (cpumask_empty(&avs->allowed_cpus[id])) {
-                       cpumask_copy(&avs->allowed_cpus[id],
-                                    policy->related_cpus);
-                       break;
-               }
-       }
-
-       if (id == MAX_CLUSTERS) {
-               pr_err("cpu%d invalid cluster id\n", cpu);
-               goto out;
-       }
-
-       cpu_dev = get_cpu_device(cpu);
-       if (!cpu_dev) {
-               pr_err("cpu%d failed to get device\n", cpu);
-               goto out;
-       }
-
-       if (avs->num_clusters == 0)
-               goto next;
-
-       for (i = 0; i < avs->num_clusters; i++) {
-               if (avs->cluster[i].id == id)
-                       break;
-       }
-       if (i == avs->num_clusters)
-               goto next;
-       else
-               cluster = &avs->cluster[i];
-
-       if (!policy->freq_table) {
-               pr_err("cpu%d freq table not found\n", cpu);
-               goto next;
-       }
-
-       /*
-        * First time, CPUFREQ_CREATE_POLICY, adjust talbe
-        * Second time, CPUFREQ_START, no need to adjust again
-        * Later, cpu down and up, CPUFREQ_START, adjust table
-        */
-       if (event == CPUFREQ_CREATE_POLICY) {
-               rockchip_leakage_adjust_table(cpu_dev, policy->freq_table,
-                                             cluster);
-               cluster->adjust_done = 1;
-       } else if (event == CPUFREQ_START) {
-               if (cluster->adjust_done == 1)
-                       cluster->adjust_done = 0;
-               else
-                       rockchip_leakage_adjust_table(cpu_dev,
-                                                     policy->freq_table,
-                                                     cluster);
-       }
-
-next:
-       if (avs->check_done[id] == 0) {
-               ret = dev_pm_opp_check_initial_rate(cpu_dev, &cur_freq);
-               if (!ret)
-                       policy->cur = cur_freq / 1000;
-               avs->check_done[id] = 1;
-       }
-
-out:
-
-       return NOTIFY_OK;
-}
-
-static int rockchip_get_leakage_volt_table(struct device_node *np,
-                                          struct leakage_volt_table **table)
-{
-       struct leakage_volt_table *volt_table;
-       const struct property *prop;
-       int count, i;
-
-       prop = of_find_property(np, "leakage-adjust-volt", NULL);
-       if (!prop) {
-               pr_err("failed to find property leakage-adjust-volt\n");
-               return -EINVAL;
-       }
-       if (!prop->value) {
-               pr_err("property leakage-adjust-volt is NULL\n");
-               return -ENODATA;
-       }
-
-       count = of_property_count_u32_elems(np, "leakage-adjust-volt");
-       if (count < 0) {
-               pr_err("Invalid property (%d)\n", count);
-               return -EINVAL;
-       }
-       if (count % 3) {
-               pr_err("Invalid number of elements in property (%d)\n", count);
-               return -EINVAL;
-       }
-
-       volt_table = kzalloc(sizeof(*volt_table) * (count / 3 + 1), GFP_KERNEL);
-       if (!volt_table)
-               return -ENOMEM;
-
-       for (i = 0; i < count / 3; i++) {
-               of_property_read_u32_index(np, "leakage-adjust-volt", 3 * i,
-                                          &volt_table[i].min);
-               of_property_read_u32_index(np, "leakage-adjust-volt", 3 * i + 1,
-                                          &volt_table[i].max);
-               of_property_read_u32_index(np, "leakage-adjust-volt", 3 * i + 2,
-                                          (u32 *)&volt_table[i].volt);
-       }
-       volt_table[i].min = 0;
-       volt_table[i].max = 0;
-       volt_table[i].volt = LEAKAGE_TABLE_END;
-
-       *table = volt_table;
-
-       return 0;
-}
-
-static int rockchip_get_leakage(struct device_node *np, unsigned char *leakage)
-{
-       struct nvmem_cell *cell;
-       unsigned char *buf;
-       size_t len;
-
-       cell = of_nvmem_cell_get(np, "cpu_leakage");
-       if (IS_ERR(cell)) {
-               pr_err("avs failed to get cpu_leakage cell\n");
-               return PTR_ERR(cell);
-       }
-
-       buf = (unsigned char *)nvmem_cell_read(cell, &len);
-
-       nvmem_cell_put(cell);
-
-       if (IS_ERR(buf))
-               return PTR_ERR(buf);
-
-       if (buf[0] == INVALID_VALUE)
-               return -EINVAL;
-
-       *leakage = buf[0];
-       kfree(buf);
-
-       return 0;
-}
-
-static int rockchip_get_offset_volt(unsigned char leakage,
-                                   struct leakage_volt_table *table, int *volt)
-{
-       int i, j = -1;
-
-       if (!table)
-               return -EINVAL;
-
-       for (i = 0; table[i].volt != LEAKAGE_TABLE_END; i++) {
-               if (leakage >= (unsigned char)table[i].min)
-                       j = i;
-       }
-
-       if (j == -1)
-               *volt = 0;
-       else
-               *volt = table[j].volt;
-
-       return 0;
-}
-
-static int rockchip_of_parse_cpu_avs(struct device_node *np,
-                                    struct cluster_info *cluster)
-{
-       int ret;
-
-       ret = of_property_read_u32(np, "cluster-id", &cluster->id);
-       if (ret < 0) {
-               pr_err("prop cluster-id missing\n");
-               return -EINVAL;
-       }
-       if (cluster->id >= MAX_CLUSTERS) {
-               pr_err("prop cluster-id invalid\n");
-               return -EINVAL;
-       }
-
-       ret = of_property_read_u32(np, "min-freq", &cluster->min_freq);
-       if (ret < 0) {
-               pr_err("prop min_freq missing\n");
-               return -EINVAL;
-       }
-
-       ret = of_property_read_u32(np, "min-volt", &cluster->min_volt);
-       if (ret < 0) {
-               pr_err("prop min_volt missing\n");
-               return -EINVAL;
-       }
-
-       ret = rockchip_get_leakage_volt_table(np, &cluster->table);
-       if (ret) {
-               pr_err("prop leakage-adjust-volt invalid\n");
-               return -EINVAL;
-       }
-
-       ret = rockchip_get_leakage(np, &cluster->leakage);
-       if (ret) {
-               pr_err("get leakage invalid\n");
-               return -EINVAL;
-       }
-
-       ret = rockchip_get_offset_volt(cluster->leakage, cluster->table,
-                                      &cluster->offset_volt);
-       if (ret) {
-               pr_err("get offset volt err\n");
-               return -EINVAL;
-       }
-
-       pr_info("cluster%d leakage=%d adjust_volt=%d\n", cluster->id,
-               cluster->leakage, cluster->offset_volt);
-
-       return 0;
-}
-
-static int rockchip_cpu_avs_probe(struct platform_device *pdev)
-{
-       struct device *dev = &pdev->dev;
-       struct device_node *np, *node;
-       struct rockchip_cpu_avs *avs;
-       int ret, num_clusters = 0, i = 0;
-
-       avs = devm_kzalloc(dev, sizeof(*avs), GFP_KERNEL);
-       if (!avs)
-               return -ENOMEM;
-
-       np = of_find_node_by_name(NULL, "cpu-avs");
-       if (!np) {
-               pr_info("unable to find cpu-avs node\n");
-               goto out;
-       }
-
-       if (!of_device_is_available(np)) {
-               pr_info("cpu-avs node disabled\n");
-               goto next;
-       }
-
-       for_each_available_child_of_node(np, node)
-               num_clusters++;
-
-       if (!num_clusters) {
-               pr_info("cpu-avs child node disabled\n");
-               goto next;
-       }
-
-       avs->cluster = devm_kzalloc(dev, sizeof(*avs->cluster) * num_clusters,
-                                   GFP_KERNEL);
-       if (!avs->cluster)
-               goto next;
-
-       avs->num_clusters = num_clusters;
-
-       for_each_available_child_of_node(np, node) {
-               ret = rockchip_of_parse_cpu_avs(node, &avs->cluster[i++]);
-               if (ret) {
-                       devm_kfree(dev, avs->cluster);
-                       avs->num_clusters = 0;
-                       break;
-               }
-       }
-
-next:
-       of_node_put(np);
-
-out:
-       avs->cpufreq_notify.notifier_call = rockchip_cpu_avs_notifier;
-
-       return cpufreq_register_notifier(&avs->cpufreq_notify,
-               CPUFREQ_POLICY_NOTIFIER);
-}
-
-static struct platform_driver rockchip_cpu_avs_platdrv = {
-       .driver = {
-               .name   = "rockchip-cpu-avs",
-       },
-       .probe          = rockchip_cpu_avs_probe,
-};
-
-static int __init rockchip_cpu_avs_init(void)
-{
-       struct platform_device *pdev;
-       int ret;
-
-       ret = platform_driver_register(&rockchip_cpu_avs_platdrv);
-       if (ret)
-               return ret;
-
-       /*
-        * Since there's no place to hold device registration code and no
-        * device tree based way to match cpu-avs driver yet, both the driver
-        * and the device registration codes are put here to handle defer
-        * probing.
-        */
-       pdev = platform_device_register_simple("rockchip-cpu-avs", -1, NULL, 0);
-       if (IS_ERR(pdev)) {
-               pr_err("failed to register rockchip-cpu-avs platform device\n");
-               return PTR_ERR(pdev);
-       }
-
-       return 0;
-}
-
-module_init(rockchip_cpu_avs_init);
-
-MODULE_DESCRIPTION("Rockchip CPU AVS driver");
-MODULE_AUTHOR("Finley Xiao <finley.xiao@rock-chips.com>");
-MODULE_LICENSE("GPL v2");
index ce6a29efa9ae3e66c6054fa0e55a63631bfce143..fb07ba05699a1a77e923bcf70d1406559cd8ac8b 100644 (file)
@@ -53,9 +53,6 @@ int dev_pm_opp_add(struct device *dev, unsigned long freq,
                   unsigned long u_volt);
 void dev_pm_opp_remove(struct device *dev, unsigned long freq);
 
-int dev_pm_opp_adjust_voltage(struct device *dev, unsigned long freq,
-                             unsigned long u_volt);
-
 int dev_pm_opp_enable(struct device *dev, unsigned long freq);
 
 int dev_pm_opp_disable(struct device *dev, unsigned long freq);
@@ -139,13 +136,6 @@ static inline void dev_pm_opp_remove(struct device *dev, unsigned long freq)
 {
 }
 
-static inline int
-dev_pm_opp_adjust_voltage(struct device *dev, unsigned long freq,
-                         unsigned long u_volt)
-{
-       return 0;
-}
-
 static inline int dev_pm_opp_enable(struct device *dev, unsigned long freq)
 {
        return 0;