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

Commit 0b7778a8 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Kukjin Kim
Browse files

ARM: firmware: add AFTR mode support to firmware do_idle method 



On some platforms (i.e. EXYNOS ones) more than one idle mode is
available and we need to distinguish them in firmware do_idle method.

Add mode parameter to do_idle firmware method and AFTR mode support
to EXYNOS do_idle implementation.

This change is a preparation for adding secure firmware support to
EXYNOS cpuidle driver.

This patch shouldn't cause any functionality changes.

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Acked-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Acked-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 134abc29

arch/arm/include/asm/firmware.h

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ struct firmware_ops { 
	/*

	 * Enters CPU idle mode

	 */

	int (*do_idle)(void);

	int (*do_idle)(unsigned long mode);

	/*

	 * Sets boot address of specified physical CPU

	 */

arch/arm/mach-exynos/common.h

+5 −0
Original line number Diff line number Diff line
@@ -119,6 +119,11 @@ extern void __iomem *sysram_base_addr; 
extern void __iomem *pmu_base_addr;

void exynos_sysram_init(void);



enum {

	FW_DO_IDLE_SLEEP,

	FW_DO_IDLE_AFTR,

};



void exynos_firmware_init(void);



extern u32 exynos_get_eint_wake_mask(void);

arch/arm/mach-exynos/firmware.c

+8 −2
Original line number Diff line number Diff line
@@ -28,9 +28,15 @@ 
#define EXYNOS_BOOT_ADDR	0x8

#define EXYNOS_BOOT_FLAG	0xc



static int exynos_do_idle(void)

static int exynos_do_idle(unsigned long mode)

{

	switch (mode) {

	case FW_DO_IDLE_AFTR:

		exynos_smc(SMC_CMD_CPU0AFTR, 0, 0, 0);

		break;

	case FW_DO_IDLE_SLEEP:

		exynos_smc(SMC_CMD_SLEEP, 0, 0, 0);

	}

	return 0;

}

arch/arm/mach-tegra/cpuidle-tegra114.c

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ static int tegra114_idle_power_down(struct cpuidle_device *dev, 
	call_firmware_op(prepare_idle);



	/* Do suspend by ourselves if the firmware does not implement it */

	if (call_firmware_op(do_idle) == -ENOSYS)

	if (call_firmware_op(do_idle, 0) == -ENOSYS)

		cpu_suspend(0, tegra30_sleep_cpu_secondary_finish);



	clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &dev->cpu);