Commit 2e60fac7 authored May 25, 2020 by Arnd Bergmann

Merge tag 'tegra-for-5.8-cpuidle' of...

Merge tag 'tegra-for-5.8-cpuidle' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/drivers

cpuidle: Changes for v5.8-rc1

These changes add support for cluster power-down on Tegra30.

* tag 'tegra-for-5.8-cpuidle' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  cpuidle: tegra: Support CPU cluster power-down state on Tegra30
  ARM: tegra: Do not fully reinitialize L2 on resume
  ARM: tegra: Initialize r0 register for firmware wake-up

Link: https://lore.kernel.org/r/20200515145311.1580134-3-thierry.reding@gmail.com


Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents 9b127573 fafd62e7

arch/arm/mach-tegra/pm.c

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -216,6 +216,8 @@ int tegra_pm_enter_lp2(void)
	restore_cpu_complex();		restore_cpu_complex();
	cpu_cluster_pm_exit();		cpu_cluster_pm_exit();

			call_firmware_op(prepare_idle, TF_PM_MODE_NONE);

	return err;		return err;
	}		}

	@@ -391,6 +393,8 @@ static int tegra_suspend_enter(suspend_state_t state)

	local_fiq_enable();		local_fiq_enable();

			call_firmware_op(prepare_idle, TF_PM_MODE_NONE);

	return 0;		return 0;
	}		}

arch/arm/mach-tegra/reset-handler.S

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -98,7 +98,12 @@ ENTRY(tegra_resume_trusted_foundations)
	reteq lr		reteq lr

	.arch_extension sec		.arch_extension sec
	/* First call after suspend wakes firmware. No arguments required. */		/*
			* First call after suspend wakes firmware. No arguments required
			* for some firmware versions. Downstream kernel of ASUS TF300T uses
			* r0=3 for the wake-up notification.
			*/
			mov r0, #3
	smc #0		smc #0

	b cpu_resume		b cpu_resume

drivers/cpuidle/cpuidle-tegra.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -365,7 +365,6 @@ static int tegra_cpuidle_probe(struct platform_device *pdev)
	break;		break;

	case TEGRA30:		case TEGRA30:
	tegra_cpuidle_disable_state(TEGRA_CC6);
	break;		break;

	case TEGRA114:		case TEGRA114: