[Xen-changelog] [xen master] xen/arm: psci: use SMC64 function ID when available on ARM64

[patchbot@xxxxxxx]

commit 75c7de56df16a5a77d655b9f3e32ea00b103a0e1
Author:     Brijesh Singh <brijeshkumar.singh@xxxxxxx>
AuthorDate: Mon Oct 5 11:38:39 2015 -0500
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Wed Oct 7 12:16:16 2015 +0100

    xen/arm: psci: use SMC64 function ID when available on ARM64
    
    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@xxxxxxx>
    Reviewed-by: Julien grall <julien.grall@xxxxxxxxxx>
    Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
 xen/arch/arm/psci.c |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

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");
 
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog