Commit 48cb1258 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'for_3.1/pm-misc' of... 

Merge branch 'for_3.1/pm-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into devel-cleanup

Conflicts:
	arch/arm/mach-omap2/pm-debug.c
	arch/arm/mach-omap2/pm.h
parents 332acd9e ec3cdb5b

arch/arm/mach-omap1/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -4,14 +4,14 @@ 


# Common support

obj-y := io.o id.o sram.o time.o irq.o mux.o flash.o serial.o devices.o dma.o

obj-y += clock.o clock_data.o opp_data.o reset.o

obj-y += clock.o clock_data.o opp_data.o reset.o pm_bus.o



obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o



obj-$(CONFIG_OMAP_32K_TIMER)	+= timer32k.o



# Power Management

obj-$(CONFIG_PM) += pm.o sleep.o pm_bus.o

obj-$(CONFIG_PM) += pm.o sleep.o



# DSP

obj-$(CONFIG_OMAP_MBOX_FWK)	+= mailbox_mach.o

arch/arm/mach-omap1/pm_bus.c

+6 −2
Original line number Diff line number Diff line
@@ -56,9 +56,13 @@ static struct dev_power_domain default_power_domain = { 
		USE_PLATFORM_PM_SLEEP_OPS

	},

};

#define OMAP1_PWR_DOMAIN (&default_power_domain)

#else

#define OMAP1_PWR_DOMAIN NULL

#endif /* CONFIG_PM_RUNTIME */



static struct pm_clk_notifier_block platform_bus_notifier = {

	.pwr_domain = &default_power_domain,

	.pwr_domain = OMAP1_PWR_DOMAIN,

	.con_ids = { "ick", "fck", NULL, },

};
@@ -72,4 +76,4 @@ static int __init omap1_pm_runtime_init(void) 
	return 0;

}

core_initcall(omap1_pm_runtime_init);

#endif /* CONFIG_PM_RUNTIME */

arch/arm/mach-omap2/board-omap3pandora.c

