From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_NEOMUTT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6EA68C4360F for ; Wed, 3 Apr 2019 03:33:29 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3AFA320830 for ; Wed, 3 Apr 2019 03:33:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="LA1zH/Sy" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3AFA320830 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=OJXfW8mMR7dNmnWz1v+5IZikqsHONwJ3g+cntfSWqvk=; b=LA1zH/SyDhonlV 5RWHl58mzmwfjMR0oJdki8X1nhNMibEPXMApWvXiDsHkrtgBezz9T6fKOrrGfnqO42wdDuQZ0l+Bi myz1xAg5L1bphNpKHqmX2gAyA2Q0spKSYzMC7KhBAQBk3Qiwks8dLpuvjWm3gPevZRBUSH7ZiYvRQ YEUuZDDNnblgZC1LzCC49qCeYn2YWmC+pSa3Bl5n1W2Sj4wRvoV/5yXYMS8connVgom39rUgC5F51 MMaimzqa+48wkJKW/KBYfdqG7d87qB0lqT46e93/Ub/dfjRLrKfDc+4AE/xaQbZ028IUnVpinEJyq zzGRLecqPcpW2H3ov37Q==; 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 1hBWeT-0007B7-9X; Wed, 03 Apr 2019 03:33:25 +0000 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70] helo=foss.arm.com) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hBWeQ-0007AP-CM for linux-arm-kernel@lists.infradead.org; Wed, 03 Apr 2019 03:33:23 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id EE52A80D; Tue, 2 Apr 2019 20:33:21 -0700 (PDT) Received: from blommer (usa-sjc-mx-foss1.foss.arm.com [217.140.101.70]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id DFBD03F721; Tue, 2 Apr 2019 20:33:19 -0700 (PDT) Date: Wed, 3 Apr 2019 04:33:15 +0100 From: Mark Rutland To: Aaro Koskinen Subject: Re: [PATCH] drivers: firmware: psci: add support for warm reset Message-ID: <20190403033314.k2wqxkm5c7imhtu5@blommer> References: <20190401181443.6459-1-aaro.koskinen@iki.fi> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20190401181443.6459-1-aaro.koskinen@iki.fi> User-Agent: NeoMutt/20170113 (1.7.2) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190402_203322_430478_9C88FBB2 X-CRM114-Status: GOOD ( 20.83 ) 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: Lorenzo Pieralisi , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Aaro Koskinen Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Apr 01, 2019 at 09:14:43PM +0300, Aaro Koskinen wrote: > From: Aaro Koskinen > > Add support for warm reset using SYSTEM_RESET2 introduced in PSCI > 1.1 specification. For reference, how do you intend to use this? > > Signed-off-by: Aaro Koskinen > --- > drivers/firmware/psci.c | 25 +++++++++++++++++++++++++ > include/uapi/linux/psci.h | 3 +++ > 2 files changed, 28 insertions(+) > > diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c > index c80ec1d03274..1d95b5f6d403 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,14 @@ 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], 0, 0, 0); > + else > + psci_sys_reset(reboot_mode, cmd); > +} What happens when RESET2 isn't available, but the user requests s REBOOT_WARM reset? It looks like we'd invoke a bogus SMC. Could we please add a preprocessor definition for SYSTEM_RESET_WARM so that it's clear that we're passing a parameter here? > + > static void psci_sys_poweroff(void) > { > invoke_psci_fn(PSCI_0_2_FN_SYSTEM_OFF, 0, 0, 0); > @@ -564,6 +573,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 > */ > @@ -588,6 +611,8 @@ static int __init psci_probe(void) > psci_init_smccc(); > psci_init_cpu_suspend(); > psci_init_system_suspend(); > + if (PSCI_VERSION_MINOR(ver) >= 1) > + psci_1_1_set_functions(); > } If we're going to add more things to this chain, can we please refactor this as: if (ver < PSCI_VERSION(1, 0)) return; /* PSCI 1.0 setup here */ if (ver < PSCI_VERSION(1,1)) return; /* PSCI 1.1 setup here */ ... as that saves on indentation and is easier to extend in future. Thanks, Mark _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel