diff options
| author | Tom Rini <trini@konsulko.com> | 2024-09-30 17:48:12 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-09-30 17:48:12 -0600 |
| commit | 3a0b829efc35227b1079a444f00e0729502197ad (patch) | |
| tree | 0b63050b1d46587a800c1a4e277a69170640da00 /arch/arm/mach-stm32mp/stm32mp1/psci.c | |
| parent | ddbcafeb53e7093c58488596bfce6d8823777c3a (diff) | |
| parent | 9cfe0cab3bf135a505e1e163ca442a4e4064d58e (diff) | |
Merge tag 'v2024.10-rc6' into next
Prepare v2024.10-rc6
Diffstat (limited to 'arch/arm/mach-stm32mp/stm32mp1/psci.c')
| -rw-r--r-- | arch/arm/mach-stm32mp/stm32mp1/psci.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-stm32mp/stm32mp1/psci.c b/arch/arm/mach-stm32mp/stm32mp1/psci.c index bfbf420fdb5..a02a8988a68 100644 --- a/arch/arm/mach-stm32mp/stm32mp1/psci.c +++ b/arch/arm/mach-stm32mp/stm32mp1/psci.c @@ -393,8 +393,7 @@ static int __secure secure_waitbits(u32 reg, u32 mask, u32 val) asm volatile("mrrc p15, 0, %Q0, %R0, c14" : "=r" (start)); for (;;) { tmp = readl(reg); - tmp &= mask; - if ((tmp & val) == val) + if ((tmp & mask) == val) return 0; asm volatile("mrrc p15, 0, %Q0, %R0, c14" : "=r" (end)); if ((end - start) > delay) |