From patchwork Sat Dec 19 14:36:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 11983569 X-Patchwork-Delegate: geert@linux-m68k.org 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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 9F246C35270 for ; Sat, 19 Dec 2020 14:37:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 878DC22CB3 for ; Sat, 19 Dec 2020 14:37:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726545AbgLSOho (ORCPT ); Sat, 19 Dec 2020 09:37:44 -0500 Received: from www.zeus03.de ([194.117.254.33]:43588 "EHLO mail.zeus03.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726559AbgLSOho (ORCPT ); Sat, 19 Dec 2020 09:37:44 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple; d=sang-engineering.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=k1; bh=At6kyUuuIMlLFa IiwmHC4gLjbNFYfaHkbGQtAT/zBpY=; b=v+HSwvVhIEB7EqsKXTKzmQzv16CANE cRU53G2Kb42m1ykUevDPajPr3v+imJgU2stKaI+lXO+RjHcdO0nCvXrsIU4U6Uro glZU6PrbrxNUcQmXqBuwwSrJ6hjjDN3kXlHeVGt1c/O9e+LMbQvov74Yyw1XN4YP jpuf6IB91spw8= Received: (qmail 4149843 invoked from network); 19 Dec 2020 15:37:01 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 19 Dec 2020 15:37:01 +0100 X-UD-Smtp-Session: l3s3148p1@SeVzKNK2erYgAwDPXwIpAOUwDQytQs2L From: Wolfram Sang To: linux-arm-kernel@lists.infradead.org Cc: linux-renesas-soc@vger.kernel.org, Wolfram Sang , Catalin Marinas , Will Deacon , linux-kernel@vger.kernel.org Subject: [PATCH 1/2] arm64: add grace period when rebooting Date: Sat, 19 Dec 2020 15:36:46 +0100 Message-Id: <20201219143648.56217-2-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201219143648.56217-1-wsa+renesas@sang-engineering.com> References: <20201219143648.56217-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org I work on a system where I currently need to reboot via watchdog. Because the watchdog needs a bit of time to fire, add a grace period like on arm32 to avoid the false positive warning message. Signed-off-by: Wolfram Sang --- arch/arm64/kernel/process.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index 6616486a58fe..3c770329364f 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -204,6 +204,9 @@ void machine_restart(char *cmd) else do_kernel_restart(cmd); + /* Give a grace period for failure to restart of 1s */ + mdelay(1000); + /* * Whoops - the architecture was unable to reboot. */ From patchwork Sat Dec 19 14:36:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 11983567 X-Patchwork-Delegate: geert@linux-m68k.org 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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 8A4ABC0018C for ; Sat, 19 Dec 2020 14:37:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 58FAD2226A for ; Sat, 19 Dec 2020 14:37:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726564AbgLSOhr (ORCPT ); Sat, 19 Dec 2020 09:37:47 -0500 Received: from www.zeus03.de ([194.117.254.33]:43602 "EHLO mail.zeus03.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726624AbgLSOho (ORCPT ); Sat, 19 Dec 2020 09:37:44 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple; d=sang-engineering.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=k1; bh=dCM+zFfix8PFto Sl76aTetpgNSznWtT79zg/CaTf1sQ=; b=S0looXZYWihUnpLtKddOm2v18vLRQF RMgHGeXZKGwexRk+i76xR6kSET/uraUGOHprPNZ+pEp12YnBP3KfTzsA3S4A+GH5 z6vowOaCfRDualCJVDaywtcJqAjgUlebSOL3KpE6ljUne2mDPpauSf2WyAOpFb50 4fpOg72UCVIXo= Received: (qmail 4149879 invoked from network); 19 Dec 2020 15:37:02 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 19 Dec 2020 15:37:02 +0100 X-UD-Smtp-Session: l3s3148p1@0el9KNK2fLYgAwDPXwIpAOUwDQytQs2L From: Wolfram Sang To: linux-arm-kernel@lists.infradead.org Cc: linux-renesas-soc@vger.kernel.org, Wolfram Sang , Catalin Marinas , Will Deacon , linux-kernel@vger.kernel.org Subject: [PATCH 2/2] arm64: proper comment formatting in reboot handler Date: Sat, 19 Dec 2020 15:36:47 +0100 Message-Id: <20201219143648.56217-3-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201219143648.56217-1-wsa+renesas@sang-engineering.com> References: <20201219143648.56217-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org This comment was probably copied from arm32 and then shortened. It fits to single line now. Signed-off-by: Wolfram Sang Reviewed-by: Geert Uytterhoeven --- arch/arm64/kernel/process.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index 3c770329364f..e68dacbc6204 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -207,9 +207,7 @@ void machine_restart(char *cmd) /* Give a grace period for failure to restart of 1s */ mdelay(1000); - /* - * Whoops - the architecture was unable to reboot. - */ + /* Whoops - the architecture was unable to reboot */ printk("Reboot failed -- System halted\n"); while (1); }