mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH master] ARM: psci: client: fix power off and reset via 64-bit secure monitor
@ 2021-10-15 16:05 Ahmad Fatoum
  2021-10-18  6:46 ` Sascha Hauer
  0 siblings, 1 reply; 2+ messages in thread
From: Ahmad Fatoum @ 2021-10-15 16:05 UTC (permalink / raw)
  To: barebox; +Cc: Ahmad Fatoum

The PSCI function code is a 32-bit integer > 0x80000000, but the
the PSCI client code erroneously casted it to a signed integer.

On 32-bit systems, the cast later on to unsigned long restored the
original value, but on 64-bit system, we passed a very large 64-bit
number in the secure monitor call because of the sign extension.

This worked because TF-A seems to ignore the upper 32-bits anyway,
(tested with i.MX8MN), but for other secure monitors like the default
HVC implementation for QEMU ARM64 Virt machine this didn't hold true
for all commands, leading to aborts when doing reset or poweroff.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 arch/arm/cpu/psci-client.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/cpu/psci-client.c b/arch/arm/cpu/psci-client.c
index b5d0d3749702..7d5b3768b59e 100644
--- a/arch/arm/cpu/psci-client.c
+++ b/arch/arm/cpu/psci-client.c
@@ -15,7 +15,7 @@
 
 static struct restart_handler restart;
 
-static void __noreturn psci_invoke_noreturn(int function)
+static void __noreturn psci_invoke_noreturn(ulong function)
 {
 	int ret;
 
-- 
2.30.2


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH master] ARM: psci: client: fix power off and reset via 64-bit secure monitor
  2021-10-15 16:05 [PATCH master] ARM: psci: client: fix power off and reset via 64-bit secure monitor Ahmad Fatoum
@ 2021-10-18  6:46 ` Sascha Hauer
  0 siblings, 0 replies; 2+ messages in thread
From: Sascha Hauer @ 2021-10-18  6:46 UTC (permalink / raw)
  To: Ahmad Fatoum; +Cc: barebox

On Fri, Oct 15, 2021 at 06:05:44PM +0200, Ahmad Fatoum wrote:
> The PSCI function code is a 32-bit integer > 0x80000000, but the
> the PSCI client code erroneously casted it to a signed integer.
> 
> On 32-bit systems, the cast later on to unsigned long restored the
> original value, but on 64-bit system, we passed a very large 64-bit
> number in the secure monitor call because of the sign extension.
> 
> This worked because TF-A seems to ignore the upper 32-bits anyway,
> (tested with i.MX8MN), but for other secure monitors like the default
> HVC implementation for QEMU ARM64 Virt machine this didn't hold true
> for all commands, leading to aborts when doing reset or poweroff.
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
>  arch/arm/cpu/psci-client.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks

Sascha

> 
> diff --git a/arch/arm/cpu/psci-client.c b/arch/arm/cpu/psci-client.c
> index b5d0d3749702..7d5b3768b59e 100644
> --- a/arch/arm/cpu/psci-client.c
> +++ b/arch/arm/cpu/psci-client.c
> @@ -15,7 +15,7 @@
>  
>  static struct restart_handler restart;
>  
> -static void __noreturn psci_invoke_noreturn(int function)
> +static void __noreturn psci_invoke_noreturn(ulong function)
>  {
>  	int ret;
>  
> -- 
> 2.30.2
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-10-18  6:48 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-15 16:05 [PATCH master] ARM: psci: client: fix power off and reset via 64-bit secure monitor Ahmad Fatoum
2021-10-18  6:46 ` Sascha Hauer

mail archive of the barebox mailing list

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://lore.barebox.org/barebox/0 barebox/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 barebox barebox/ https://lore.barebox.org/barebox \
		barebox@lists.infradead.org
	public-inbox-index barebox

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git