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: 11983573 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.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 73B11C4361B for ; Sat, 19 Dec 2020 14:38:24 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 37DBC2226A for ; Sat, 19 Dec 2020 14:38:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 37DBC2226A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+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=merlin.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=tR3WkjdYG3aqc3JLG256Jnr/e1nHz1ClGcWN+Rs4Ayc=; b=UjslZBHS7S6vh+/cCnVrEhMC3 nFQlJY3twKW4pb66CjIqWsT8ieazaE55xPojQ9NSc9SwuuZjefQGtJl23/d/4EQztjNDNpq0H7R9a gpBuUAnn9g+5VPFSLfWK7XN7HfZDHOjmq5WTQtH1/+O97y44Mb8TSyZaxVoeSWKIz37uR47/kAJ1w D96KGBXXZBxv6PghzJ7IpE29vIlj8pYsZdvEuFycxCjjq0v3wyNIT5LAWRPRQJcTDA3Hz0wqnqseq 99b84qw4FvEKFVA2ErqSbs3mBnDQ+e1fvk7qa/UKEiWk9yClFxp3cN74a+4BIsLJkcsA7R9poNTEs wJety0idQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kqdM7-0007RJ-MD; Sat, 19 Dec 2020 14:37:11 +0000 Received: from www.zeus03.de ([194.117.254.33] helo=mail.zeus03.de) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kqdM3-0007Pu-FA for linux-arm-kernel@lists.infradead.org; Sat, 19 Dec 2020 14:37:09 +0000 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 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201219_093707_924591_3608AB8C X-CRM114-Status: GOOD ( 12.24 ) 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: linux-renesas-soc@vger.kernel.org, Wolfram Sang , Will Deacon , linux-kernel@vger.kernel.org, Catalin Marinas Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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: 11983575 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.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 1038BC4361B for ; Sat, 19 Dec 2020 14:38:31 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 C6BE52226A for ; Sat, 19 Dec 2020 14:38:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C6BE52226A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+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=merlin.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=rH+kckZ3nMCftgKKJJk1zfeZpub0k88ncxdywyuLDkU=; b=EDuyIUkn/wJOVwS4AEJ+Fblzt SAbffqPoDa/i/NlFTJHdcv+NFWBxGUejfqGE5yuL9AMzRN9I4XD12sjngEEcxSAib5RZwhCPzShM3 hLi7NkCnJszkIlMGDV5w13Ya/K/aLiQ1ygB5h17pOdK8fjTrXXtVlxvLOqAvBcjZd4wVp33QkAjdX b3kgj4SF8r2nK+JRUmZpVajnoLThx1nvBFvfRc/qBa1gLgs/fYs/uYDQmxaS84+WUhLvJzJAwaS0i +rxG0LGJ++XXw7/ZKI9o3UvFWLkOj2CaJw1k8KVFSwy7r1O2baXyTFabmk8Tf3Y7hAK0/I/XA0g1W 5y/XEGAag==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kqdM9-0007RY-D5; Sat, 19 Dec 2020 14:37:13 +0000 Received: from www.zeus03.de ([194.117.254.33] helo=mail.zeus03.de) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kqdM3-0007Ps-Ng for linux-arm-kernel@lists.infradead.org; Sat, 19 Dec 2020 14:37:09 +0000 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 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201219_093708_052063_2587E583 X-CRM114-Status: GOOD ( 11.14 ) 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: linux-renesas-soc@vger.kernel.org, Wolfram Sang , Will Deacon , linux-kernel@vger.kernel.org, Catalin Marinas Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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); }