+2 −1
Original line number Diff line number Diff line
@@ -84,7 +84,8 @@ static struct mtd_partition omap3pandora_nand_partitions[] = { 


static struct omap_nand_platform_data pandora_nand_data = {

	.cs		= 0,

	.devsize	= 1,	/* '0' for 8-bit, '1' for 16-bit device */

	.devsize	= NAND_BUSWIDTH_16,

	.xfer_type	= NAND_OMAP_PREFETCH_DMA,

	.parts		= omap3pandora_nand_partitions,

	.nr_parts	= ARRAY_SIZE(omap3pandora_nand_partitions),

};

arch/arm/mach-omap2/pm-debug.c

+2 −344
Original line number Diff line number Diff line
@@ -31,305 +31,28 @@ 
#include <plat/board.h>

#include "powerdomain.h"

#include "clockdomain.h"

#include <plat/dmtimer.h>

#include <plat/omap-pm.h>



#include "cm2xxx_3xxx.h"

#include "prm2xxx_3xxx.h"

#include "pm.h"



int omap2_pm_debug;

u32 enable_off_mode;

u32 sleep_while_idle;



#define DUMP_PRM_MOD_REG(mod, reg)    \

	regs[reg_count].name = #mod "." #reg; \

	regs[reg_count++].val = omap2_prm_read_mod_reg(mod, reg)

#define DUMP_CM_MOD_REG(mod, reg)     \

	regs[reg_count].name = #mod "." #reg; \

	regs[reg_count++].val = omap2_cm_read_mod_reg(mod, reg)

#define DUMP_PRM_REG(reg) \

	regs[reg_count].name = #reg; \

	regs[reg_count++].val = __raw_readl(reg)

#define DUMP_CM_REG(reg) \

	regs[reg_count].name = #reg; \

	regs[reg_count++].val = __raw_readl(reg)

#define DUMP_INTC_REG(reg, off) \

	regs[reg_count].name = #reg; \

	regs[reg_count++].val = \

			 __raw_readl(OMAP2_L4_IO_ADDRESS(0x480fe000 + (off)))



void omap2_pm_dump(int mode, int resume, unsigned int us)

{

	struct reg {

		const char *name;

		u32 val;

	} regs[32];

	int reg_count = 0, i;

	const char *s1 = NULL, *s2 = NULL;



	if (!resume) {

#if 0

		/* MPU */

		DUMP_PRM_MOD_REG(OCP_MOD, OMAP2_PRM_IRQENABLE_MPU_OFFSET);

		DUMP_CM_MOD_REG(MPU_MOD, OMAP2_CM_CLKSTCTRL);

		DUMP_PRM_MOD_REG(MPU_MOD, OMAP2_PM_PWSTCTRL);

		DUMP_PRM_MOD_REG(MPU_MOD, OMAP2_PM_PWSTST);

		DUMP_PRM_MOD_REG(MPU_MOD, PM_WKDEP);

#endif

#if 0

		/* INTC */

		DUMP_INTC_REG(INTC_MIR0, 0x0084);

		DUMP_INTC_REG(INTC_MIR1, 0x00a4);

		DUMP_INTC_REG(INTC_MIR2, 0x00c4);

#endif

#if 0

		DUMP_CM_MOD_REG(CORE_MOD, CM_FCLKEN1);

		if (cpu_is_omap24xx()) {

			DUMP_CM_MOD_REG(CORE_MOD, OMAP24XX_CM_FCLKEN2);

			DUMP_PRM_MOD_REG(OMAP24XX_GR_MOD,

					OMAP2_PRCM_CLKEMUL_CTRL_OFFSET);

			DUMP_PRM_MOD_REG(OMAP24XX_GR_MOD,

					OMAP2_PRCM_CLKSRC_CTRL_OFFSET);

		}

		DUMP_CM_MOD_REG(WKUP_MOD, CM_FCLKEN);

		DUMP_CM_MOD_REG(CORE_MOD, CM_ICLKEN1);

		DUMP_CM_MOD_REG(CORE_MOD, CM_ICLKEN2);

		DUMP_CM_MOD_REG(WKUP_MOD, CM_ICLKEN);

		DUMP_CM_MOD_REG(PLL_MOD, CM_CLKEN);

		DUMP_CM_MOD_REG(PLL_MOD, CM_AUTOIDLE);

		DUMP_PRM_MOD_REG(CORE_MOD, OMAP2_PM_PWSTST);

#endif

#if 0

		/* DSP */

		if (cpu_is_omap24xx()) {

			DUMP_CM_MOD_REG(OMAP24XX_DSP_MOD, CM_FCLKEN);

			DUMP_CM_MOD_REG(OMAP24XX_DSP_MOD, CM_ICLKEN);

			DUMP_CM_MOD_REG(OMAP24XX_DSP_MOD, CM_IDLEST);

			DUMP_CM_MOD_REG(OMAP24XX_DSP_MOD, CM_AUTOIDLE);

			DUMP_CM_MOD_REG(OMAP24XX_DSP_MOD, CM_CLKSEL);

			DUMP_CM_MOD_REG(OMAP24XX_DSP_MOD, OMAP2_CM_CLKSTCTRL);

			DUMP_PRM_MOD_REG(OMAP24XX_DSP_MOD, OMAP2_RM_RSTCTRL);

			DUMP_PRM_MOD_REG(OMAP24XX_DSP_MOD, OMAP2_RM_RSTST);

			DUMP_PRM_MOD_REG(OMAP24XX_DSP_MOD, OMAP2_PM_PWSTCTRL);

			DUMP_PRM_MOD_REG(OMAP24XX_DSP_MOD, OMAP2_PM_PWSTST);

		}

#endif

	} else {

		DUMP_PRM_MOD_REG(CORE_MOD, PM_WKST1);

		if (cpu_is_omap24xx())

			DUMP_PRM_MOD_REG(CORE_MOD, OMAP24XX_PM_WKST2);

		DUMP_PRM_MOD_REG(WKUP_MOD, PM_WKST);

		DUMP_PRM_MOD_REG(OCP_MOD, OMAP2_PRCM_IRQSTATUS_MPU_OFFSET);

#if 1

		DUMP_INTC_REG(INTC_PENDING_IRQ0, 0x0098);

		DUMP_INTC_REG(INTC_PENDING_IRQ1, 0x00b8);

		DUMP_INTC_REG(INTC_PENDING_IRQ2, 0x00d8);

#endif

	}



	switch (mode) {

	case 0:

		s1 = "full";

		s2 = "retention";

		break;

	case 1:

		s1 = "MPU";

		s2 = "retention";

		break;

	case 2:

		s1 = "MPU";

		s2 = "idle";

		break;

	}



	if (!resume)

#ifdef CONFIG_NO_HZ

		printk(KERN_INFO

		       "--- Going to %s %s (next timer after %u ms)\n", s1, s2,

		       jiffies_to_msecs(get_next_timer_interrupt(jiffies) -

					jiffies));

#else

		printk(KERN_INFO "--- Going to %s %s\n", s1, s2);

#endif

	else

		printk(KERN_INFO "--- Woke up (slept for %u.%03u ms)\n",

			us / 1000, us % 1000);



	for (i = 0; i < reg_count; i++)

		printk(KERN_INFO "%-20s: 0x%08x\n", regs[i].name, regs[i].val);

}



#ifdef CONFIG_DEBUG_FS

#include <linux/debugfs.h>

#include <linux/seq_file.h>



static void pm_dbg_regset_store(u32 *ptr);



static struct dentry *pm_dbg_dir;



static int pm_dbg_init_done;



static int __init pm_dbg_init(void);

static int pm_dbg_init(void);



enum {

	DEBUG_FILE_COUNTERS = 0,

	DEBUG_FILE_TIMERS,

};



struct pm_module_def {

	char name[8]; /* Name of the module */

	short type; /* CM or PRM */

	unsigned short offset;

	int low; /* First register address on this module */

	int high; /* Last register address on this module */

};



#define MOD_CM 0

#define MOD_PRM 1



static const struct pm_module_def *pm_dbg_reg_modules;

static const struct pm_module_def omap3_pm_reg_modules[] = {

	{ "IVA2", MOD_CM, OMAP3430_IVA2_MOD, 0, 0x4c },

	{ "OCP", MOD_CM, OCP_MOD, 0, 0x10 },

	{ "MPU", MOD_CM, MPU_MOD, 4, 0x4c },

	{ "CORE", MOD_CM, CORE_MOD, 0, 0x4c },

	{ "SGX", MOD_CM, OMAP3430ES2_SGX_MOD, 0, 0x4c },

	{ "WKUP", MOD_CM, WKUP_MOD, 0, 0x40 },

	{ "CCR", MOD_CM, PLL_MOD, 0, 0x70 },

	{ "DSS", MOD_CM, OMAP3430_DSS_MOD, 0, 0x4c },

	{ "CAM", MOD_CM, OMAP3430_CAM_MOD, 0, 0x4c },

	{ "PER", MOD_CM, OMAP3430_PER_MOD, 0, 0x4c },

	{ "EMU", MOD_CM, OMAP3430_EMU_MOD, 0x40, 0x54 },

	{ "NEON", MOD_CM, OMAP3430_NEON_MOD, 0x20, 0x48 },

	{ "USB", MOD_CM, OMAP3430ES2_USBHOST_MOD, 0, 0x4c },



	{ "IVA2", MOD_PRM, OMAP3430_IVA2_MOD, 0x50, 0xfc },

	{ "OCP", MOD_PRM, OCP_MOD, 4, 0x1c },

	{ "MPU", MOD_PRM, MPU_MOD, 0x58, 0xe8 },

	{ "CORE", MOD_PRM, CORE_MOD, 0x58, 0xf8 },

	{ "SGX", MOD_PRM, OMAP3430ES2_SGX_MOD, 0x58, 0xe8 },

	{ "WKUP", MOD_PRM, WKUP_MOD, 0xa0, 0xb0 },

	{ "CCR", MOD_PRM, PLL_MOD, 0x40, 0x70 },

	{ "DSS", MOD_PRM, OMAP3430_DSS_MOD, 0x58, 0xe8 },

	{ "CAM", MOD_PRM, OMAP3430_CAM_MOD, 0x58, 0xe8 },

	{ "PER", MOD_PRM, OMAP3430_PER_MOD, 0x58, 0xe8 },

	{ "EMU", MOD_PRM, OMAP3430_EMU_MOD, 0x58, 0xe4 },

	{ "GLBL", MOD_PRM, OMAP3430_GR_MOD, 0x20, 0xe4 },

	{ "NEON", MOD_PRM, OMAP3430_NEON_MOD, 0x58, 0xe8 },

	{ "USB", MOD_PRM, OMAP3430ES2_USBHOST_MOD, 0x58, 0xe8 },

	{ "", 0, 0, 0, 0 },

};



#define PM_DBG_MAX_REG_SETS 4



static void *pm_dbg_reg_set[PM_DBG_MAX_REG_SETS];



static int pm_dbg_get_regset_size(void)

{

	static int regset_size;



	if (regset_size == 0) {

		int i = 0;



		while (pm_dbg_reg_modules[i].name[0] != 0) {

			regset_size += pm_dbg_reg_modules[i].high +

				4 - pm_dbg_reg_modules[i].low;

			i++;

		}

	}

	return regset_size;

}



static int pm_dbg_show_regs(struct seq_file *s, void *unused)

{

	int i, j;

	unsigned long val;

	int reg_set = (int)s->private;

	u32 *ptr;

	void *store = NULL;

	int regs;

	int linefeed;



	if (reg_set == 0) {

		store = kmalloc(pm_dbg_get_regset_size(), GFP_KERNEL);

		ptr = store;

		pm_dbg_regset_store(ptr);

	} else {

		ptr = pm_dbg_reg_set[reg_set - 1];

	}



	i = 0;



	while (pm_dbg_reg_modules[i].name[0] != 0) {

		regs = 0;

		linefeed = 0;

		if (pm_dbg_reg_modules[i].type == MOD_CM)

			seq_printf(s, "MOD: CM_%s (%08x)\n",

				pm_dbg_reg_modules[i].name,

				(u32)(OMAP3430_CM_BASE +

				pm_dbg_reg_modules[i].offset));

		else

			seq_printf(s, "MOD: PRM_%s (%08x)\n",

				pm_dbg_reg_modules[i].name,

				(u32)(OMAP3430_PRM_BASE +

				pm_dbg_reg_modules[i].offset));



		for (j = pm_dbg_reg_modules[i].low;

			j <= pm_dbg_reg_modules[i].high; j += 4) {

			val = *(ptr++);

			if (val != 0) {

				regs++;

				if (linefeed) {

					seq_printf(s, "\n");

					linefeed = 0;

				}

				seq_printf(s, "  %02x => %08lx", j, val);

				if (regs % 4 == 0)

					linefeed = 1;

			}

		}

		seq_printf(s, "\n");

		i++;

	}



	if (store != NULL)

		kfree(store);



	return 0;

}



static void pm_dbg_regset_store(u32 *ptr)

{

	int i, j;

	u32 val;



	i = 0;



	while (pm_dbg_reg_modules[i].name[0] != 0) {

		for (j = pm_dbg_reg_modules[i].low;

			j <= pm_dbg_reg_modules[i].high; j += 4) {

			if (pm_dbg_reg_modules[i].type == MOD_CM)

				val = omap2_cm_read_mod_reg(

					pm_dbg_reg_modules[i].offset, j);

			else

				val = omap2_prm_read_mod_reg(

					pm_dbg_reg_modules[i].offset, j);

			*(ptr++) = val;

		}

		i++;

	}

}



int pm_dbg_regset_save(int reg_set)

{

	if (pm_dbg_reg_set[reg_set-1] == NULL)

		return -EINVAL;



	pm_dbg_regset_store(pm_dbg_reg_set[reg_set-1]);



	return 0;

}



static const char pwrdm_state_names[][PWRDM_MAX_PWRSTS] = {

	"OFF",

	"RET",
@@ -449,11 +172,6 @@ static int pm_dbg_open(struct inode *inode, struct file *file) 
	};

}



