From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:58358 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751021AbdAMH5K (ORCPT ); Fri, 13 Jan 2017 02:57:10 -0500 Subject: Patch "ARM: OMAP4+: Fix bad fallthrough for cpuidle" has been added to the 4.9-stable tree To: tony@atomide.com, gregkh@linuxfoundation.org, ssantosh@kernel.org Cc: , From: Date: Fri, 13 Jan 2017 08:57:25 +0100 Message-ID: <14842942456857@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled ARM: OMAP4+: Fix bad fallthrough for cpuidle to the 4.9-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: arm-omap4-fix-bad-fallthrough-for-cpuidle.patch and it can be found in the queue-4.9 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From cbf2642872333547b56b8c4d943f5ed04ac9a4ee Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Mon, 7 Nov 2016 16:50:11 -0700 Subject: ARM: OMAP4+: Fix bad fallthrough for cpuidle From: Tony Lindgren commit cbf2642872333547b56b8c4d943f5ed04ac9a4ee upstream. 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") Acked-by: Santosh Shilimkar Signed-off-by: Tony Lindgren Signed-off-by: Greg Kroah-Hartman --- arch/arm/mach-omap2/omap-mpuss-lowpower.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) --- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c +++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c @@ -245,10 +245,9 @@ int omap4_enter_lowpower(unsigned int cp 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 Patches currently in stable-queue which might be from tony@atomide.com are queue-4.9/arm-omap2-am437x-rollback-to-use-omap3_gptimer_timer_init.patch queue-4.9/arm-omap5-fix-build-for-pm-code.patch queue-4.9/arm-omap4-fix-bad-fallthrough-for-cpuidle.patch queue-4.9/arm-omap5-fix-mpuss_early_init.patch