[PATCH kvm-unit-tests 2/3] arm/arm64: psci: cpu_psci_cpu_die operates on itself

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Signed-off-by: Andrew Jones <drjones@xxxxxxxxxx>
---
 lib/arm/asm/psci.h | 2 +-
 lib/arm/psci.c     | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/arm/asm/psci.h b/lib/arm/asm/psci.h
index eeb55cf299d1..ed51708fd265 100644
--- a/lib/arm/asm/psci.h
+++ b/lib/arm/asm/psci.h
@@ -8,6 +8,6 @@ extern int psci_invoke(unsigned long function_id, unsigned long arg0,
 extern int psci_cpu_on(unsigned long cpuid, unsigned long entry_point);
 extern void psci_sys_reset(void);
 extern int cpu_psci_cpu_boot(unsigned int cpu);
-extern void cpu_psci_cpu_die(unsigned int cpu);
+extern void cpu_psci_cpu_die(void);
 
 #endif /* _ASMARM_PSCI_H_ */
diff --git a/lib/arm/psci.c b/lib/arm/psci.c
index a14acddeefd3..119f74e57e91 100644
--- a/lib/arm/psci.c
+++ b/lib/arm/psci.c
@@ -9,6 +9,7 @@
 #include <asm/psci.h>
 #include <asm/setup.h>
 #include <asm/page.h>
+#include <asm/smp.h>
 
 __attribute__((noinline))
 int psci_invoke(unsigned long function_id, unsigned long arg0,
@@ -40,11 +41,11 @@ int cpu_psci_cpu_boot(unsigned int cpu)
 }
 
 #define PSCI_POWER_STATE_TYPE_POWER_DOWN (1U << 16)
-void cpu_psci_cpu_die(unsigned int cpu)
+void cpu_psci_cpu_die(void)
 {
 	int err = psci_invoke(PSCI_0_2_FN_CPU_OFF,
 			PSCI_POWER_STATE_TYPE_POWER_DOWN, 0, 0);
-	printf("unable to power off CPU%d (%d)\n", cpu, err);
+	printf("CPU%d unable to power off (error = %d)\n", smp_processor_id(), err);
 }
 
 void psci_sys_reset(void)
-- 
2.9.4




[Index of Archives]     [KVM ARM]     [KVM ia64]     [KVM ppc]     [Virtualization Tools]     [Spice Development]     [Libvirt]     [Libvirt Users]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite Questions]     [Linux Kernel]     [Linux SCSI]     [XFree86]

  Powered by Linux