Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2789917 authored by Tomasz Figa's avatar Tomasz Figa Committed by Kukjin Kim
Browse files

ARM: SAMSUNG: Move common save/restore helpers to separate file 



To separate legacy PM code from generic helpers, this patch moves the
generic register save/restore helpers to a new file called pm-common.c
that is compiled always when CONFIG_PM_SLEEP is enabled, to allow
platforms that do not want to use the legacy PM code use the generic
helpers.

Signed-off-by: default avatarTomasz Figa <t.figa@samsung.com>
Acked-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 72551f6c

arch/arm/plat-samsung/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ obj-$(CONFIG_SAMSUNG_DMADEV) += dma-ops.o 


# PM support



obj-$(CONFIG_PM_SLEEP)		+= pm-common.o

obj-$(CONFIG_SAMSUNG_PM)	+= pm.o

obj-$(CONFIG_SAMSUNG_PM_GPIO)	+= pm-gpio.o

obj-$(CONFIG_SAMSUNG_PM_CHECK)	+= pm-check.o

arch/arm/plat-samsung/include/plat/pm-common.h

+26 −0
Original line number Diff line number Diff line
@@ -13,6 +13,32 @@ 
#ifndef __PLAT_SAMSUNG_PM_COMMON_H

#define __PLAT_SAMSUNG_PM_COMMON_H __FILE__



#include <linux/irq.h>



/* sleep save info */



/**

 * struct sleep_save - save information for shared peripherals.

 * @reg: Pointer to the register to save.

 * @val: Holder for the value saved from reg.

 *

 * This describes a list of registers which is used by the pm core and

 * other subsystem to save and restore register values over suspend.

 */

struct sleep_save {

	void __iomem	*reg;

	unsigned long	val;

};



#define SAVE_ITEM(x) \

	{ .reg = (x) }



/* helper functions to save/restore lists of registers. */



extern void s3c_pm_do_save(struct sleep_save *ptr, int count);

extern void s3c_pm_do_restore(const struct sleep_save *ptr, int count);

extern void s3c_pm_do_restore_core(const struct sleep_save *ptr, int count);



/* PM debug functions */



/**

arch/arm/plat-samsung/include/plat/pm.h

+0 −25
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
 * management

*/



#include <linux/irq.h>

#include <plat/pm-common.h>



struct device;
@@ -59,30 +58,6 @@ extern unsigned long s3c_pm_flags; 


extern int s3c2410_cpu_suspend(unsigned long);



/* sleep save info */



/**

 * struct sleep_save - save information for shared peripherals.

 * @reg: Pointer to the register to save.

 * @val: Holder for the value saved from reg.

 *

 * This describes a list of registers which is used by the pm core and

 * other subsystem to save and restore register values over suspend.

 */

struct sleep_save {

	void __iomem	*reg;

	unsigned long	val;

};



#define SAVE_ITEM(x) \

	{ .reg = (x) }



/* helper functions to save/restore lists of registers. */



extern void s3c_pm_do_save(struct sleep_save *ptr, int count);

extern void s3c_pm_do_restore(const struct sleep_save *ptr, int count);

extern void s3c_pm_do_restore_core(const struct sleep_save *ptr, int count);



#ifdef CONFIG_SAMSUNG_PM

extern int s3c_irq_wake(struct irq_data *data, unsigned int state);

extern int s3c_irqext_wake(struct irq_data *data, unsigned int state);

arch/arm/plat-samsung/pm-common.c

0 → 100644
+75 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2013 Samsung Electronics Co., Ltd.

 *	Tomasz Figa <t.figa@samsung.com>

 * Copyright (C) 2008 Openmoko, Inc.

 * Copyright (C) 2004-2008 Simtec Electronics

 *	Ben Dooks <ben@simtec.co.uk>

 *	http://armlinux.simtec.co.uk/

 *

 * Samsung common power management helper functions.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

*/



#include <linux/io.h>

#include <linux/kernel.h>



#include <plat/pm-common.h>



