diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-11-05 08:47:01 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-11-05 08:47:01 +0100 |
| commit | f7cf83d0559f2d730cfb14f72cb98f826d0dc9c0 (patch) | |
| tree | 7281141d3c67568fb1b100c95bf71ca582722210 /ARM-OMAP4-Fix-crashes.patch | |
| parent | 66eff0c3af244ed4e29402db92f6760c9ed13cac (diff) | |
| parent | c1ca5717a0b0923d2ec56c6e3d7070b8bd483c72 (diff) | |
| download | kernel-4.9.0-0.rc3.git2.1.vanilla.knurd.1.fc26.tar.gz kernel-4.9.0-0.rc3.git2.1.vanilla.knurd.1.fc26.tar.xz kernel-4.9.0-0.rc3.git2.1.vanilla.knurd.1.fc26.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.9.0-0.rc3.git2.1.vanilla.knurd.1.fc26kernel-4.9.0-0.rc3.git2.1.vanilla.knurd.1.fc25kernel-4.9.0-0.rc3.git2.1.vanilla.knurd.1.fc24kernel-4.9.0-0.rc3.git2.1.vanilla.knurd.1.fc23
Diffstat (limited to 'ARM-OMAP4-Fix-crashes.patch')
| -rw-r--r-- | ARM-OMAP4-Fix-crashes.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/ARM-OMAP4-Fix-crashes.patch b/ARM-OMAP4-Fix-crashes.patch new file mode 100644 index 000000000..5a4a257e1 --- /dev/null +++ b/ARM-OMAP4-Fix-crashes.patch @@ -0,0 +1,46 @@ +From patchwork Wed Oct 26 15:17:01 2016 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [3/5] ARM: OMAP4+: Fix bad fallthrough for cpuidle +From: Tony Lindgren <tony@atomide.com> +X-Patchwork-Id: 9397501 +Message-Id: <20161026151703.24730-4-tony@atomide.com> +To: linux-omap@vger.kernel.org +Cc: Nishanth Menon <nm@ti.com>, Dmitry Lifshitz <lifshitz@compulab.co.il>, + Dave Gerlach <d-gerlach@ti.com>, + Enric Balletbo Serra <eballetbo@gmail.com>, + "Dr . H . Nikolaus Schaller" <hns@goldelico.com>, + Pau Pajuel <ppajuel@gmail.com>, Grazvydas Ignotas <notasas@gmail.com>, + Benoit Cousson <bcousson@baylibre.com>, + Santosh Shilimkar <ssantosh@kernel.org>, + Javier Martinez Canillas <javier@dowhile0.org>, + Robert Nelson <robertcnelson@gmail.com>, + Marek Belisko <marek@goldelico.com>, linux-arm-kernel@lists.infradead.org +Date: Wed, 26 Oct 2016 08:17:01 -0700 + +We don't want to fall through to a bunch of errors for retention +if PM_OMAP4_CPU_OSWR_DISABLE is not configured for a SoC. + +Fixes: 6099dd37c669 ("ARM: OMAP5 / DRA7: Enable CPU RET on suspend") +Signed-off-by: Tony Lindgren <tony@atomide.com> +--- + arch/arm/mach-omap2/omap-mpuss-lowpower.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c +--- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c ++++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c +@@ -244,10 +244,9 @@ int omap4_enter_lowpower(unsigned int cpu, unsigned int power_state) + save_state = 1; + break; + case PWRDM_POWER_RET: +- if (IS_PM44XX_ERRATUM(PM_OMAP4_CPU_OSWR_DISABLE)) { ++ if (IS_PM44XX_ERRATUM(PM_OMAP4_CPU_OSWR_DISABLE)) + save_state = 0; +- break; +- } ++ break; + default: + /* + * CPUx CSWR is invalid hardware state. Also CPUx OSWR |