openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Third Round of Renesas ARM Based SoC Updates for v3.20 

* Special-case PM domains with memory-controllers
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUvaaiAAoJENfPZGlqN0++QaYP/2/YzRayAVH0+TRiP9x0e2Yv
 Y/aeJHs42t1IArmwHvZvnEZp4wTmR3MlIkDXbdAjQp5EOr9AkVbe5HtC2EWQuOz6
 QJSAXtbrOe0K1m/1P0Yoxd8b2I3aO90jS7ajcyp2fZHTdkjcCQhVoOz1UXoYjcDX
 w5Hih6hZ56MU8zZFyjscPBqS8jx+pdP5DFxqBfI9R1A3DBHDzwbMW35ohLOma0q/
 bAxq3xn1aK8JelfDuY7ZSqjKNujgbG9wfAwioY7tQvHf7vt+ETU/QYf2qUh9fFGS
 gT7oLeVFsG7SA5NmV35d8mKv9fUogeb55ospgOgspyrZhb5oHUX6Nd92nWtAfUr2
 OgB2FNaVm4Tu1XRkFRV9SQqJOOmJI3r575RkrT+zL5wPlqG2BNWiqEyTZ3gUWquJ
 0xX5HMV/t12W2ydnze0WjdYW1DIemrvP4XH1ypdxIRjRQ85LEcnWU6mVjAkgd23W
 9rbpNGRB/2IZJSnVZMzGj1VgX4wMmDfc4E9avz/dONFVtPcHnLyjSmXhaS0EVRze
 0Xy8+YZNjtpxSHJqL7yQI3APVga01ysFK41k/U64OJ56HqpGIXhZ/OyhubXKOHC9
 bIryBNyeAoelIgOe5RQB6bReyOqMzDOSqu9bKOP2oWl/7E+kaVAG/66HwrLHw1D7
 ZURLMt/7zNI5p/ihRhtm
 =WXMq
 -----END PGP SIGNATURE-----

Merge tag 'renesas-soc3-for-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc

Merge "Third Round of Renesas ARM Based SoC Updates for v3.20" from Simon
Horman:

* Special-case PM domains with memory-controllers

* tag 'renesas-soc3-for-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: R-Mobile: Special-case PM domains with memory-controllers
  ARM: shmobile: R-Mobile: Generalize adding/looking up special PM domains
  ARM: shmobile: R-Mobile: Consolidate rmobile_pd_suspend_*()

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2015-01-21 17:19:05 -08:00
parent a71596933c 1632ff162f
commit f50f7070e5
1 changed files with 101 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

163
arch/arm/mach-shmobile/pm-rmobile.c
View File

