From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932144AbbCXSAf (ORCPT ); Tue, 24 Mar 2015 14:00:35 -0400 Received: from foss.arm.com ([217.140.101.70]:49119 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754190AbbCXR7a (ORCPT ); Tue, 24 Mar 2015 13:59:30 -0400 From: Lorenzo Pieralisi To: linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Lorenzo Pieralisi , Hanjun Guo , Sudeep Holla , Mark Rutland , Will Deacon , Catalin Marinas Subject: [PATCH 3/5] ARM64: kernel: psci: let ACPI probe PSCI version Date: Tue, 24 Mar 2015 17:58:53 +0000 Message-Id: <1427219940-27201-4-git-send-email-lorenzo.pieralisi@arm.com> X-Mailer: git-send-email 2.2.1 In-Reply-To: <1427219940-27201-1-git-send-email-lorenzo.pieralisi@arm.com> References: <1427219940-27201-1-git-send-email-lorenzo.pieralisi@arm.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org PSCI v0.2+ allows the kernel to probe the PSCI firmware version. This patch replaces the default initialization of PSCI v0.2+ functions with code that allows probing PSCI firmware version and initializes PSCI functions accordingly. Signed-off-by: Lorenzo Pieralisi Cc: Hanjun Guo Cc: Sudeep Holla Cc: Mark Rutland --- arch/arm64/kernel/psci.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/arm64/kernel/psci.c b/arch/arm64/kernel/psci.c index 2caac44..ea18cb5 100644 --- a/arch/arm64/kernel/psci.c +++ b/arch/arm64/kernel/psci.c @@ -439,9 +439,7 @@ int __init psci_acpi_init(void) else invoke_psci_fn = __invoke_psci_fn_smc; - psci_0_2_set_functions(); - - return 0; + return psci_probe(); } #ifdef CONFIG_SMP -- 2.2.1