From patchwork Wed Apr 3 18:51:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaro Koskinen X-Patchwork-Id: 10884345 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 793E217E9 for ; Wed, 3 Apr 2019 18:52:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 563A628508 for ; Wed, 3 Apr 2019 18:52:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 488532894E; Wed, 3 Apr 2019 18:52:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BA2F028508 for ; Wed, 3 Apr 2019 18:52:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=NJvh4swKIGZPDUCYgPRSF6mbmCcWDEd7cKgxoDMp7mY=; b=ADL PfJEYVA2AtQWK4HxAt4a4vr/ajKY6sp0+1T7DGcRyTDMOZx3yP6/rbWl/+PJVHSRGWd7A/Zwh+Mhq 7g6/niCrUS830pYMTQZITHvOL0bBPtg3OdSxZEpeMfG5sh56MpwwWD2Bb9dQs0VL6N/otY11eXpkD fs4fPTb370TnZTqje+GUPT6R1Nj9Flq5lZYJuaXCWF91DzXI1Yp6hP7elMtzBf8OBy1RSwj7k6rFN Odn/d44hHFJTIAuqakzruKBzH8inOjPNLf4/JogMS3gRP2Zt11Gtq8CG5/lE/EKpdnY02sWCDfjYE yyRPUhCy2Xw/OgT0xS1RNsQW1qlopwg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hBkzV-0005pQ-Pr; Wed, 03 Apr 2019 18:52:05 +0000 Received: from emh03.mail.saunalahti.fi ([62.142.5.109]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hBkzR-0005ld-RO for linux-arm-kernel@lists.infradead.org; Wed, 03 Apr 2019 18:52:03 +0000 Received: from localhost.localdomain (85-76-9-223-nat.elisa-mobile.fi [85.76.9.223]) by emh03.mail.saunalahti.fi (Postfix) with ESMTP id E14A440087; Wed, 3 Apr 2019 21:51:58 +0300 (EEST) From: Aaro Koskinen To: Mark Rutland , Lorenzo Pieralisi , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] drivers: firmware: psci: add support for warm reset Date: Wed, 3 Apr 2019 21:51:23 +0300 Message-Id: <20190403185123.15873-1-aaro.koskinen@iki.fi> X-Mailer: git-send-email 2.17.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190403_115202_061115_3B5329B2 X-CRM114-Status: GOOD ( 12.31 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Aaro Koskinen MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Aaro Koskinen Add support for warm reset using SYSTEM_RESET2 introduced in PSCI 1.1 specification. Signed-off-by: Aaro Koskinen --- v2: Added #define PSCI_1_1_SYSTEM_RESET_WARM. Refactored psci_probe. v1: https://marc.info/?l=linux-arm-kernel&m=155431514204495&w=2 drivers/firmware/psci.c | 42 ++++++++++++++++++++++++++++++++++----- include/uapi/linux/psci.h | 6 ++++++ 2 files changed, 43 insertions(+), 5 deletions(-) diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c index c80ec1d03274..004a394de2c3 100644 --- a/drivers/firmware/psci.c +++ b/drivers/firmware/psci.c @@ -73,6 +73,7 @@ enum psci_function { PSCI_FN_CPU_ON, PSCI_FN_CPU_OFF, PSCI_FN_MIGRATE, + PSCI_FN_SYSTEM_RESET2, PSCI_FN_MAX, }; @@ -256,6 +257,15 @@ static void psci_sys_reset(enum reboot_mode reboot_mode, const char *cmd) invoke_psci_fn(PSCI_0_2_FN_SYSTEM_RESET, 0, 0, 0); } +static void psci_sys_reset2(enum reboot_mode reboot_mode, const char *cmd) +{ + if (reboot_mode == REBOOT_WARM) + invoke_psci_fn(psci_function_id[PSCI_FN_SYSTEM_RESET2], + PSCI_1_1_SYSTEM_RESET_WARM, 0, 0); + else + psci_sys_reset(reboot_mode, cmd); +} + static void psci_sys_poweroff(void) { invoke_psci_fn(PSCI_0_2_FN_SYSTEM_OFF, 0, 0, 0); @@ -564,6 +574,20 @@ static void __init psci_0_2_set_functions(void) pm_power_off = psci_sys_poweroff; } +static void __init psci_1_1_set_functions(void) +{ + int sys_reset2; + int feature; + + sys_reset2 = PSCI_FN_NATIVE(1_1, SYSTEM_RESET2); + feature = psci_features(sys_reset2); + + if (feature != PSCI_RET_NOT_SUPPORTED) { + psci_function_id[PSCI_FN_SYSTEM_RESET2] = sys_reset2; + arm_pm_restart = psci_sys_reset2; + } +} + /* * Probe function for PSCI firmware versions >= 0.2 */ @@ -584,11 +608,19 @@ static int __init psci_probe(void) psci_init_migrate(); - if (PSCI_VERSION_MAJOR(ver) >= 1) { - psci_init_smccc(); - psci_init_cpu_suspend(); - psci_init_system_suspend(); - } + if (ver < PSCI_VERSION(1, 0)) + return 0; + + /* PSCI 1.0 setup */ + psci_init_smccc(); + psci_init_cpu_suspend(); + psci_init_system_suspend(); + + if (ver < PSCI_VERSION(1, 1)) + return 0; + + /* PSCI 1.1 setup */ + psci_1_1_set_functions(); return 0; } diff --git a/include/uapi/linux/psci.h b/include/uapi/linux/psci.h index b3bcabe380da..bf5a90c05e79 100644 --- a/include/uapi/linux/psci.h +++ b/include/uapi/linux/psci.h @@ -52,6 +52,12 @@ #define PSCI_1_0_FN64_SYSTEM_SUSPEND PSCI_0_2_FN64(14) +#define PSCI_1_1_FN_SYSTEM_RESET2 PSCI_0_2_FN(18) +#define PSCI_1_1_FN64_SYSTEM_RESET2 PSCI_0_2_FN64(18) + +/* PSCI v1.1 parameter values for SYSTEM_RESET2 */ +#define PSCI_1_1_SYSTEM_RESET_WARM 0 + /* PSCI v0.2 power state encoding for CPU_SUSPEND function */ #define PSCI_0_2_POWER_STATE_ID_MASK 0xffff #define PSCI_0_2_POWER_STATE_ID_SHIFT 0