Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1523592 > unrolled thread
| Started by | Arnd Bergmann <arnd@arndb.de> |
|---|---|
| First post | 2016-11-16 16:30 +0100 |
| Last post | 2016-11-22 10:10 +0100 |
| Articles | 4 — 3 participants |
Back to article view | Back to linux.kernel
[PATCH] ARM: ux500: fix prcmu_is_cpu_in_wfi() calculation Arnd Bergmann <arnd@arndb.de> - 2016-11-16 16:30 +0100
Re: [PATCH] ARM: ux500: fix prcmu_is_cpu_in_wfi() calculation Daniel Lezcano <daniel.lezcano@linaro.org> - 2016-11-16 16:40 +0100
Re: [PATCH] ARM: ux500: fix prcmu_is_cpu_in_wfi() calculation Linus Walleij <linus.walleij@linaro.org> - 2016-11-22 09:50 +0100
Re: [PATCH] ARM: ux500: fix prcmu_is_cpu_in_wfi() calculation Arnd Bergmann <arnd@arndb.de> - 2016-11-22 10:10 +0100
| From | Arnd Bergmann <arnd@arndb.de> |
|---|---|
| Date | 2016-11-16 16:30 +0100 |
| Subject | [PATCH] ARM: ux500: fix prcmu_is_cpu_in_wfi() calculation |
| Message-ID | <sEajU-4Eo-37@gated-at.bofh.it> |
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")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/arm/mach-ux500/pm.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-ux500/pm.c b/arch/arm/mach-ux500/pm.c
index 8538910db202..a970e7fcba9e 100644
--- a/arch/arm/mach-ux500/pm.c
+++ b/arch/arm/mach-ux500/pm.c
@@ -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);
}
/*
--
2.9.0
[toc] | [next] | [standalone]
| From | Daniel Lezcano <daniel.lezcano@linaro.org> |
|---|---|
| Date | 2016-11-16 16:40 +0100 |
| Message-ID | <sEatA-4HA-43@gated-at.bofh.it> |
| In reply to | #1523592 |
On Wed, Nov 16, 2016 at 04:20:37PM +0100, Arnd Bergmann wrote:
> 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")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> arch/arm/mach-ux500/pm.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-ux500/pm.c b/arch/arm/mach-ux500/pm.c
> index 8538910db202..a970e7fcba9e 100644
> --- a/arch/arm/mach-ux500/pm.c
> +++ b/arch/arm/mach-ux500/pm.c
> @@ -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);
> }
>
> /*
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Very strange this board did not hang with this broken function.
It is used in a critical function for cpuidle. Is it possible to make a quick
test with this cpuidle test program [1] ?
Thanks!
-- Daniel
[1] https://git.linaro.org/power/pm-qa.git/tree/cpuidle/cpuidle_killer.c
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
[toc] | [prev] | [next] | [standalone]
| From | Linus Walleij <linus.walleij@linaro.org> |
|---|---|
| Date | 2016-11-22 09:50 +0100 |
| Message-ID | <sGeW6-4Pc-23@gated-at.bofh.it> |
| In reply to | #1523592 |
On Wed, Nov 16, 2016 at 4:20 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> 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")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Will you apply it directly to ARM SoC or should I queue it and
send it with a pull request?
Yours,
Linus Walleij
[toc] | [prev] | [next] | [standalone]
| From | Arnd Bergmann <arnd@arndb.de> |
|---|---|
| Date | 2016-11-22 10:10 +0100 |
| Message-ID | <sGffs-5aZ-29@gated-at.bofh.it> |
| In reply to | #1527311 |
On Tuesday, November 22, 2016 9:47:20 AM CET Linus Walleij wrote:
> On Wed, Nov 16, 2016 at 4:20 PM, Arnd Bergmann <arnd@arndb.de> wrote:
>
> > 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")
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>
> Acked-by: Linus Walleij <linus.walleij@linaro.org>
>
> Will you apply it directly to ARM SoC or should I queue it and
> send it with a pull request?
I'd prefer you to queue and track it, thanks,
Arnd
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web