static int pm_dbg_reg_open(struct inode *inode, struct file *file)

{

	return single_open(file, pm_dbg_show_regs, inode->i_private);

}



static const struct file_operations debug_fops = {

	.open           = pm_dbg_open,

	.read           = seq_read,
@@ -461,40 +179,6 @@ static const struct file_operations debug_fops = { 
	.release        = single_release,

};



static const struct file_operations debug_reg_fops = {

	.open           = pm_dbg_reg_open,

	.read           = seq_read,

	.llseek         = seq_lseek,

	.release        = single_release,

};



int pm_dbg_regset_init(int reg_set)

{

	char name[2];



	if (!pm_dbg_init_done)

		pm_dbg_init();



	if (reg_set < 1 || reg_set > PM_DBG_MAX_REG_SETS ||

		pm_dbg_reg_set[reg_set-1] != NULL)

		return -EINVAL;



	pm_dbg_reg_set[reg_set-1] =

		kmalloc(pm_dbg_get_regset_size(), GFP_KERNEL);



	if (pm_dbg_reg_set[reg_set-1] == NULL)

		return -ENOMEM;



	if (pm_dbg_dir != NULL) {

		sprintf(name, "%d", reg_set);



		(void) debugfs_create_file(name, S_IRUGO,

			pm_dbg_dir, (void *)reg_set, &debug_reg_fops);

	}



	return 0;

}



static int pwrdm_suspend_get(void *data, u64 *val)

{

	int ret = -EINVAL;
@@ -574,20 +258,11 @@ DEFINE_SIMPLE_ATTRIBUTE(pm_dbg_option_fops, option_get, option_set, "%llu\n"); 


static int __init pm_dbg_init(void)

{

	int i;

	struct dentry *d;

	char name[2];



	if (pm_dbg_init_done)

		return 0;



	if (cpu_is_omap34xx())

		pm_dbg_reg_modules = omap3_pm_reg_modules;

	else {

		printk(KERN_ERR "%s: only OMAP3 supported\n", __func__);

		return -ENODEV;

	}



	d = debugfs_create_dir("pm_debug", NULL);

	if (IS_ERR(d))

		return PTR_ERR(d);
@@ -599,25 +274,8 @@ static int __init pm_dbg_init(void) 


	pwrdm_for_each(pwrdms_setup, (void *)d);



	pm_dbg_dir = debugfs_create_dir("registers", d);

	if (IS_ERR(pm_dbg_dir))

		return PTR_ERR(pm_dbg_dir);



	(void) debugfs_create_file("current", S_IRUGO,

		pm_dbg_dir, (void *)0, &debug_reg_fops);



	for (i = 0; i < PM_DBG_MAX_REG_SETS; i++)

		if (pm_dbg_reg_set[i] != NULL) {

			sprintf(name, "%d", i+1);

			(void) debugfs_create_file(name, S_IRUGO,

				pm_dbg_dir, (void *)(i+1), &debug_reg_fops);



		}



	(void) debugfs_create_file("enable_off_mode", S_IRUGO | S_IWUSR, d,

				   &enable_off_mode, &pm_dbg_option_fops);

	(void) debugfs_create_file("sleep_while_idle", S_IRUGO | S_IWUSR, d,

				   &sleep_while_idle, &pm_dbg_option_fops);

	pm_dbg_init_done = 1;



	return 0;

arch/arm/mach-omap2/pm.h

+0 −10
Original line number Diff line number Diff line
@@ -61,25 +61,15 @@ extern int omap3_pm_get_suspend_state(struct powerdomain *pwrdm); 
extern int omap3_pm_set_suspend_state(struct powerdomain *pwrdm, int state);



#ifdef CONFIG_PM_DEBUG

extern void omap2_pm_dump(int mode, int resume, unsigned int us);

extern int omap2_pm_debug;

extern u32 enable_off_mode;

extern u32 sleep_while_idle;

#else

#define omap2_pm_dump(mode, resume, us)		do {} while (0);

#define omap2_pm_debug				0

#define enable_off_mode 0

#define sleep_while_idle 0

#endif



#if defined(CONFIG_PM_DEBUG) && defined(CONFIG_DEBUG_FS)

extern void pm_dbg_update_time(struct powerdomain *pwrdm, int prev);

extern int pm_dbg_regset_save(int reg_set);

extern int pm_dbg_regset_init(int reg_set);

#else

#define pm_dbg_update_time(pwrdm, prev) do {} while (0);

#define pm_dbg_regset_save(reg_set) do {} while (0);

#define pm_dbg_regset_init(reg_set) do {} while (0);

#endif /* CONFIG_PM_DEBUG */



extern void omap24xx_idle_loop_suspend(void);