Commit e07095c9 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki

Merge branches 'pm-devfreq' and 'pm-domains'

* pm-devfreq:
  PM / devfreq: add tracing for scheduling work
  trace: events: add devfreq trace event file
  PM / devfreq: rk3399_dmc: Pass ODT and auto power down parameters to TF-A.
  PM / devfreq: rockchip-dfi: Move GRF definitions to a common place.
  PM / devfreq: exynos-bus: Suspend all devices on system shutdown
  PM / devfreq: Fix static checker warning in try_then_request_governor
  PM / devfreq: Restart previous governor if new governor fails to start
  PM / devfreq: tegra: remove unneeded variable
  PM / devfreq: rockchip-dfi: remove unneeded semicolon
  PM / devfreq: rk3399_dmc: remove unneeded semicolon
  PM / devfreq: consistent indentation
  PM / devfreq: fix missing check of return value in devfreq_add_device()
  PM / devfreq: fix mem leak in devfreq_add_device()
  PM / devfreq: Use of_node_name_eq for node name comparisons

* pm-domains:
  PM / Domains: Allow to attach a CPU via genpd_dev_pm_attach_by_id|name()
  PM / Domains: Search for the CPU device outside the genpd lock
  PM / Domains: Drop unused in-parameter to some genpd functions
  PM / Domains: Use the base device for driver_deferred_probe_check_state()
  PM / Domains: Enable genpd_dev_pm_attach_by_id|name() for single PM domain
  PM / Domains: Allow OF lookup for multi PM domain case from ->attach_dev()
  PM / Domains: Don't kfree() the virtual device in the error path
  PM / Domains: remove unnecessary unlikely()
