[PATCH v3] xen/arm: psci: use SMC64 function ID when available on ARM64

[PATCH v3] xen/arm: psci: use SMC64 function ID when available on ARM64

[Brijesh Singh]

As per PSCI 0.2 spec, if CPU_ON entry_point_address is 64-bit then SMC
call function ID parameter should be set to SMC64 version.

Signed-off-by: Brijesh Singh <brijeshkumar.singh@amd.com>
---
 xen/arch/arm/psci.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/xen/arch/arm/psci.c b/xen/arch/arm/psci.c
index 7ad6a43..172c6e7 100644
--- a/xen/arch/arm/psci.c
+++ b/xen/arch/arm/psci.c
@@ -23,6 +23,18 @@
 #include <xen/smp.h>
 #include <asm/psci.h>
 
+/*
+ * While a 64-bit OS can make calls with SMC32 calling conventions, for
+ * some calls it is necessary to use SMC64 to pass or return 64-bit values.
+ * For such calls PSCI_0_2_FN_NATIVE(x) will choose the appropriate
+ * (native-width) function ID.
+ */
+#ifdef CONFIG_ARM_64
+#define PSCI_0_2_FN_NATIVE(name)	PSCI_0_2_FN64_##name
+#else
+#define PSCI_0_2_FN_NATIVE(name)	PSCI_0_2_FN_##name
+#endif
+
 uint32_t psci_ver;
 
 static uint32_t psci_cpu_on_nr;
@@ -116,7 +128,7 @@ int __init psci_init_0_2(void)
         return -EOPNOTSUPP;
     }
 
-    psci_cpu_on_nr = PSCI_0_2_FN_CPU_ON;
+    psci_cpu_on_nr = PSCI_0_2_FN_NATIVE(CPU_ON);
 
     printk(XENLOG_INFO "Using PSCI-0.2 for SMP bringup\n");
 
-- 
1.9.1

Re: [PATCH v3] xen/arm: psci: use SMC64 function ID when available on ARM64

[Julien Grall]

Hi,

On 05/10/15 17:38, Brijesh Singh wrote:
> As per PSCI 0.2 spec, if CPU_ON entry_point_address is 64-bit then SMC
> call function ID parameter should be set to SMC64 version.
> 
> Signed-off-by: Brijesh Singh <brijeshkumar.singh@amd.com>

Reviewed-by: Julien grall <julien.grall@citrix.com>

Regards,

-- 
Julien Grall

Re: [PATCH v3] xen/arm: psci: use SMC64 function ID when available on ARM64

[Ian Campbell]

On Mon, 2015-10-05 at 18:09 +0100, Julien Grall wrote:
> Hi,
> 
> On 05/10/15 17:38, Brijesh Singh wrote:
> > As per PSCI 0.2 spec, if CPU_ON entry_point_address is 64-bit then SMC
> > call function ID parameter should be set to SMC64 version.
> > 
> > Signed-off-by: Brijesh Singh <brijeshkumar.singh@amd.com>
> 
> Reviewed-by: Julien grall <julien.grall@citrix.com>

Acked-by: Ian Campbell <ian.campbell@citrix.com>

One of the machines I use for my pre-push build tests is offline today, so
I'll push later.

Re: [PATCH v3] xen/arm: psci: use SMC64 function ID when available on ARM64

[Ian Campbell]

On Tue, 2015-10-06 at 14:42 +0100, Ian Campbell wrote:
> On Mon, 2015-10-05 at 18:09 +0100, Julien Grall wrote:
> > Hi,
> > 
> > On 05/10/15 17:38, Brijesh Singh wrote:
> > > As per PSCI 0.2 spec, if CPU_ON entry_point_address is 64-bit then
> > > SMC
> > > call function ID parameter should be set to SMC64 version.
> > > 
> > > Signed-off-by: Brijesh Singh <brijeshkumar.singh@amd.com>
> > 
> > Reviewed-by: Julien grall <julien.grall@citrix.com>
> 
> Acked-by: Ian Campbell <ian.campbell@citrix.com>
> 
> One of the machines I use for my pre-push build tests is offline today,
> so
> I'll push later.

Done.