@ -200,11 +200,10 @@ void rmobile_add_devices_to_domains(struct pm_domain_device data[],
#else /* !CONFIG_ARCH_SHMOBILE_LEGACY */
static int rmobile_pd_suspend_cpu(void)
static int rmobile_pd_suspend_busy(void)
{
/*
* This domain contains the CPU core and therefore it should
* only be turned off if the CPU is not in use.
* This domain should not be turned off.
*/
return -EBUSY;
}
@ -218,83 +217,95 @@ static int rmobile_pd_suspend_console(void)
return console_suspend_enabled ? 0 : -EBUSY;
}
static int rmobile_pd_suspend_debug(void)
enum pd_types {
PD_NORMAL,
PD_CPU,
PD_CONSOLE,
PD_DEBUG,
PD_MEMCTL,
};
#define MAX_NUM_SPECIAL_PDS 16
static struct special_pd {
struct device_node *pd;
enum pd_types type;
} special_pds[MAX_NUM_SPECIAL_PDS] __initdata;
static unsigned int num_special_pds __initdata;
static const struct of_device_id special_ids[] __initconst = {
{ .compatible = "arm,coresight-etm3x", .data = (void *)PD_DEBUG },
{ .compatible = "renesas,dbsc-r8a73a4", .data = (void *)PD_MEMCTL, },
{ .compatible = "renesas,dbsc3-r8a7740", .data = (void *)PD_MEMCTL, },
{ .compatible = "renesas,sbsc-sh73a0", .data = (void *)PD_MEMCTL, },
{ /* sentinel */ },
};
static void __init add_special_pd(struct device_node *np, enum pd_types type)
{
/*
* This domain contains the Coresight-ETM hardware block and
* therefore it should only be turned off if the debug module is
* not in use.
*/
return -EBUSY;
unsigned int i;
struct device_node *pd;
pd = of_parse_phandle(np, "power-domains", 0);
if (!pd)
return;
for (i = 0; i < num_special_pds; i++)
if (pd == special_pds[i].pd && type == special_pds[i].type) {
of_node_put(pd);
return;
}
if (num_special_pds == ARRAY_SIZE(special_pds)) {
pr_warn("Too many special PM domains\n");
of_node_put(pd);
return;
}
pr_debug("Special PM domain %s type %d for %s\n", pd->name, type,
np->full_name);
special_pds[num_special_pds].pd = pd;
special_pds[num_special_pds].type = type;
num_special_pds++;
}
#define MAX_NUM_CPU_PDS 8
static unsigned int num_cpu_pds __initdata;
static struct device_node *cpu_pds[MAX_NUM_CPU_PDS] __initdata;
static struct device_node *console_pd __initdata;
static struct device_node *debug_pd __initdata;
static void __init get_special_pds(void)
{
struct device_node *np, *pd;
unsigned int i;
struct device_node *np;
const struct of_device_id *id;
/* PM domains containing CPUs */
for_each_node_by_type(np, "cpu") {
pd = of_parse_phandle(np, "power-domains", 0);
if (!pd)
continue;
for (i = 0; i < num_cpu_pds; i++)
if (pd == cpu_pds[i])
break;
if (i < num_cpu_pds) {
of_node_put(pd);
continue;
}
if (num_cpu_pds == MAX_NUM_CPU_PDS) {
pr_warn("Too many CPU PM domains\n");
of_node_put(pd);
continue;
}
cpu_pds[num_cpu_pds++] = pd;
}
for_each_node_by_type(np, "cpu")
add_special_pd(np, PD_CPU);
/* PM domain containing console */
if (of_stdout)
console_pd = of_parse_phandle(of_stdout, "power-domains", 0);
add_special_pd(of_stdout, PD_CONSOLE);
/* PM domain containing Coresight-ETM */
np = of_find_compatible_node(NULL, NULL, "arm,coresight-etm3x");
if (np) {
debug_pd = of_parse_phandle(np, "power-domains", 0);
of_node_put(np);
}
/* PM domains containing other special devices */
for_each_matching_node_and_match(np, special_ids, &id)
add_special_pd(np, (enum pd_types)id->data);
}
static void __init put_special_pds(void)
{
unsigned int i;
for (i = 0; i < num_cpu_pds; i++)
of_node_put(cpu_pds[i]);
of_node_put(console_pd);
of_node_put(debug_pd);
for (i = 0; i < num_special_pds; i++)
of_node_put(special_pds[i].pd);
}
static bool __init pd_contains_cpu(const struct device_node *pd)
static enum pd_types __init pd_type(const struct device_node *pd)
{
unsigned int i;
for (i = 0; i < num_cpu_pds; i++)
if (pd == cpu_pds[i])
return true;
for (i = 0; i < num_special_pds; i++)
if (pd == special_pds[i].pd)
return special_pds[i].type;
return false;
return PD_NORMAL;
}
static void __init rmobile_setup_pm_domain(struct device_node *np,
@ -302,18 +313,46 @@ static void __init rmobile_setup_pm_domain(struct device_node *np,
{
const char *name = pd->genpd.name;
if (pd_contains_cpu(np)) {
switch (pd_type(np)) {
case PD_CPU:
/*
* This domain contains the CPU core and therefore it should
* only be turned off if the CPU is not in use.
*/
pr_debug("PM domain %s contains CPU\n", name);
pd->gov = &pm_domain_always_on_gov;
pd->suspend = rmobile_pd_suspend_cpu;
} else if (np == console_pd) {
pd->suspend = rmobile_pd_suspend_busy;
break;
case PD_CONSOLE:
pr_debug("PM domain %s contains serial console\n", name);
pd->gov = &pm_domain_always_on_gov;
pd->suspend = rmobile_pd_suspend_console;
} else if (np == debug_pd) {
break;
case PD_DEBUG:
/*
* This domain contains the Coresight-ETM hardware block and
* therefore it should only be turned off if the debug module
* is not in use.
*/
pr_debug("PM domain %s contains Coresight-ETM\n", name);
pd->gov = &pm_domain_always_on_gov;
pd->suspend = rmobile_pd_suspend_debug;
pd->suspend = rmobile_pd_suspend_busy;
break;
case PD_MEMCTL:
/*
* This domain contains a memory-controller and therefore it
* should only be turned off if memory is not in use.
*/
pr_debug("PM domain %s contains MEMCTL\n", name);
pd->gov = &pm_domain_always_on_gov;
pd->suspend = rmobile_pd_suspend_busy;
break;
case PD_NORMAL:
break;
}
rmobile_init_pm_domain(pd);