...@@ -4553,6 +4553,7 @@ S: Maintained ...@@ -4553,6 +4553,7 @@ S: Maintained
F: drivers/devfreq/ F: drivers/devfreq/
F: include/linux/devfreq.h F: include/linux/devfreq.h
F: Documentation/devicetree/bindings/devfreq/ F: Documentation/devicetree/bindings/devfreq/
F: include/trace/events/devfreq.h
DEVICE FREQUENCY EVENT (DEVFREQ-EVENT) DEVICE FREQUENCY EVENT (DEVFREQ-EVENT)
M: Chanwoo Choi <cw00.choi@samsung.com> M: Chanwoo Choi <cw00.choi@samsung.com>
......
...@@ -393,11 +393,9 @@ int dev_pm_genpd_set_performance_state(struct device *dev, unsigned int state) ...@@ -393,11 +393,9 @@ int dev_pm_genpd_set_performance_state(struct device *dev, unsigned int state)
if (unlikely(!genpd->set_performance_state)) if (unlikely(!genpd->set_performance_state))
return -EINVAL; return -EINVAL;
if (unlikely(!dev->power.subsys_data || if (WARN_ON(!dev->power.subsys_data ||
!dev->power.subsys_data->domain_data)) { !dev->power.subsys_data->domain_data))
WARN_ON(1);
return -EINVAL; return -EINVAL;
}
genpd_lock(genpd); genpd_lock(genpd);
...@@ -1398,8 +1396,7 @@ EXPORT_SYMBOL_GPL(pm_genpd_syscore_poweron); ...@@ -1398,8 +1396,7 @@ EXPORT_SYMBOL_GPL(pm_genpd_syscore_poweron);
#endif /* CONFIG_PM_SLEEP */ #endif /* CONFIG_PM_SLEEP */
static struct generic_pm_domain_data *genpd_alloc_dev_data(struct device *dev, static struct generic_pm_domain_data *genpd_alloc_dev_data(struct device *dev)
struct gpd_timing_data *td)
{ {
struct generic_pm_domain_data *gpd_data; struct generic_pm_domain_data *gpd_data;
int ret; int ret;
...@@ -1414,9 +1411,6 @@ static struct generic_pm_domain_data *genpd_alloc_dev_data(struct device *dev, ...@@ -1414,9 +1411,6 @@ static struct generic_pm_domain_data *genpd_alloc_dev_data(struct device *dev,
goto err_put; goto err_put;
} }
if (td)
gpd_data->td = *td;
gpd_data->base.dev = dev; gpd_data->base.dev = dev;
gpd_data->td.constraint_changed = true; gpd_data->td.constraint_changed = true;
gpd_data->td.effective_constraint_ns = PM_QOS_RESUME_LATENCY_NO_CONSTRAINT_NS; gpd_data->td.effective_constraint_ns = PM_QOS_RESUME_LATENCY_NO_CONSTRAINT_NS;
...@@ -1456,7 +1450,7 @@ static void genpd_free_dev_data(struct device *dev, ...@@ -1456,7 +1450,7 @@ static void genpd_free_dev_data(struct device *dev,
dev_pm_put_subsys_data(dev); dev_pm_put_subsys_data(dev);
} }
static void __genpd_update_cpumask(struct generic_pm_domain *genpd, static void genpd_update_cpumask(struct generic_pm_domain *genpd,
int cpu, bool set, unsigned int depth) int cpu, bool set, unsigned int depth)
{ {
struct gpd_link *link; struct gpd_link *link;
...@@ -1468,7 +1462,7 @@ static void __genpd_update_cpumask(struct generic_pm_domain *genpd, ...@@ -1468,7 +1462,7 @@ static void __genpd_update_cpumask(struct generic_pm_domain *genpd,
struct generic_pm_domain *master = link->master; struct generic_pm_domain *master = link->master;
genpd_lock_nested(master, depth + 1); genpd_lock_nested(master, depth + 1);
__genpd_update_cpumask(master, cpu, set, depth + 1); genpd_update_cpumask(master, cpu, set, depth + 1);
genpd_unlock(master); genpd_unlock(master);
} }
...@@ -1478,36 +1472,35 @@ static void __genpd_update_cpumask(struct generic_pm_domain *genpd, ...@@ -1478,36 +1472,35 @@ static void __genpd_update_cpumask(struct generic_pm_domain *genpd,
cpumask_clear_cpu(cpu, genpd->cpus); cpumask_clear_cpu(cpu, genpd->cpus);
} }
static void genpd_update_cpumask(struct generic_pm_domain *genpd, static void genpd_set_cpumask(struct generic_pm_domain *genpd, int cpu)
struct device *dev, bool set) {
if (cpu >= 0)
genpd_update_cpumask(genpd, cpu, true, 0);
}
static void genpd_clear_cpumask(struct generic_pm_domain *genpd, int cpu)
{
if (cpu >= 0)
genpd_update_cpumask(genpd, cpu, false, 0);
}
static int genpd_get_cpu(struct generic_pm_domain *genpd, struct device *dev)
{ {
int cpu; int cpu;
if (!genpd_is_cpu_domain(genpd)) if (!genpd_is_cpu_domain(genpd))
return; return -1;
for_each_possible_cpu(cpu) { for_each_possible_cpu(cpu) {
if (get_cpu_device(cpu) == dev) { if (get_cpu_device(cpu) == dev)
__genpd_update_cpumask(genpd, cpu, set, 0); return cpu;
return;
}
} }
}
static void genpd_set_cpumask(struct generic_pm_domain *genpd, return -1;
struct device *dev)
{
genpd_update_cpumask(genpd, dev, true);
}
static void genpd_clear_cpumask(struct generic_pm_domain *genpd,
struct device *dev)
{
genpd_update_cpumask(genpd, dev, false);
} }
static int genpd_add_device(struct generic_pm_domain *genpd, struct device *dev, static int genpd_add_device(struct generic_pm_domain *genpd, struct device *dev,
struct gpd_timing_data *td) struct device *base_dev)
{ {
struct generic_pm_domain_data *gpd_data; struct generic_pm_domain_data *gpd_data;
int ret; int ret;
...@@ -1517,17 +1510,19 @@ static int genpd_add_device(struct generic_pm_domain *genpd, struct device *dev, ...@@ -1517,17 +1510,19 @@ static int genpd_add_device(struct generic_pm_domain *genpd, struct device *dev,
if (IS_ERR_OR_NULL(genpd) || IS_ERR_OR_NULL(dev)) if (IS_ERR_OR_NULL(genpd) || IS_ERR_OR_NULL(dev))
return -EINVAL; return -EINVAL;
gpd_data = genpd_alloc_dev_data(dev, td); gpd_data = genpd_alloc_dev_data(dev);
if (IS_ERR(gpd_data)) if (IS_ERR(gpd_data))
return PTR_ERR(gpd_data); return PTR_ERR(gpd_data);
gpd_data->cpu = genpd_get_cpu(genpd, base_dev);
ret = genpd->attach_dev ? genpd->attach_dev(genpd, dev) : 0; ret = genpd->attach_dev ? genpd->attach_dev(genpd, dev) : 0;
if (ret) if (ret)
goto out; goto out;
genpd_lock(genpd); genpd_lock(genpd);
genpd_set_cpumask(genpd, dev); genpd_set_cpumask(genpd, gpd_data->cpu);
dev_pm_domain_set(dev, &genpd->domain); dev_pm_domain_set(dev, &genpd->domain);
genpd->device_count++; genpd->device_count++;
...@@ -1555,7 +1550,7 @@ int pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev) ...@@ -1555,7 +1550,7 @@ int pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev)
int ret; int ret;
mutex_lock(&gpd_list_lock); mutex_lock(&gpd_list_lock);
ret = genpd_add_device(genpd, dev, NULL); ret = genpd_add_device(genpd, dev, dev);
mutex_unlock(&gpd_list_lock); mutex_unlock(&gpd_list_lock);
return ret; return ret;
...@@ -1585,7 +1580,7 @@ static int genpd_remove_device(struct generic_pm_domain *genpd, ...@@ -1585,7 +1580,7 @@ static int genpd_remove_device(struct generic_pm_domain *genpd,
genpd->device_count--; genpd->device_count--;
genpd->max_off_time_changed = true; genpd->max_off_time_changed = true;
genpd_clear_cpumask(genpd, dev); genpd_clear_cpumask(genpd, gpd_data->cpu);
dev_pm_domain_set(dev, NULL); dev_pm_domain_set(dev, NULL);
list_del_init(&pdd->list_node); list_del_init(&pdd->list_node);
...@@ -2261,7 +2256,7 @@ int of_genpd_add_device(struct of_phandle_args *genpdspec, struct device *dev) ...@@ -2261,7 +2256,7 @@ int of_genpd_add_device(struct of_phandle_args *genpdspec, struct device *dev)
goto out; goto out;
} }
ret = genpd_add_device(genpd, dev, NULL); ret = genpd_add_device(genpd, dev, dev);
out: out:
mutex_unlock(&gpd_list_lock); mutex_unlock(&gpd_list_lock);
...@@ -2345,6 +2340,7 @@ EXPORT_SYMBOL_GPL(of_genpd_remove_last); ...@@ -2345,6 +2340,7 @@ EXPORT_SYMBOL_GPL(of_genpd_remove_last);
static void genpd_release_dev(struct device *dev) static void genpd_release_dev(struct device *dev)
{ {
of_node_put(dev->of_node);
kfree(dev); kfree(dev);
} }
...@@ -2406,14 +2402,14 @@ static void genpd_dev_pm_sync(struct device *dev) ...@@ -2406,14 +2402,14 @@ static void genpd_dev_pm_sync(struct device *dev)
genpd_queue_power_off_work(pd); genpd_queue_power_off_work(pd);
} }
static int __genpd_dev_pm_attach(struct device *dev, struct device_node *np, static int __genpd_dev_pm_attach(struct device *dev, struct device *base_dev,
unsigned int index, bool power_on) unsigned int index, bool power_on)
{ {
struct of_phandle_args pd_args; struct of_phandle_args pd_args;
struct generic_pm_domain *pd; struct generic_pm_domain *pd;
int ret; int ret;
ret = of_parse_phandle_with_args(np, "power-domains", ret = of_parse_phandle_with_args(dev->of_node, "power-domains",
"#power-domain-cells", index, &pd_args); "#power-domain-cells", index, &pd_args);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -2425,12 +2421,12 @@ static int __genpd_dev_pm_attach(struct device *dev, struct device_node *np, ...@@ -2425,12 +2421,12 @@ static int __genpd_dev_pm_attach(struct device *dev, struct device_node *np,
mutex_unlock(&gpd_list_lock); mutex_unlock(&gpd_list_lock);
dev_dbg(dev, "%s() failed to find PM domain: %ld\n", dev_dbg(dev, "%s() failed to find PM domain: %ld\n",
__func__, PTR_ERR(pd)); __func__, PTR_ERR(pd));
return driver_deferred_probe_check_state(dev); return driver_deferred_probe_check_state(base_dev);
} }
dev_dbg(dev, "adding to PM domain %s\n", pd->name); dev_dbg(dev, "adding to PM domain %s\n", pd->name);
ret = genpd_add_device(pd, dev, NULL); ret = genpd_add_device(pd, dev, base_dev);
mutex_unlock(&gpd_list_lock); mutex_unlock(&gpd_list_lock);
if (ret < 0) { if (ret < 0) {
...@@ -2481,7 +2477,7 @@ int genpd_dev_pm_attach(struct device *dev) ...@@ -2481,7 +2477,7 @@ int genpd_dev_pm_attach(struct device *dev)
"#power-domain-cells") != 1) "#power-domain-cells") != 1)
return 0; return 0;
return __genpd_dev_pm_attach(dev, dev->of_node, 0, true); return __genpd_dev_pm_attach(dev, dev, 0, true);
} }
EXPORT_SYMBOL_GPL(genpd_dev_pm_attach); EXPORT_SYMBOL_GPL(genpd_dev_pm_attach);
...@@ -2511,10 +2507,10 @@ struct device *genpd_dev_pm_attach_by_id(struct device *dev, ...@@ -2511,10 +2507,10 @@ struct device *genpd_dev_pm_attach_by_id(struct device *dev,
if (!dev->of_node) if (!dev->of_node)
return NULL; return NULL;
/* Deal only with devices using multiple PM domains. */ /* Verify that the index is within a valid range. */
num_domains = of_count_phandle_with_args(dev->of_node, "power-domains", num_domains = of_count_phandle_with_args(dev->of_node, "power-domains",
"#power-domain-cells"); "#power-domain-cells");
if (num_domains < 2 || index >= num_domains) if (index >= num_domains)
return NULL; return NULL;
/* Allocate and register device on the genpd bus. */ /* Allocate and register device on the genpd bus. */
...@@ -2525,15 +2521,16 @@ struct device *genpd_dev_pm_attach_by_id(struct device *dev, ...@@ -2525,15 +2521,16 @@ struct device *genpd_dev_pm_attach_by_id(struct device *dev,
dev_set_name(virt_dev, "genpd:%u:%s", index, dev_name(dev)); dev_set_name(virt_dev, "genpd:%u:%s", index, dev_name(dev));
virt_dev->bus = &genpd_bus_type; virt_dev->bus = &genpd_bus_type;
virt_dev->release = genpd_release_dev; virt_dev->release = genpd_release_dev;
virt_dev->of_node = of_node_get(dev->of_node);
ret = device_register(virt_dev); ret = device_register(virt_dev);
if (ret) { if (ret) {
kfree(virt_dev); put_device(virt_dev);
return ERR_PTR(ret); return ERR_PTR(ret);
} }
/* Try to attach the device to the PM domain at the specified index. */ /* Try to attach the device to the PM domain at the specified index. */
ret = __genpd_dev_pm_attach(virt_dev, dev->of_node, index, false); ret = __genpd_dev_pm_attach(virt_dev, dev, index, false);
if (ret < 1) { if (ret < 1) {
device_unregister(virt_dev); device_unregister(virt_dev);
return ret ? ERR_PTR(ret) : NULL; return ret ? ERR_PTR(ret) : NULL;
......
...@@ -240,7 +240,7 @@ struct devfreq_event_dev *devfreq_event_get_edev_by_phandle(struct device *dev, ...@@ -240,7 +240,7 @@ struct devfreq_event_dev *devfreq_event_get_edev_by_phandle(struct device *dev,
} }
list_for_each_entry(edev, &devfreq_event_list, node) { list_for_each_entry(edev, &devfreq_event_list, node) {
if (!strcmp(edev->desc->name, node->name)) if (of_node_name_eq(node, edev->desc->name))
goto out; goto out;
} }
edev = NULL; edev = NULL;
......
...@@ -29,6 +29,9 @@ ...@@ -29,6 +29,9 @@
#include <linux/of.h> #include <linux/of.h>
#include "governor.h" #include "governor.h"
#define CREATE_TRACE_POINTS
#include <trace/events/devfreq.h>
static struct class *devfreq_class; static struct class *devfreq_class;
/* /*
...@@ -228,7 +231,7 @@ static struct devfreq_governor *find_devfreq_governor(const char *name) ...@@ -228,7 +231,7 @@ static struct devfreq_governor *find_devfreq_governor(const char *name)
* if is not found. This can happen when both drivers (the governor driver * if is not found. This can happen when both drivers (the governor driver
* and the driver that call devfreq_add_device) are built as modules. * and the driver that call devfreq_add_device) are built as modules.
* devfreq_list_lock should be held by the caller. Returns the matched * devfreq_list_lock should be held by the caller. Returns the matched
* governor's pointer. * governor's pointer or an error pointer.
*/ */
static struct devfreq_governor *try_then_request_governor(const char *name) static struct devfreq_governor *try_then_request_governor(const char *name)
{ {
...@@ -254,7 +257,7 @@ static struct devfreq_governor *try_then_request_governor(const char *name) ...@@ -254,7 +257,7 @@ static struct devfreq_governor *try_then_request_governor(const char *name)
/* Restore previous state before return */ /* Restore previous state before return */
mutex_lock(&devfreq_list_lock); mutex_lock(&devfreq_list_lock);
if (err) if (err)
return NULL; return ERR_PTR(err);
governor = find_devfreq_governor(name); governor = find_devfreq_governor(name);
} }
...@@ -394,6 +397,8 @@ static void devfreq_monitor(struct work_struct *work) ...@@ -394,6 +397,8 @@ static void devfreq_monitor(struct work_struct *work)
queue_delayed_work(devfreq_wq, &devfreq->work, queue_delayed_work(devfreq_wq, &devfreq->work,
msecs_to_jiffies(devfreq->profile->polling_ms)); msecs_to_jiffies(devfreq->profile->polling_ms));
mutex_unlock(&devfreq->lock); mutex_unlock(&devfreq->lock);
trace_devfreq_monitor(devfreq);
} }
/** /**
...@@ -651,7 +656,7 @@ struct devfreq *devfreq_add_device(struct device *dev, ...@@ -651,7 +656,7 @@ struct devfreq *devfreq_add_device(struct device *dev,
mutex_unlock(&devfreq->lock); mutex_unlock(&devfreq->lock);
err = set_freq_table(devfreq); err = set_freq_table(devfreq);
if (err < 0) if (err < 0)
goto err_out; goto err_dev;
mutex_lock(&devfreq->lock); mutex_lock(&devfreq->lock);
} }
...@@ -683,16 +688,27 @@ struct devfreq *devfreq_add_device(struct device *dev, ...@@ -683,16 +688,27 @@ struct devfreq *devfreq_add_device(struct device *dev,
goto err_out; goto err_out;
} }
devfreq->trans_table = devfreq->trans_table = devm_kzalloc(&devfreq->dev,
devm_kzalloc(&devfreq->dev,
array3_size(sizeof(unsigned int), array3_size(sizeof(unsigned int),
devfreq->profile->max_state, devfreq->profile->max_state,
devfreq->profile->max_state), devfreq->profile->max_state),
GFP_KERNEL); GFP_KERNEL);
if (!devfreq->trans_table) {
mutex_unlock(&devfreq->lock);
err = -ENOMEM;
goto err_devfreq;
}
devfreq->time_in_state = devm_kcalloc(&devfreq->dev, devfreq->time_in_state = devm_kcalloc(&devfreq->dev,
devfreq->profile->max_state, devfreq->profile->max_state,
sizeof(unsigned long), sizeof(unsigned long),
GFP_KERNEL); GFP_KERNEL);
if (!devfreq->time_in_state) {
mutex_unlock(&devfreq->lock);
err = -ENOMEM;
goto err_devfreq;
}
devfreq->last_stat_updated = jiffies; devfreq->last_stat_updated = jiffies;
srcu_init_notifier_head(&devfreq->transition_notifier_list); srcu_init_notifier_head(&devfreq->transition_notifier_list);
...@@ -726,7 +742,7 @@ struct devfreq *devfreq_add_device(struct device *dev, ...@@ -726,7 +742,7 @@ struct devfreq *devfreq_add_device(struct device *dev,
err_init: err_init:
mutex_unlock(&devfreq_list_lock); mutex_unlock(&devfreq_list_lock);
err_devfreq:
devfreq_remove_device(devfreq); devfreq_remove_device(devfreq);
devfreq = NULL; devfreq = NULL;
err_dev: err_dev:
...@@ -1113,7 +1129,7 @@ static ssize_t governor_store(struct device *dev, struct device_attribute *attr, ...@@ -1113,7 +1129,7 @@ static ssize_t governor_store(struct device *dev, struct device_attribute *attr,
struct devfreq *df = to_devfreq(dev); struct devfreq *df = to_devfreq(dev);
int ret; int ret;
char str_governor[DEVFREQ_NAME_LEN + 1]; char str_governor[DEVFREQ_NAME_LEN + 1];
struct devfreq_governor *governor; const struct devfreq_governor *governor, *prev_governor;
ret = sscanf(buf, "%" __stringify(DEVFREQ_NAME_LEN) "s", str_governor); ret = sscanf(buf, "%" __stringify(DEVFREQ_NAME_LEN) "s", str_governor);
if (ret != 1) if (ret != 1)
...@@ -1142,12 +1158,24 @@ static ssize_t governor_store(struct device *dev, struct device_attribute *attr, ...@@ -1142,12 +1158,24 @@ static ssize_t governor_store(struct device *dev, struct device_attribute *attr,
goto out; goto out;
} }
} }
prev_governor = df->governor;
df->governor = governor; df->governor = governor;
strncpy(df->governor_name, governor->name, DEVFREQ_NAME_LEN); strncpy(df->governor_name, governor->name, DEVFREQ_NAME_LEN);
ret = df->governor->event_handler(df, DEVFREQ_GOV_START, NULL); ret = df->governor->event_handler(df, DEVFREQ_GOV_START, NULL);
if (ret) if (ret) {
dev_warn(dev, "%s: Governor %s not started(%d)\n", dev_warn(dev, "%s: Governor %s not started(%d)\n",
__func__, df->governor->name, ret); __func__, df->governor->name, ret);
df->governor = prev_governor;
strncpy(df->governor_name, prev_governor->name,
DEVFREQ_NAME_LEN);
ret = df->governor->event_handler(df, DEVFREQ_GOV_START, NULL);
if (ret) {
dev_err(dev,
"%s: reverting to Governor %s failed (%d)\n",
__func__, df->governor_name, ret);
df->governor = NULL;
}
}
out: out:
mutex_unlock(&devfreq_list_lock); mutex_unlock(&devfreq_list_lock);
...@@ -1518,8 +1546,8 @@ static void devm_devfreq_opp_release(struct device *dev, void *res) ...@@ -1518,8 +1546,8 @@ static void devm_devfreq_opp_release(struct device *dev, void *res)
} }
/** /**
* devm_ devfreq_register_opp_notifier() * devm_devfreq_register_opp_notifier() - Resource-managed
* - Resource-managed devfreq_register_opp_notifier() * devfreq_register_opp_notifier()
* @dev: The devfreq user device. (parent of devfreq) * @dev: The devfreq user device. (parent of devfreq)
* @devfreq: The devfreq object. * @devfreq: The devfreq object.
*/ */
...@@ -1547,8 +1575,8 @@ int devm_devfreq_register_opp_notifier(struct device *dev, ...@@ -1547,8 +1575,8 @@ int devm_devfreq_register_opp_notifier(struct device *dev,
EXPORT_SYMBOL(devm_devfreq_register_opp_notifier); EXPORT_SYMBOL(devm_devfreq_register_opp_notifier);
/** /**
* devm_devfreq_unregister_opp_notifier() * devm_devfreq_unregister_opp_notifier() - Resource-managed
* - Resource-managed devfreq_unregister_opp_notifier() * devfreq_unregister_opp_notifier()
* @dev: The devfreq user device. (parent of devfreq) * @dev: The devfreq user device. (parent of devfreq)
* @devfreq: The devfreq object. * @devfreq: The devfreq object.
*/ */
......
...@@ -529,7 +529,7 @@ static int of_get_devfreq_events(struct device_node *np, ...@@ -529,7 +529,7 @@ static int of_get_devfreq_events(struct device_node *np,
if (!ppmu_events[i].name) if (!ppmu_events[i].name)
continue; continue;
if (!of_node_cmp(node->name, ppmu_events[i].name)) if (of_node_name_eq(node, ppmu_events[i].name))
break; break;
} }
......
...@@ -26,6 +26,8 @@ ...@@ -26,6 +26,8 @@
#include <linux/list.h> #include <linux/list.h>
#include <linux/of.h> #include <linux/of.h>
#include <soc/rockchip/rk3399_grf.h>
#define RK3399_DMC_NUM_CH 2 #define RK3399_DMC_NUM_CH 2
/* DDRMON_CTRL */ /* DDRMON_CTRL */
...@@ -43,18 +45,6 @@ ...@@ -43,18 +45,6 @@
#define DDRMON_CH1_COUNT_NUM 0x3c #define DDRMON_CH1_COUNT_NUM 0x3c
#define DDRMON_CH1_DFI_ACCESS_NUM 0x40 #define DDRMON_CH1_DFI_ACCESS_NUM 0x40
/* pmu grf */
#define PMUGRF_OS_REG2 0x308
#define DDRTYPE_SHIFT 13
#define DDRTYPE_MASK 7
enum {
DDR3 = 3,
LPDDR3 = 6,
LPDDR4 = 7,
UNUSED = 0xFF
};
struct dmc_usage { struct dmc_usage {
u32 access; u32 access;
u32 total; u32 total;
...@@ -83,16 +73,17 @@ static void rockchip_dfi_start_hardware_counter(struct devfreq_event_dev *edev) ...@@ -83,16 +73,17 @@ static void rockchip_dfi_start_hardware_counter(struct devfreq_event_dev *edev)
u32 ddr_type; u32 ddr_type;
/* get ddr type */ /* get ddr type */
regmap_read(info->regmap_pmu, PMUGRF_OS_REG2, &val); regmap_read(info->regmap_pmu, RK3399_PMUGRF_OS_REG2, &val);
ddr_type = (val >> DDRTYPE_SHIFT) & DDRTYPE_MASK; ddr_type = (val >> RK3399_PMUGRF_DDRTYPE_SHIFT) &
RK3399_PMUGRF_DDRTYPE_MASK;
/* clear DDRMON_CTRL setting */ /* clear DDRMON_CTRL setting */
writel_relaxed(CLR_DDRMON_CTRL, dfi_regs + DDRMON_CTRL); writel_relaxed(CLR_DDRMON_CTRL, dfi_regs + DDRMON_CTRL);
/* set ddr type to dfi */ /* set ddr type to dfi */
if (ddr_type == LPDDR3) if (ddr_type == RK3399_PMUGRF_DDRTYPE_LPDDR3)
writel_relaxed(LPDDR3_EN, dfi_regs + DDRMON_CTRL); writel_relaxed(LPDDR3_EN, dfi_regs + DDRMON_CTRL);
else if (ddr_type == LPDDR4) else if (ddr_type == RK3399_PMUGRF_DDRTYPE_LPDDR4)
writel_relaxed(LPDDR4_EN, dfi_regs + DDRMON_CTRL); writel_relaxed(LPDDR4_EN, dfi_regs + DDRMON_CTRL);
/* enable count, use software mode */ /* enable count, use software mode */
...@@ -211,7 +202,7 @@ static int rockchip_dfi_probe(struct platform_device *pdev) ...@@ -211,7 +202,7 @@ static int rockchip_dfi_probe(struct platform_device *pdev)
if (IS_ERR(data->clk)) { if (IS_ERR(data->clk)) {
dev_err(dev, "Cannot get the clk dmc_clk\n"); dev_err(dev, "Cannot get the clk dmc_clk\n");
return PTR_ERR(data->clk); return PTR_ERR(data->clk);
}; }
/* try to find the optional reference to the pmu syscon */ /* try to find the optional reference to the pmu syscon */
node = of_parse_phandle(np, "rockchip,pmu", 0); node = of_parse_phandle(np, "rockchip,pmu", 0);
......
...@@ -514,6 +514,13 @@ static int exynos_bus_probe(struct platform_device *pdev) ...@@ -514,6 +514,13 @@ static int exynos_bus_probe(struct platform_device *pdev)
return ret; return ret;
} }
static void exynos_bus_shutdown(struct platform_device *pdev)
{
struct exynos_bus *bus = dev_get_drvdata(&pdev->dev);
devfreq_suspend_device(bus->devfreq);
}
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
static int exynos_bus_resume(struct device *dev) static int exynos_bus_resume(struct device *dev)
{ {
...@@ -556,6 +563,7 @@ MODULE_DEVICE_TABLE(of, exynos_bus_of_match); ...@@ -556,6 +563,7 @@ MODULE_DEVICE_TABLE(of, exynos_bus_of_match);
static struct platform_driver exynos_bus_platdrv = { static struct platform_driver exynos_bus_platdrv = {
.probe = exynos_bus_probe, .probe = exynos_bus_probe,
.shutdown = exynos_bus_shutdown,
.driver = { .driver = {
.name = "exynos-bus", .name = "exynos-bus",
.pm = &exynos_bus_pm, .pm = &exynos_bus_pm,
......
...@@ -18,14 +18,17 @@ ...@@ -18,14 +18,17 @@
#include <linux/devfreq.h> #include <linux/devfreq.h>
#include <linux/devfreq-event.h> #include <linux/devfreq-event.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/mfd/syscon.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/pm_opp.h> #include <linux/pm_opp.h>
#include <linux/regmap.h>
#include <linux/regulator/consumer.h> #include <linux/regulator/consumer.h>
#include <linux/rwsem.h> #include <linux/rwsem.h>
#include <linux/suspend.h> #include <linux/suspend.h>
#include <soc/rockchip/rk3399_grf.h>
#include <soc/rockchip/rockchip_sip.h> #include <soc/rockchip/rockchip_sip.h>
struct dram_timing { struct dram_timing {
...@@ -69,8 +72,11 @@ struct rk3399_dmcfreq { ...@@ -69,8 +72,11 @@ struct rk3399_dmcfreq {
struct mutex lock; struct mutex lock;
struct dram_timing timing; struct dram_timing timing;
struct regulator *vdd_center; struct regulator *vdd_center;
struct regmap *regmap_pmu;
unsigned long rate, target_rate; unsigned long rate, target_rate;
unsigned long volt, target_volt; unsigned long volt, target_volt;
unsigned int odt_dis_freq;
int odt_pd_arg0, odt_pd_arg1;
}; };
static int rk3399_dmcfreq_target(struct device *dev, unsigned long *freq, static int rk3399_dmcfreq_target(struct device *dev, unsigned long *freq,
...@@ -80,6 +86,8 @@ static int rk3399_dmcfreq_target(struct device *dev, unsigned long *freq, ...@@ -80,6 +86,8 @@ static int rk3399_dmcfreq_target(struct device *dev, unsigned long *freq,
struct dev_pm_opp *opp; struct dev_pm_opp *opp;
unsigned long old_clk_rate = dmcfreq->rate; unsigned long old_clk_rate = dmcfreq->rate;
unsigned long target_volt, target_rate; unsigned long target_volt, target_rate;
struct arm_smccc_res res;
bool odt_enable = false;
int err; int err;
opp = devfreq_recommended_opp(dev, freq, flags); opp = devfreq_recommended_opp(dev, freq, flags);
...@@ -95,6 +103,19 @@ static int rk3399_dmcfreq_target(struct device *dev, unsigned long *freq, ...@@ -95,6 +103,19 @@ static int rk3399_dmcfreq_target(struct device *dev, unsigned long *freq,
mutex_lock(&dmcfreq->lock); mutex_lock(&dmcfreq->lock);
if (target_rate >= dmcfreq->odt_dis_freq)
odt_enable = true;
/*
* This makes a SMC call to the TF-A to set the DDR PD (power-down)
* timings and to enable or disable the ODT (on-die termination)
* resistors.
*/
arm_smccc_smc(ROCKCHIP_SIP_DRAM_FREQ, dmcfreq->odt_pd_arg0,
dmcfreq->odt_pd_arg1,
ROCKCHIP_SIP_CONFIG_DRAM_SET_ODT_PD,
odt_enable, 0, 0, 0, &res);
/* /*
* If frequency scaling from low to high, adjust voltage first. * If frequency scaling from low to high, adjust voltage first.
* If frequency scaling from high to low, adjust frequency first. * If frequency scaling from high to low, adjust frequency first.
...@@ -294,11 +315,13 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev) ...@@ -294,11 +315,13 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev)
{ {
struct arm_smccc_res res; struct arm_smccc_res res;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node, *node;
struct rk3399_dmcfreq *data; struct rk3399_dmcfreq *data;
int ret, index, size; int ret, index, size;
uint32_t *timing; uint32_t *timing;
struct dev_pm_opp *opp; struct dev_pm_opp *opp;
u32 ddr_type;
u32 val;
data = devm_kzalloc(dev, sizeof(struct rk3399_dmcfreq), GFP_KERNEL); data = devm_kzalloc(dev, sizeof(struct rk3399_dmcfreq), GFP_KERNEL);
if (!data) if (!data)
...@@ -322,7 +345,7 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev) ...@@ -322,7 +345,7 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev)
dev_err(dev, "Cannot get the clk dmc_clk\n"); dev_err(dev, "Cannot get the clk dmc_clk\n");
return PTR_ERR(data->dmc_clk); return PTR_ERR(data->dmc_clk);
}; }
data->edev = devfreq_event_get_edev_by_phandle(dev, 0); data->edev = devfreq_event_get_edev_by_phandle(dev, 0);
if (IS_ERR(data->edev)) if (IS_ERR(data->edev))
...@@ -354,10 +377,56 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev) ...@@ -354,10 +377,56 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev)
} }
} }
node = of_parse_phandle(np, "rockchip,pmu", 0);
if (node) {
data->regmap_pmu = syscon_node_to_regmap(node);
if (IS_ERR(data->regmap_pmu))
return PTR_ERR(data->regmap_pmu);
}
regmap_read(data->regmap_pmu, RK3399_PMUGRF_OS_REG2, &val);
ddr_type = (val >> RK3399_PMUGRF_DDRTYPE_SHIFT) &
RK3399_PMUGRF_DDRTYPE_MASK;
switch (ddr_type) {
case RK3399_PMUGRF_DDRTYPE_DDR3:
data->odt_dis_freq = data->timing.ddr3_odt_dis_freq;
break;
case RK3399_PMUGRF_DDRTYPE_LPDDR3:
data->odt_dis_freq = data->timing.lpddr3_odt_dis_freq;
break;
case RK3399_PMUGRF_DDRTYPE_LPDDR4:
data->odt_dis_freq = data->timing.lpddr4_odt_dis_freq;
break;
default:
return -EINVAL;
};
arm_smccc_smc(ROCKCHIP_SIP_DRAM_FREQ, 0, 0, arm_smccc_smc(ROCKCHIP_SIP_DRAM_FREQ, 0, 0,
ROCKCHIP_SIP_CONFIG_DRAM_INIT, ROCKCHIP_SIP_CONFIG_DRAM_INIT,
0, 0, 0, 0, &res); 0, 0, 0, 0, &res);
/*
* In TF-A there is a platform SIP call to set the PD (power-down)
* timings and to enable or disable the ODT (on-die termination).
* This call needs three arguments as follows:
*
* arg0:
* bit[0-7] : sr_idle
* bit[8-15] : sr_mc_gate_idle
* bit[16-31] : standby idle
* arg1:
* bit[0-11] : pd_idle
* bit[16-27] : srpd_lite_idle
* arg2:
* bit[0] : odt enable
*/
data->odt_pd_arg0 = (data->timing.sr_idle & 0xff) |
((data->timing.sr_mc_gate_idle & 0xff) << 8) |
((data->timing.standby_idle & 0xffff) << 16);
data->odt_pd_arg1 = (data->timing.pd_idle & 0xfff) |
((data->timing.srpd_lite_idle & 0xfff) << 16);
/* /*
* We add a devfreq driver to our parent since it has a device tree node * We add a devfreq driver to our parent since it has a device tree node
* with operating points. * with operating points.
......
...@@ -573,10 +573,7 @@ static int tegra_governor_get_target(struct devfreq *devfreq, ...@@ -573,10 +573,7 @@ static int tegra_governor_get_target(struct devfreq *devfreq,
static int tegra_governor_event_handler(struct devfreq *devfreq, static int tegra_governor_event_handler(struct devfreq *devfreq,
unsigned int event, void *data) unsigned int event, void *data)
{ {
struct tegra_devfreq *tegra; struct tegra_devfreq *tegra = dev_get_drvdata(devfreq->dev.parent);
int ret = 0;
tegra = dev_get_drvdata(devfreq->dev.parent);
switch (event) { switch (event) {
case DEVFREQ_GOV_START: case DEVFREQ_GOV_START:
...@@ -600,7 +597,7 @@ static int tegra_governor_event_handler(struct devfreq *devfreq, ...@@ -600,7 +597,7 @@ static int tegra_governor_event_handler(struct devfreq *devfreq,
break; break;
} }
return ret; return 0;
} }
static struct devfreq_governor tegra_devfreq_governor = { static struct devfreq_governor tegra_devfreq_governor = {
......
...@@ -175,6 +175,7 @@ struct generic_pm_domain_data { ...@@ -175,6 +175,7 @@ struct generic_pm_domain_data {
struct pm_domain_data base; struct pm_domain_data base;
struct gpd_timing_data td; struct gpd_timing_data td;
struct notifier_block nb; struct notifier_block nb;
int cpu;
unsigned int performance_state; unsigned int performance_state;
void *data; void *data;
}; };
......
/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Rockchip General Register Files definitions
*
* Copyright (c) 2018, Collabora Ltd.
* Author: Enric Balletbo i Serra <enric.balletbo@collabora.com>
*/
#ifndef __SOC_RK3399_GRF_H
#define __SOC_RK3399_GRF_H
/* PMU GRF Registers */
#define RK3399_PMUGRF_OS_REG2 0x308
#define RK3399_PMUGRF_DDRTYPE_SHIFT 13
#define RK3399_PMUGRF_DDRTYPE_MASK 7
#define RK3399_PMUGRF_DDRTYPE_DDR3 3
#define RK3399_PMUGRF_DDRTYPE_LPDDR2 5
#define RK3399_PMUGRF_DDRTYPE_LPDDR3 6
#define RK3399_PMUGRF_DDRTYPE_LPDDR4 7
#endif
...@@ -23,5 +23,6 @@ ...@@ -23,5 +23,6 @@
#define ROCKCHIP_SIP_CONFIG_DRAM_GET_RATE 0x05 #define ROCKCHIP_SIP_CONFIG_DRAM_GET_RATE 0x05
#define ROCKCHIP_SIP_CONFIG_DRAM_CLR_IRQ 0x06 #define ROCKCHIP_SIP_CONFIG_DRAM_CLR_IRQ 0x06
#define ROCKCHIP_SIP_CONFIG_DRAM_SET_PARAM 0x07 #define ROCKCHIP_SIP_CONFIG_DRAM_SET_PARAM 0x07
#define ROCKCHIP_SIP_CONFIG_DRAM_SET_ODT_PD 0x08
#endif #endif
/* SPDX-License-Identifier: GPL-2.0 */
#undef TRACE_SYSTEM
#define TRACE_SYSTEM devfreq
#if !defined(_TRACE_DEVFREQ_H) || defined(TRACE_HEADER_MULTI_READ)
#define _TRACE_DEVFREQ_H
#include <linux/devfreq.h>
#include <linux/tracepoint.h>
TRACE_EVENT(devfreq_monitor,
TP_PROTO(struct devfreq *devfreq),
TP_ARGS(devfreq),
TP_STRUCT__entry(
__field(unsigned long, freq)
__field(unsigned long, busy_time)
__field(unsigned long, total_time)
__field(unsigned int, polling_ms)
__string(dev_name, dev_name(&devfreq->dev))
),
TP_fast_assign(
__entry->freq = devfreq->previous_freq;
__entry->busy_time = devfreq->last_status.busy_time;
__entry->total_time = devfreq->last_status.total_time;
__entry->polling_ms = devfreq->profile->polling_ms;
__assign_str(dev_name, dev_name(&devfreq->dev));
),
TP_printk("dev_name=%s freq=%lu polling_ms=%u load=%lu",
__get_str(dev_name), __entry->freq, __entry->polling_ms,
__entry->total_time == 0 ? 0 :
(100 * __entry->busy_time) / __entry->total_time)
);
#endif /* _TRACE_DEVFREQ_H */
/* This part must be outside protection */
#include <trace/define_trace.h>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment