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=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 65144C10F14 for ; Tue, 15 Oct 2019 14:52:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3C8AE217D6 for ; Tue, 15 Oct 2019 14:52:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ZUjtyZ4Z" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733125AbfJOOwF (ORCPT ); Tue, 15 Oct 2019 10:52:05 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:50964 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733028AbfJOOwD (ORCPT ); Tue, 15 Oct 2019 10:52:03 -0400 Received: by mail-wm1-f68.google.com with SMTP id 5so21245848wmg.0 for ; Tue, 15 Oct 2019 07:52:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yEZBP16nHW2RPcRxavfdMwmjl1huY8K+6hT/6zFfEzs=; b=ZUjtyZ4ZeuWmh4zTLAG2FyIShRg7/OsCE25XJV+7YoQUzX6v3dSVaLIW6XVZQhKp2o afgFeVzkwjFJRFFqoyIvnX7/7PrQglJLmyZHy8cxnlw2kafXEyBpO4z+kFoOLG0dAxkY H40uVdG4/mJFb3dNs8LRX2fXFx1bHGDFoD9DbJ6Oly9r9gHXzQ8zpLhhfb+GhnSTBvaN /hzuZIhsgNFHQYUY/Ppu8Aqw2rYzXiq16RX91ShOfv/kXEK+3a1Nv7Ld8bPPJa7de+mG lcrAT7bLioSA4ZPUUrwLI9nWR4X/p1EEhZyuQ8blUWlUnsQwuXu0D/xHff5FQDC6uIDu ZcRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yEZBP16nHW2RPcRxavfdMwmjl1huY8K+6hT/6zFfEzs=; b=RIeJ4DfS2jRtaEqXjerow8WrEHr4ObMq80lC7fnKG+82nk+YUuZGCOVz1QJ3C+WQrx WDgmDRKYmbcPNz0+r70q+pcdhz/cyvZc5IMT1JhpEiSOg7MbSplT/v1Aa3OUc3bohtnc FUDS7N7y6/YRMwMGhWfWmp62PpeE+nFbQqmFqsqp0fV8d3RDxXWg6or33f4wBL7D8QSw cBhwo59stGKXuMWyFMUN/mA1gt4QpSxI6XcgWfg4SjdzsBiv82yZHFWv5rkGWujkSRet FgII6qdDcK9g4Wt8uzMh7yL+/YpaEZ3r+QqBrBuj2SLDBgFt9LbcnNGIBKJIY9eIo6Z1 k7Tg== X-Gm-Message-State: APjAAAWHpJhskttNSjwnJre2GV13nfGs35J60T8sThHlfGraka2xWdvT dx+xS6k5G+/uG+RJTSMySnjIUPvP X-Google-Smtp-Source: APXvYqyJfag8Rywn8xKOzMaRcnGItNxyVt4QbdJ54reFHlzPLxgGyeV667E9ugpTZWtOcXSEEOS8lw== X-Received: by 2002:a7b:cb0b:: with SMTP id u11mr19511255wmj.125.1571151121269; Tue, 15 Oct 2019 07:52:01 -0700 (PDT) Received: from localhost (p2E5BE2CE.dip0.t-ipconnect.de. [46.91.226.206]) by smtp.gmail.com with ESMTPSA id r10sm24764805wml.46.2019.10.15.07.51.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2019 07:52:00 -0700 (PDT) From: Thierry Reding To: Russell King , arm@kernel.org Cc: Arnd Bergmann , Olof Johansson , Guenter Roeck , Stefan Agner , Wolfram Sang , Catalin Marinas , Lorenzo Pieralisi , Stefano Stabellini , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/6] ARM: Register with kernel restart handler Date: Tue, 15 Oct 2019 16:51:45 +0200 Message-Id: <20191015145147.1106247-5-thierry.reding@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191015145147.1106247-1-thierry.reding@gmail.com> References: <20191015145147.1106247-1-thierry.reding@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Guenter Roeck By making use of the kernel restart handler, board specific restart handlers can be prioritized amongst available mechanisms for a particular board or system. Select the default priority of 128 to indicate that the restart callback in the machine description is the default restart mechanism. Acked-by: Arnd Bergmann Reviewed-by: Wolfram Sang Signed-off-by: Guenter Roeck Signed-off-by: Thierry Reding --- arch/arm/kernel/setup.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index d0a464e317ea..d403648195de 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -1073,6 +1073,20 @@ void __init hyp_mode_check(void) #endif } +static void (*__arm_pm_restart)(enum reboot_mode reboot_mode, const char *cmd); + +static int arm_restart(struct notifier_block *nb, unsigned long action, + void *data) +{ + __arm_pm_restart(action, data); + return NOTIFY_DONE; +} + +static struct notifier_block arm_restart_nb = { + .notifier_call = arm_restart, + .priority = 128, +}; + void __init setup_arch(char **cmdline_p) { const struct machine_desc *mdesc; @@ -1132,8 +1146,10 @@ void __init setup_arch(char **cmdline_p) paging_init(mdesc); request_standard_resources(mdesc); - if (mdesc->restart) - arm_pm_restart = mdesc->restart; + if (mdesc->restart) { + __arm_pm_restart = mdesc->restart; + register_restart_handler(&arm_restart_nb); + } unflatten_device_tree(); -- 2.23.0 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=-9.7 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 45994ECE588 for ; Tue, 15 Oct 2019 14:53:13 +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 1C7082054F for ; Tue, 15 Oct 2019 14:53:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="UC+P/Hmx"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ZUjtyZ4Z" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1C7082054F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.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:MIME-Version:References:In-Reply-To: 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: List-Owner; bh=jOwYtREjZUcA6evZfUXJ2QepwV45mwt298Bw3mK3jTQ=; b=UC+P/HmxAkTsnO zA25Vkg9W9LesDen7tmvrLZP2Bp2qBaqHmBKvmfx1Rh7I6pCqQPNn9GsBOXFyWeGSIiqNup/JMp9v YAgAdIaJpG6sc25YWnJVEWoPMXHdgWrXEPiNlEATrWDFElVF8zR34hVeA79jLmxtNg4u/9mCyB060 ZxopXOMuHP3E4TtSPWb/1lHY9h2Uo+ubxlPN0s/MSevuIE4NG1F85CqCRWcXYPF1GS2QiUtbpkK8R 4TBxhPz8gpqDDjdVP3d3gem84Z0ny7pMZzcN2TrjrJTM3gCb2c0FRzf95HhirmwyN/oh5hMt46jDW 51UxIsFln+0OperyAe5A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iKOCF-0003El-4f; Tue, 15 Oct 2019 14:53:11 +0000 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iKOB9-0002Eh-Qt for linux-arm-kernel@lists.infradead.org; Tue, 15 Oct 2019 14:52:05 +0000 Received: by mail-wm1-x341.google.com with SMTP id v17so20582788wml.4 for ; Tue, 15 Oct 2019 07:52:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yEZBP16nHW2RPcRxavfdMwmjl1huY8K+6hT/6zFfEzs=; b=ZUjtyZ4ZeuWmh4zTLAG2FyIShRg7/OsCE25XJV+7YoQUzX6v3dSVaLIW6XVZQhKp2o afgFeVzkwjFJRFFqoyIvnX7/7PrQglJLmyZHy8cxnlw2kafXEyBpO4z+kFoOLG0dAxkY H40uVdG4/mJFb3dNs8LRX2fXFx1bHGDFoD9DbJ6Oly9r9gHXzQ8zpLhhfb+GhnSTBvaN /hzuZIhsgNFHQYUY/Ppu8Aqw2rYzXiq16RX91ShOfv/kXEK+3a1Nv7Ld8bPPJa7de+mG lcrAT7bLioSA4ZPUUrwLI9nWR4X/p1EEhZyuQ8blUWlUnsQwuXu0D/xHff5FQDC6uIDu ZcRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yEZBP16nHW2RPcRxavfdMwmjl1huY8K+6hT/6zFfEzs=; b=VF63wMO6dn+Qxfrl7+nmaV2wvegWJlmVDKxHOlRYMoOQsHJXrTx/3juCaSGVjUTidI 0PB096c2pKS6NkHuW1ARfi9wtj1GgOr9J8N5+ZMlxTtahwiHeCMyNn4uuuIIoIL+P84T 4Ov99us4w1njqiBhUaN/6/VG/0Q+K9RSRFHwE89iGrGIVB31YG7fWtFTRthFS2C7/8/N B9NRjJjWOG84r7YCM/XnPo3JEM6XB4tHsVmVav2KkUbEfYjAMQIKElXjhUYhm0OKv/a6 FVjSvuNG9U3XNa0Yy1bm48UZOfgwCSsLuog6Bbw/fy9c2Yzv7OcO3roIt9wvgMuJnFlv jzkA== X-Gm-Message-State: APjAAAV+qT2FDZiFn7MDKN/uMPSPovAgabA4h2rqRF+Lf8L/wJg647nW nGa3swqDG7+B0yyLfv2H5mY= X-Google-Smtp-Source: APXvYqyJfag8Rywn8xKOzMaRcnGItNxyVt4QbdJ54reFHlzPLxgGyeV667E9ugpTZWtOcXSEEOS8lw== X-Received: by 2002:a7b:cb0b:: with SMTP id u11mr19511255wmj.125.1571151121269; Tue, 15 Oct 2019 07:52:01 -0700 (PDT) Received: from localhost (p2E5BE2CE.dip0.t-ipconnect.de. [46.91.226.206]) by smtp.gmail.com with ESMTPSA id r10sm24764805wml.46.2019.10.15.07.51.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2019 07:52:00 -0700 (PDT) From: Thierry Reding To: Russell King , arm@kernel.org Subject: [PATCH 4/6] ARM: Register with kernel restart handler Date: Tue, 15 Oct 2019 16:51:45 +0200 Message-Id: <20191015145147.1106247-5-thierry.reding@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191015145147.1106247-1-thierry.reding@gmail.com> References: <20191015145147.1106247-1-thierry.reding@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191015_075203_915893_BE1DAC82 X-CRM114-Status: GOOD ( 15.01 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lorenzo Pieralisi , Arnd Bergmann , Stefano Stabellini , Catalin Marinas , linux-kernel@vger.kernel.org, Stefan Agner , Wolfram Sang , linux-arm-kernel@lists.infradead.org, Olof Johansson , Guenter Roeck 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 From: Guenter Roeck By making use of the kernel restart handler, board specific restart handlers can be prioritized amongst available mechanisms for a particular board or system. Select the default priority of 128 to indicate that the restart callback in the machine description is the default restart mechanism. Acked-by: Arnd Bergmann Reviewed-by: Wolfram Sang Signed-off-by: Guenter Roeck Signed-off-by: Thierry Reding --- arch/arm/kernel/setup.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index d0a464e317ea..d403648195de 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -1073,6 +1073,20 @@ void __init hyp_mode_check(void) #endif } +static void (*__arm_pm_restart)(enum reboot_mode reboot_mode, const char *cmd); + +static int arm_restart(struct notifier_block *nb, unsigned long action, + void *data) +{ + __arm_pm_restart(action, data); + return NOTIFY_DONE; +} + +static struct notifier_block arm_restart_nb = { + .notifier_call = arm_restart, + .priority = 128, +}; + void __init setup_arch(char **cmdline_p) { const struct machine_desc *mdesc; @@ -1132,8 +1146,10 @@ void __init setup_arch(char **cmdline_p) paging_init(mdesc); request_standard_resources(mdesc); - if (mdesc->restart) - arm_pm_restart = mdesc->restart; + if (mdesc->restart) { + __arm_pm_restart = mdesc->restart; + register_restart_handler(&arm_restart_nb); + } unflatten_device_tree(); -- 2.23.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel