Merge tag 'renesas-soc2-for-v3.20' of... (a7159693) · Commits · 戴 / test

arch/arm/mach-shmobile/Kconfig

+2 −1

Original line number	Diff line number	Diff line
		@@ -7,6 +7,7 @@ config PM_RCAR

		config PM_RMOBILE
		bool
		select PM_GENERIC_DOMAINS

		config ARCH_RCAR_GEN1
		bool
		@@ -23,7 +24,7 @@ config ARCH_RCAR_GEN2

		config ARCH_RMOBILE
		bool
		select PM_RMOBILE if PM && !ARCH_SHMOBILE_MULTI
		select PM_RMOBILE if PM
		select SYS_SUPPORTS_SH_CMT
		select SYS_SUPPORTS_SH_TMU

arch/arm/mach-shmobile/pm-r8a7740.c

+14 −0

Original line number	Diff line number	Diff line
		@@ -9,10 +9,14 @@
		* for more details.
		*/
		#include <linux/console.h>
		#include <linux/io.h>
		#include <linux/suspend.h>

		#include "common.h"
		#include "pm-rmobile.h"

		#define SYSC_BASE IOMEM(0xe6180000)

		#if defined(CONFIG_PM) && !defined(CONFIG_ARCH_MULTIPLATFORM)
		static int r8a7740_pd_a3sm_suspend(void)
		{
		@@ -45,41 +49,51 @@ static int r8a7740_pd_d4_suspend(void)
		static struct rmobile_pm_domain r8a7740_pm_domains[] = {
		{
		.genpd.name = "A4LC",
		.base = SYSC_BASE,
		.bit_shift = 1,
		}, {
		.genpd.name = "A4MP",
		.base = SYSC_BASE,
		.bit_shift = 2,
		}, {
		.genpd.name = "D4",
		.base = SYSC_BASE,
		.bit_shift = 3,
		.gov = &pm_domain_always_on_gov,
		.suspend = r8a7740_pd_d4_suspend,
		}, {
		.genpd.name = "A4R",
		.base = SYSC_BASE,
		.bit_shift = 5,
		}, {
		.genpd.name = "A3RV",
		.base = SYSC_BASE,
		.bit_shift = 6,
		}, {
		.genpd.name = "A4S",
		.base = SYSC_BASE,
		.bit_shift = 10,
		.no_debug = true,
		}, {
		.genpd.name = "A3SP",
		.base = SYSC_BASE,
		.bit_shift = 11,
		.gov = &pm_domain_always_on_gov,
		.no_debug = true,
		.suspend = r8a7740_pd_a3sp_suspend,
		}, {
		.genpd.name = "A3SM",
		.base = SYSC_BASE,
		.bit_shift = 12,
		.gov = &pm_domain_always_on_gov,
		.suspend = r8a7740_pd_a3sm_suspend,
		}, {
		.genpd.name = "A3SG",
		.base = SYSC_BASE,
		.bit_shift = 13,
		}, {
		.genpd.name = "A4SU",
		.base = SYSC_BASE,
		.bit_shift = 20,
		},
		};

arch/arm/mach-shmobile/pm-rmobile.c

+260 −15

Original line number	Diff line number	Diff line
		@@ -3,6 +3,7 @@
		*
		* Copyright (C) 2012 Renesas Solutions Corp.
		* Copyright (C) 2012 Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
		* Copyright (C) 2014 Glider bvba
		*
		* based on pm-sh7372.c
		* Copyright (C) 2011 Magnus Damm
		@@ -13,16 +14,22 @@
		*/
		#include <linux/console.h>
		#include <linux/delay.h>
		#include <linux/of.h>
		#include <linux/of_address.h>
		#include <linux/of_platform.h>
		#include <linux/platform_device.h>
		#include <linux/pm.h>
		#include <linux/pm_clock.h>
		#include <linux/slab.h>

		#include <asm/io.h>

		#include "pm-rmobile.h"

		/* SYSC */
		#define SPDCR IOMEM(0xe6180008)
		#define SWUCR IOMEM(0xe6180014)
		#define PSTR IOMEM(0xe6180080)
		#define SPDCR 0x08 /* SYS Power Down Control Register */
		#define SWUCR 0x14 /* SYS Wakeup Control Register */
		#define PSTR 0x80 /* Power Status Register */

		#define PSTR_RETRIES 100
		#define PSTR_DELAY_US 10
		@@ -30,8 +37,12 @@
		static int rmobile_pd_power_down(struct generic_pm_domain *genpd)
		{
		struct rmobile_pm_domain *rmobile_pd = to_rmobile_pd(genpd);
		unsigned int mask = 1 << rmobile_pd->bit_shift;
		unsigned int mask;

		if (rmobile_pd->bit_shift == ~0)
		return -EBUSY;

		mask = 1 << rmobile_pd->bit_shift;
		if (rmobile_pd->suspend) {
		int ret = rmobile_pd->suspend();

		@@ -39,12 +50,12 @@ static int rmobile_pd_power_down(struct generic_pm_domain *genpd)
		return ret;
		}

		if (__raw_readl(PSTR) & mask) {
		if (__raw_readl(rmobile_pd->base + PSTR) & mask) {
		unsigned int retry_count;
		__raw_writel(mask, SPDCR);
		__raw_writel(mask, rmobile_pd->base + SPDCR);

		for (retry_count = PSTR_RETRIES; retry_count; retry_count--) {
		if (!(__raw_readl(SPDCR) & mask))
		if (!(__raw_readl(rmobile_pd->base + SPDCR) & mask))
		break;
		cpu_relax();
		}
		@@ -52,7 +63,8 @@ static int rmobile_pd_power_down(struct generic_pm_domain *genpd)

		if (!rmobile_pd->no_debug)
		pr_debug("%s: Power off, 0x%08x -> PSTR = 0x%08x\n",
		genpd->name, mask, __raw_readl(PSTR));
		genpd->name, mask,
		__raw_readl(rmobile_pd->base + PSTR));

		return 0;
		}
		@@ -60,17 +72,21 @@ static int rmobile_pd_power_down(struct generic_pm_domain *genpd)
		static int __rmobile_pd_power_up(struct rmobile_pm_domain *rmobile_pd,
		bool do_resume)
		{
		unsigned int mask = 1 << rmobile_pd->bit_shift;
		unsigned int mask;
		unsigned int retry_count;
		int ret = 0;

		if (__raw_readl(PSTR) & mask)
		if (rmobile_pd->bit_shift == ~0)
		return 0;

		mask = 1 << rmobile_pd->bit_shift;
		if (__raw_readl(rmobile_pd->base + PSTR) & mask)
		goto out;

		__raw_writel(mask, SWUCR);
		__raw_writel(mask, rmobile_pd->base + SWUCR);

		for (retry_count = 2 * PSTR_RETRIES; retry_count; retry_count--) {
		if (!(__raw_readl(SWUCR) & mask))
		if (!(__raw_readl(rmobile_pd->base + SWUCR) & mask))
		break;
		if (retry_count > PSTR_RETRIES)
		udelay(PSTR_DELAY_US);
		@@ -82,7 +98,8 @@ static int __rmobile_pd_power_up(struct rmobile_pm_domain *rmobile_pd,

		if (!rmobile_pd->no_debug)
		pr_debug("%s: Power on, 0x%08x -> PSTR = 0x%08x\n",
		rmobile_pd->genpd.name, mask, __raw_readl(PSTR));
		rmobile_pd->genpd.name, mask,
		__raw_readl(rmobile_pd->base + PSTR));

		out:
		if (ret == 0 && rmobile_pd->resume && do_resume)
		@@ -101,6 +118,36 @@ static bool rmobile_pd_active_wakeup(struct device *dev)
		return true;
		}

		static int rmobile_pd_attach_dev(struct generic_pm_domain *domain,
		struct device *dev)
		{
		int error;

		error = pm_clk_create(dev);
		if (error) {
		dev_err(dev, "pm_clk_create failed %d\n", error);
		return error;
		}

		error = pm_clk_add(dev, NULL);
		if (error) {
		dev_err(dev, "pm_clk_add failed %d\n", error);
		goto fail;
		}

		return 0;

		fail:
		pm_clk_destroy(dev);
		return error;
		}

		static void rmobile_pd_detach_dev(struct generic_pm_domain *domain,
		struct device *dev)
		{
		pm_clk_destroy(dev);
		}

		static void rmobile_init_pm_domain(struct rmobile_pm_domain *rmobile_pd)
		{
		struct generic_pm_domain *genpd = &rmobile_pd->genpd;
		@@ -111,9 +158,13 @@ static void rmobile_init_pm_domain(struct rmobile_pm_domain *rmobile_pd)
		genpd->dev_ops.active_wakeup = rmobile_pd_active_wakeup;
		genpd->power_off = rmobile_pd_power_down;
		genpd->power_on = rmobile_pd_power_up;
		genpd->attach_dev = rmobile_pd_attach_dev;
		genpd->detach_dev = rmobile_pd_detach_dev;
		__rmobile_pd_power_up(rmobile_pd, false);
		}

		#ifdef CONFIG_ARCH_SHMOBILE_LEGACY

		void rmobile_init_domains(struct rmobile_pm_domain domains[], int num)
		{
		int j;
		@@ -129,8 +180,6 @@ void rmobile_add_device_to_domain_td(const char *domain_name,
		struct device *dev = &pdev->dev;

		__pm_genpd_name_add_device(domain_name, dev, td);
		if (pm_clk_no_clocks(dev))
		pm_clk_add(dev, NULL);
		}

		void rmobile_add_devices_to_domains(struct pm_domain_device data[],
		@@ -148,3 +197,199 @@ void rmobile_add_devices_to_domains(struct pm_domain_device data[],
		rmobile_add_device_to_domain_td(data[j].domain_name,
		data[j].pdev, &latencies);
		}

		#else /* !CONFIG_ARCH_SHMOBILE_LEGACY */

		static int rmobile_pd_suspend_cpu(void)
		{
		/*
		* This domain contains the CPU core and therefore it should
		* only be turned off if the CPU is not in use.
		*/
		return -EBUSY;
		}

		static int rmobile_pd_suspend_console(void)
		{
		/*
		* Serial consoles make use of SCIF hardware located in this domain,
		* hence keep the power domain on if "no_console_suspend" is set.
		*/
		return console_suspend_enabled ? 0 : -EBUSY;
		}

		static int rmobile_pd_suspend_debug(void)
		{
		/*
		* 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;
		}

		#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;

		/* 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;
		}

		/* PM domain containing console */
		if (of_stdout)
		console_pd = of_parse_phandle(of_stdout, "power-domains", 0);

		/* 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);
		}
		}

		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);
		}

		static bool __init pd_contains_cpu(const struct device_node *pd)
		{
		unsigned int i;

		for (i = 0; i < num_cpu_pds; i++)
		if (pd == cpu_pds[i])
		return true;

		return false;
		}

		static void __init rmobile_setup_pm_domain(struct device_node *np,
		struct rmobile_pm_domain *pd)
		{
		const char *name = pd->genpd.name;

		if (pd_contains_cpu(np)) {
		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) {
		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) {
		pr_debug("PM domain %s contains Coresight-ETM\n", name);
		pd->gov = &pm_domain_always_on_gov;
		pd->suspend = rmobile_pd_suspend_debug;
		}

		rmobile_init_pm_domain(pd);
		}

		static int __init rmobile_add_pm_domains(void __iomem *base,
		struct device_node *parent,
		struct generic_pm_domain *genpd_parent)
		{
		struct device_node *np;

		for_each_child_of_node(parent, np) {
		struct rmobile_pm_domain *pd;
		u32 idx = ~0;

		if (of_property_read_u32(np, "reg", &idx)) {
		/* always-on domain */
		}

		pd = kzalloc(sizeof(*pd), GFP_KERNEL);
		if (!pd)
		return -ENOMEM;

		pd->genpd.name = np->name;
		pd->base = base;
		pd->bit_shift = idx;

		rmobile_setup_pm_domain(np, pd);
		if (genpd_parent)
		pm_genpd_add_subdomain(genpd_parent, &pd->genpd);
		of_genpd_add_provider_simple(np, &pd->genpd);

		rmobile_add_pm_domains(base, np, &pd->genpd);
		}
		return 0;
		}

		static int __init rmobile_init_pm_domains(void)
		{
		struct device_node np, pmd;
		bool scanned = false;
		void __iomem *base;
		int ret = 0;

		for_each_compatible_node(np, NULL, "renesas,sysc-rmobile") {
		base = of_iomap(np, 0);
		if (!base) {
		pr_warn("%s cannot map reg 0\n", np->full_name);
		continue;
		}

		pmd = of_get_child_by_name(np, "pm-domains");
		if (!pmd) {
		pr_warn("%s lacks pm-domains node\n", np->full_name);
		continue;
		}

		if (!scanned) {
		/* Find PM domains containing special blocks */
		get_special_pds();
		scanned = true;
		}

		ret = rmobile_add_pm_domains(base, pmd, NULL);
		of_node_put(pmd);
		if (ret) {
		of_node_put(np);
		break;
		}
		}

		put_special_pds();

		return ret;
		}

		core_initcall(rmobile_init_pm_domains);

		#endif /* !CONFIG_ARCH_SHMOBILE_LEGACY */

arch/arm/mach-shmobile/pm-rmobile.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ struct rmobile_pm_domain {
		struct dev_power_governor *gov;
		int (*suspend)(void);
		void (*resume)(void);
		void __iomem *base;
		unsigned int bit_shift;
		bool no_debug;
		};
		@@ -36,7 +37,7 @@ struct pm_domain_device {
		struct platform_device *pdev;
		};

		#ifdef CONFIG_PM_RMOBILE
		#if defined(CONFIG_PM_RMOBILE) && defined(CONFIG_ARCH_SHMOBILE_LEGACY)
		extern void rmobile_init_domains(struct rmobile_pm_domain domains[], int num);
		extern void rmobile_add_device_to_domain_td(const char *domain_name,
		struct platform_device *pdev,

arch/arm/mach-shmobile/pm-sh7372.c

+11 −0

Original line number	Diff line number	Diff line
		@@ -45,6 +45,8 @@
		#define PLLC01STPCR IOMEM(0xe61500c8)

		/* SYSC */
		#define SYSC_BASE IOMEM(0xe6180000)

		#define SBAR IOMEM(0xe6180020)
		#define WUPRMSK IOMEM(0xe6180028)
		#define WUPSMSK IOMEM(0xe618002c)
		@@ -118,24 +120,28 @@ static struct rmobile_pm_domain sh7372_pm_domains[] = {
		.genpd.name = "A4LC",
		.genpd.power_on_latency_ns = PM_DOMAIN_ON_OFF_LATENCY_NS,
		.genpd.power_off_latency_ns = PM_DOMAIN_ON_OFF_LATENCY_NS,
		.base = SYSC_BASE,
		.bit_shift = 1,
		},
		{
		.genpd.name = "A4MP",
		.genpd.power_on_latency_ns = PM_DOMAIN_ON_OFF_LATENCY_NS,
		.genpd.power_off_latency_ns = PM_DOMAIN_ON_OFF_LATENCY_NS,
		.base = SYSC_BASE,
		.bit_shift = 2,
		},
		{
		.genpd.name = "D4",
		.genpd.power_on_latency_ns = PM_DOMAIN_ON_OFF_LATENCY_NS,
		.genpd.power_off_latency_ns = PM_DOMAIN_ON_OFF_LATENCY_NS,
		.base = SYSC_BASE,
		.bit_shift = 3,
		},
		{
		.genpd.name = "A4R",
		.genpd.power_on_latency_ns = PM_DOMAIN_ON_OFF_LATENCY_NS,
		.genpd.power_off_latency_ns = PM_DOMAIN_ON_OFF_LATENCY_NS,
		.base = SYSC_BASE,
		.bit_shift = 5,
		.suspend = sh7372_a4r_pd_suspend,
		.resume = sh7372_intcs_resume,
		@@ -144,18 +150,21 @@ static struct rmobile_pm_domain sh7372_pm_domains[] = {
		.genpd.name = "A3RV",
		.genpd.power_on_latency_ns = PM_DOMAIN_ON_OFF_LATENCY_NS,
		.genpd.power_off_latency_ns = PM_DOMAIN_ON_OFF_LATENCY_NS,
		.base = SYSC_BASE,
		.bit_shift = 6,
		},
		{
		.genpd.name = "A3RI",
		.genpd.power_on_latency_ns = PM_DOMAIN_ON_OFF_LATENCY_NS,
		.genpd.power_off_latency_ns = PM_DOMAIN_ON_OFF_LATENCY_NS,
		.base = SYSC_BASE,
		.bit_shift = 8,
		},
		{
		.genpd.name = "A4S",
		.genpd.power_on_latency_ns = PM_DOMAIN_ON_OFF_LATENCY_NS,
		.genpd.power_off_latency_ns = PM_DOMAIN_ON_OFF_LATENCY_NS,
		.base = SYSC_BASE,
		.bit_shift = 10,
		.gov = &pm_domain_always_on_gov,
		.no_debug = true,
		@@ -166,6 +175,7 @@ static struct rmobile_pm_domain sh7372_pm_domains[] = {
		.genpd.name = "A3SP",
		.genpd.power_on_latency_ns = PM_DOMAIN_ON_OFF_LATENCY_NS,
		.genpd.power_off_latency_ns = PM_DOMAIN_ON_OFF_LATENCY_NS,
		.base = SYSC_BASE,
		.bit_shift = 11,
		.gov = &pm_domain_always_on_gov,
		.no_debug = true,
		@@ -175,6 +185,7 @@ static struct rmobile_pm_domain sh7372_pm_domains[] = {
		.genpd.name = "A3SG",
		.genpd.power_on_latency_ns = PM_DOMAIN_ON_OFF_LATENCY_NS,
		.genpd.power_off_latency_ns = PM_DOMAIN_ON_OFF_LATENCY_NS,
		.base = SYSC_BASE,
		.bit_shift = 13,
		},
		};

Admin message