/* helper functions to save and restore register state */



/**

 * s3c_pm_do_save() - save a set of registers for restoration on resume.

 * @ptr: Pointer to an array of registers.

 * @count: Size of the ptr array.

 *

 * Run through the list of registers given, saving their contents in the

 * array for later restoration when we wakeup.

 */

void s3c_pm_do_save(struct sleep_save *ptr, int count)

{

	for (; count > 0; count--, ptr++) {

		ptr->val = __raw_readl(ptr->reg);

		S3C_PMDBG("saved %p value %08lx\n", ptr->reg, ptr->val);

	}

}



/**

 * s3c_pm_do_restore() - restore register values from the save list.

 * @ptr: Pointer to an array of registers.

 * @count: Size of the ptr array.

 *

 * Restore the register values saved from s3c_pm_do_save().

 *

 * Note, we do not use S3C_PMDBG() in here, as the system may not have

 * restore the UARTs state yet

*/



void s3c_pm_do_restore(const struct sleep_save *ptr, int count)

{

	for (; count > 0; count--, ptr++) {

		pr_debug("restore %p (restore %08lx, was %08x)\n",

				ptr->reg, ptr->val, __raw_readl(ptr->reg));



		__raw_writel(ptr->val, ptr->reg);

	}

}



/**

 * s3c_pm_do_restore_core() - early restore register values from save list.

 *

 * This is similar to s3c_pm_do_restore() except we try and minimise the

 * side effects of the function in case registers that hardware might need

 * to work has been restored.

 *

 * WARNING: Do not put any debug in here that may effect memory or use

 * peripherals, as things may be changing!

*/



void s3c_pm_do_restore_core(const struct sleep_save *ptr, int count)

{

	for (; count > 0; count--, ptr++)

		__raw_writel(ptr->val, ptr->reg);

}

arch/arm/plat-samsung/pm.c

+0 −56
Original line number Diff line number Diff line
@@ -66,62 +66,6 @@ int s3c_irqext_wake(struct irq_data *data, unsigned int state) 
	return 0;

}



/* helper functions to save and restore register state */



/**

 * s3c_pm_do_save() - save a set of registers for restoration on resume.

 * @ptr: Pointer to an array of registers.

 * @count: Size of the ptr array.

 *

 * Run through the list of registers given, saving their contents in the

 * array for later restoration when we wakeup.

 */

void s3c_pm_do_save(struct sleep_save *ptr, int count)

{

	for (; count > 0; count--, ptr++) {

		ptr->val = __raw_readl(ptr->reg);

		S3C_PMDBG("saved %p value %08lx\n", ptr->reg, ptr->val);

	}

}



/**

 * s3c_pm_do_restore() - restore register values from the save list.

 * @ptr: Pointer to an array of registers.

 * @count: Size of the ptr array.

 *

 * Restore the register values saved from s3c_pm_do_save().

 *

 * Note, we do not use S3C_PMDBG() in here, as the system may not have

 * restore the UARTs state yet

*/



void s3c_pm_do_restore(const struct sleep_save *ptr, int count)

{

	for (; count > 0; count--, ptr++) {

		printk(KERN_DEBUG "restore %p (restore %08lx, was %08x)\n",

		       ptr->reg, ptr->val, __raw_readl(ptr->reg));



		__raw_writel(ptr->val, ptr->reg);

	}

}



/**

 * s3c_pm_do_restore_core() - early restore register values from save list.

 *

 * This is similar to s3c_pm_do_restore() except we try and minimise the

 * side effects of the function in case registers that hardware might need

 * to work has been restored.

 *

 * WARNING: Do not put any debug in here that may effect memory or use

 * peripherals, as things may be changing!

*/



void s3c_pm_do_restore_core(const struct sleep_save *ptr, int count)

{

	for (; count > 0; count--, ptr++)

		__raw_writel(ptr->val, ptr->reg);

}



/* s3c2410_pm_show_resume_irqs

 *

 * print any IRQs asserted at resume time (ie, we woke from)