From: Julien Grall Date: Fri, 23 Feb 2018 18:57:25 +0000 (+0000) Subject: xen/arm: psci: Consolidate PSCI version print X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~523 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b7d4ba0da52bf88a73c57c929702831189b02075;p=xen.git xen/arm: psci: Consolidate PSCI version print Xen is printing the same way the PSCI version for 0.1, 0.2 and later. The only different is the former is hardcoded. Furthermore PSCI is now used for other things than SMP bring up. So only print the PSCI version in psci_init. Signed-off-by: Julien Grall Reviewed-by: Volodymyr Babchuk Acked-by: Stefano Stabellini --- diff --git a/xen/arch/arm/psci.c b/xen/arch/arm/psci.c index 909d1c176f..6e6980bfe2 100644 --- a/xen/arch/arm/psci.c +++ b/xen/arch/arm/psci.c @@ -136,8 +136,6 @@ int __init psci_init_0_1(void) psci_ver = PSCI_VERSION(0, 1); - printk(XENLOG_INFO "Using PSCI-0.1 for SMP bringup\n"); - return 0; } @@ -183,9 +181,6 @@ int __init psci_init_0_2(void) psci_cpu_on_nr = PSCI_0_2_FN_NATIVE(CPU_ON); - printk(XENLOG_INFO "Using PSCI-%u.%u for SMP bringup\n", - PSCI_VERSION_MAJOR(psci_ver), PSCI_VERSION_MINOR(psci_ver)); - return 0; } @@ -205,6 +200,9 @@ int __init psci_init(void) psci_init_smccc(); + printk(XENLOG_INFO "Using PSCI v%u.%u\n", + PSCI_VERSION_MAJOR(psci_ver), PSCI_VERSION_MINOR(psci_ver)); + return 0; }