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

Commit edc07c00 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v4.19/soc-signed' of... 

Merge tag 'omap-for-v4.19/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc

SoC updates for omaps for v4.19 merge window

These changes are mostly PM related changes for am335x and
am437x to support RTC only suspend mode. Some of the clock
and driver related chances are still pending so it's not
yet fully functional.

Also included is a change for PM debug sysfs entry to use
DEFINE_SHOW_ATTRIBUTE.

* tag 'omap-for-v4.19/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: OMAP2+: sleep33/43xx: Add RTC-Mode support
  ARM: OMAP2+: sleep33/43xx: Make sleep actions configurable
  ARM: OMAP2+: reuse DEFINE_SHOW_ATTRIBUTE() macro
  ARM: hwmod: RTC: Don't assume lock/unlock will be called with irq enabled

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 5306c6ad 8c5a916f

arch/arm/mach-omap2/omap_hwmod_reset.c

+8 −4
Original line number Diff line number Diff line
@@ -92,11 +92,13 @@ static void omap_rtc_wait_not_busy(struct omap_hwmod *oh) 
 */

void omap_hwmod_rtc_unlock(struct omap_hwmod *oh)

{

	local_irq_disable();

	unsigned long flags;



	local_irq_save(flags);

	omap_rtc_wait_not_busy(oh);

	omap_hwmod_write(OMAP_RTC_KICK0_VALUE, oh, OMAP_RTC_KICK0_REG);

	omap_hwmod_write(OMAP_RTC_KICK1_VALUE, oh, OMAP_RTC_KICK1_REG);

	local_irq_enable();

	local_irq_restore(flags);

}



/**
@@ -110,9 +112,11 @@ void omap_hwmod_rtc_unlock(struct omap_hwmod *oh) 
 */

void omap_hwmod_rtc_lock(struct omap_hwmod *oh)

{

	local_irq_disable();

	unsigned long flags;



	local_irq_save(flags);

	omap_rtc_wait_not_busy(oh);

	omap_hwmod_write(0x0, oh, OMAP_RTC_KICK0_REG);

	omap_hwmod_write(0x0, oh, OMAP_RTC_KICK1_REG);

	local_irq_enable();

	local_irq_restore(flags);

}

arch/arm/mach-omap2/pm-asm-offsets.c

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ int main(void) 
	       offsetof(struct am33xx_pm_ro_sram_data, amx3_pm_sram_data_virt));

	DEFINE(AMX3_PM_RO_SRAM_DATA_PHYS_OFFSET,

	       offsetof(struct am33xx_pm_ro_sram_data, amx3_pm_sram_data_phys));

	DEFINE(AMX3_PM_RTC_BASE_VIRT_OFFSET,

	       offsetof(struct am33xx_pm_ro_sram_data, rtc_base_virt));

	DEFINE(AMX3_PM_RO_SRAM_DATA_SIZE,

	       sizeof(struct am33xx_pm_ro_sram_data));

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

+6 −31
Original line number Diff line number Diff line
@@ -47,11 +47,6 @@ static int pm_dbg_init_done; 


static int pm_dbg_init(void);



enum {

	DEBUG_FILE_COUNTERS = 0,

	DEBUG_FILE_TIMERS,

};



static const char pwrdm_state_names[][PWRDM_MAX_PWRSTS] = {

	"OFF",

	"RET",
@@ -141,39 +136,21 @@ static int pwrdm_dbg_show_timer(struct powerdomain *pwrdm, void *user) 
	return 0;

}



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

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

{

	pwrdm_for_each(pwrdm_dbg_show_counter, s);

	clkdm_for_each(clkdm_dbg_show_counter, s);



	return 0;

}

DEFINE_SHOW_ATTRIBUTE(pm_dbg_counters);



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

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

{

	pwrdm_for_each(pwrdm_dbg_show_timer, s);

	return 0;

}



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

{

	switch ((int)inode->i_private) {

	case DEBUG_FILE_COUNTERS:

		return single_open(file, pm_dbg_show_counters,

			&inode->i_private);

	case DEBUG_FILE_TIMERS:

	default:

		return single_open(file, pm_dbg_show_timers,

			&inode->i_private);

	}

}



static const struct file_operations debug_fops = {

	.open           = pm_dbg_open,

	.read           = seq_read,

	.llseek         = seq_lseek,

	.release        = single_release,

};

