Skip to contentSkip to conversation

Patch "ARM: ux500: fix prcmu_is_cpu_in_wfi() calculation" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message Jan 23, 2017

Subsystems (4)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

ARM: ux500: fix prcmu_is_cpu_in_wfi() calculation

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-ux500-fix-prcmu_is_cpu_in_wfi-calculation.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 <[email protected]> know about it.

Quoted 1 line

From f0e8faa7a5e894b0fc99d24be1b18685a92ea466 Mon Sep 17 00:00:00 2001

From: Arnd Bergmann <[email protected]>
Date: Wed, 16 Nov 2016 16:20:37 +0100
Subject: ARM: ux500: fix prcmu_is_cpu_in_wfi() calculation

From: Arnd Bergmann <[email protected]>

commit f0e8faa7a5e894b0fc99d24be1b18685a92ea466 upstream.

This function clearly never worked and always returns true, as pointed out by gcc-7:

arch/arm/mach-ux500/pm.c: In function 'prcmu_is_cpu_in_wfi':
arch/arm/mach-ux500/pm.c:137:212: error: ?:
using integer constants in boolean context, the expression will always evaluate to 'true' [-Werror=int-in-bool-context]

With the added braces, the condition actually makes sense.

Fixes 34fe6f107eab ("mfd : Check if the other db8500 core is in WFI")
---
 arch/arm/mach-ux500/pm.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-ux500/pm.c +2 -2
@@ -134,8 +134,8 @@ bool prcmu_pending_irq(void)
  */
 bool prcmu_is_cpu_in_wfi(int cpu)
 {
-	return readl(PRCM_ARM_WFI_STANDBY) & cpu ? PRCM_ARM_WFI_STANDBY_WFI1 :
-		     PRCM_ARM_WFI_STANDBY_WFI0;
+	return readl(PRCM_ARM_WFI_STANDBY) &
+		(cpu ? PRCM_ARM_WFI_STANDBY_WFI1 : PRCM_ARM_WFI_STANDBY_WFI0);
 }
 
 /*

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/arm-ux500-fix-prcmu_is_cpu_in_wfi-calculation.patch queue-4.9/s5p-cec-mark-pm-functions-as-__maybe_unused-again.patch queue-4.9/ib-rxe-avoid-putting-a-large-struct-rxe_qp-on-stack.patch queue-4.9/platform-pxa_camera-add-video_v4l2-dependency.patch