DEFINE_SHOW_ATTRIBUTE(pm_dbg_timers);



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

{
@@ -259,10 +236,8 @@ static int __init pm_dbg_init(void) 
	if (!d)

		return -EINVAL;



	(void) debugfs_create_file("count", S_IRUGO,

		d, (void *)DEBUG_FILE_COUNTERS, &debug_fops);

	(void) debugfs_create_file("time", S_IRUGO,

		d, (void *)DEBUG_FILE_TIMERS, &debug_fops);

	(void) debugfs_create_file("count", 0444, d, NULL, &pm_dbg_counters_fops);

	(void) debugfs_create_file("time", 0444, d, NULL, &pm_dbg_timers_fops);



	pwrdm_for_each(pwrdms_setup, (void *)d);

arch/arm/mach-omap2/pm33xx-core.c

+16 −4
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
static struct powerdomain *cefuse_pwrdm, *gfx_pwrdm, *per_pwrdm, *mpu_pwrdm;

static struct clockdomain *gfx_l4ls_clkdm;

static void __iomem *scu_base;

static struct omap_hwmod *rtc_oh;



static int __init am43xx_map_scu(void)

{
@@ -106,12 +107,13 @@ static void amx3_post_suspend_common(void) 
		pr_err("PM: GFX domain did not transition: %x\n", status);

}



static int am33xx_suspend(unsigned int state, int (*fn)(unsigned long))

static int am33xx_suspend(unsigned int state, int (*fn)(unsigned long),

			  unsigned long args)

{

	int ret = 0;



	amx3_pre_suspend_common();

	ret = cpu_suspend(0, fn);

	ret = cpu_suspend(args, fn);

	amx3_post_suspend_common();



	/*
@@ -128,13 +130,14 @@ static int am33xx_suspend(unsigned int state, int (*fn)(unsigned long)) 
	return ret;

}



static int am43xx_suspend(unsigned int state, int (*fn)(unsigned long))

static int am43xx_suspend(unsigned int state, int (*fn)(unsigned long),

			  unsigned long args)

{

	int ret = 0;



	amx3_pre_suspend_common();

	scu_power_mode(scu_base, SCU_PM_POWEROFF);

	ret = cpu_suspend(0, fn);

	ret = cpu_suspend(args, fn);

	scu_power_mode(scu_base, SCU_PM_NORMAL);

	amx3_post_suspend_common();
@@ -151,16 +154,25 @@ static struct am33xx_pm_sram_addr *amx3_get_sram_addrs(void) 
		return NULL;

}



void __iomem *am43xx_get_rtc_base_addr(void)

{

	rtc_oh = omap_hwmod_lookup("rtc");



	return omap_hwmod_get_mpu_rt_va(rtc_oh);

}



static struct am33xx_pm_platform_data am33xx_ops = {

	.init = am33xx_suspend_init,

	.soc_suspend = am33xx_suspend,

	.get_sram_addrs = amx3_get_sram_addrs,

	.get_rtc_base_addr = am43xx_get_rtc_base_addr,

};



static struct am33xx_pm_platform_data am43xx_ops = {

	.init = am43xx_suspend_init,

	.soc_suspend = am43xx_suspend,

	.get_sram_addrs = amx3_get_sram_addrs,

	.get_rtc_base_addr = am43xx_get_rtc_base_addr,

};



static struct am33xx_pm_platform_data *am33xx_pm_get_pdata(void)

arch/arm/mach-omap2/sleep33xx.S

+50 −2
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 


#include <generated/ti-pm-asm-offsets.h>

#include <linux/linkage.h>

#include <linux/platform_data/pm33xx.h>

#include <linux/ti-emif-sram.h>

#include <asm/assembler.h>

#include <asm/memory.h>
@@ -19,12 +20,25 @@ 
#define AM33XX_CM_CLKCTRL_MODULEMODE_DISABLE			0x0003

#define AM33XX_CM_CLKCTRL_MODULEMODE_ENABLE			0x0002



/* replicated define because linux/bitops.h cannot be included in assembly */

#define BIT(nr)			(1 << (nr))



	.arm

	.align 3



ENTRY(am33xx_do_wfi)

	stmfd	sp!, {r4 - r11, lr}	@ save registers on stack



	/* Save wfi_flags arg to data space */

	mov	r4, r0

	adr	r3, am33xx_pm_ro_sram_data

	ldr	r2, [r3, #AMX3_PM_RO_SRAM_DATA_VIRT_OFFSET]

	str	r4, [r2, #AMX3_PM_WFI_FLAGS_OFFSET]



	/* Only flush cache is we know we are losing MPU context */

	tst	r4, #WFI_FLAG_FLUSH_CACHE

	beq	cache_skip_flush



	/*

	 * Flush all data from the L1 and L2 data cache before disabling

	 * SCTLR.C bit.
@@ -48,14 +62,33 @@ ENTRY(am33xx_do_wfi) 
	ldr	r1, kernel_flush

	blx	r1



	adr	r3, am33xx_pm_ro_sram_data

	ldr	r2, [r3, #AMX3_PM_RO_SRAM_DATA_VIRT_OFFSET]

	ldr	r4, [r2, #AMX3_PM_WFI_FLAGS_OFFSET]



cache_skip_flush:

	/* Check if we want self refresh */

	tst	r4, #WFI_FLAG_SELF_REFRESH

	beq	emif_skip_enter_sr



	adr	r9, am33xx_emif_sram_table



	ldr	r3, [r9, #EMIF_PM_ENTER_SR_OFFSET]

	blx	r3



emif_skip_enter_sr:

	/* Only necessary if PER is losing context */

	tst	r4, #WFI_FLAG_SAVE_EMIF

	beq	emif_skip_save



	ldr	r3, [r9, #EMIF_PM_SAVE_CONTEXT_OFFSET]

	blx	r3



emif_skip_save:

	/* Only can disable EMIF if we have entered self refresh */

	tst     r4, #WFI_FLAG_SELF_REFRESH

	beq     emif_skip_disable



	/* Disable EMIF */

	ldr     r1, virt_emif_clkctrl

	ldr     r2, [r1]
@@ -69,6 +102,10 @@ wait_emif_disable: 
	cmp	r2, r3

	bne	wait_emif_disable



emif_skip_disable:

	tst	r4, #WFI_FLAG_WAKE_M3

	beq	wkup_m3_skip



	/*

	 * For the MPU WFI to be registered as an interrupt

	 * to WKUP_M3, MPU_CLKCTRL.MODULEMODE needs to be set
@@ -79,6 +116,7 @@ wait_emif_disable: 
	bic	r2, r2, #AM33XX_CM_CLKCTRL_MODULEMODE_DISABLE

	str	r2, [r1]



wkup_m3_skip:

	/*

	 * Execute an ISB instruction to ensure that all of the

	 * CP15 register changes have been committed.
@@ -132,10 +170,18 @@ wait_emif_enable: 
	cmp	r2, r3

	bne	wait_emif_enable



	/* Only necessary if PER is losing context */

	tst	r4, #WFI_FLAG_SELF_REFRESH

	beq	emif_skip_exit_sr_abt



	adr	r9, am33xx_emif_sram_table

	ldr	r1, [r9, #EMIF_PM_ABORT_SR_OFFSET]

	blx	r1



emif_skip_exit_sr_abt:

	tst	r4, #WFI_FLAG_FLUSH_CACHE

	beq	cache_skip_restore



	/*

	 * Set SCTLR.C bit to allow data cache allocation

	 */
@@ -144,6 +190,7 @@ wait_emif_enable: 
	mcr	p15, 0, r0, c1, c0, 0

	isb



cache_skip_restore:

	/* Let the suspend code know about the abort */

	mov	r0, #1

	ldmfd	sp!, {r4 - r11, pc}	@ restore regs and return
@@ -181,8 +228,6 @@ ENDPROC(am33xx_resume_from_deep_sleep) 
 * Local variables

 */

	.align

resume_addr:

	.word	cpu_resume - PAGE_OFFSET + 0x80000000

kernel_flush:

	.word   v7_flush_dcache_all

virt_mpu_clkctrl:
@@ -205,6 +250,9 @@ ENTRY(am33xx_pm_sram) 
	.word am33xx_emif_sram_table

	.word am33xx_pm_ro_sram_data



resume_addr:

.word  cpu_resume - PAGE_OFFSET + 0x80000000



.align 3

ENTRY(am33xx_pm_ro_sram_data)

	.space AMX3_PM_RO_SRAM_DATA_SIZE