From patchwork Tue Aug 30 23:00:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Pali_Roh=C3=A1r?= X-Patchwork-Id: 601162 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B4DB3ECAAD5 for ; Tue, 30 Aug 2022 23:00:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230480AbiH3XAg (ORCPT ); Tue, 30 Aug 2022 19:00:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43486 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230093AbiH3XAd (ORCPT ); Tue, 30 Aug 2022 19:00:33 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 01F3594EC3; Tue, 30 Aug 2022 16:00:31 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 65EA7B81DFD; Tue, 30 Aug 2022 23:00:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 05FC2C433B5; Tue, 30 Aug 2022 23:00:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1661900429; bh=0mF3WeREdxfLanSbcau1tiUcnV31EVHGqWeXuYMj6NM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rpGy/AMtSAn+HdVaQW3eBPtP3Er2o0Zb7De0VP4AiuCrElIzbDKGU/KYT9JayRNvX UT8+r8Lw3vUb1kpeMceP+hqEq9aCZPMbu3uK5cK4eFae9nyyoNNNKJqUoe8JlBpBq4 40QGjDe+g1TlTYRdZKQLhNvvBc5GcCP0nm3Snjp44TsyRSGk3k8M8MlGjhfKCQ0I1F jadGksW0lC5pftJgOflyC05imd/RgKy8BMs5ikrJAttRcQr4T2TLMwj72bKMuEhAqx NGTdb4wvQX6TNFl684MKN8DWcNelpkU+3Nn0eHgRCgsoowe2MsbbeB9JSTbNFptq2K 7jZISz8ODLd6g== Received: by pali.im (Postfix) id 3CD7F834; Wed, 31 Aug 2022 01:00:26 +0200 (CEST) From: =?utf-8?q?Pali_Roh=C3=A1r?= To: Rob Herring , Krzysztof Kozlowski , Michael Ellerman Cc: devicetree@vger.kernel.org, linux-pm@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, =?utf-8?q?Mare?= =?utf-8?q?k_Beh=C3=BAn?= Subject: [PATCH v2 1/3] dt-bindings: reset: syscon-reboot: Add priority property Date: Wed, 31 Aug 2022 01:00:10 +0200 Message-Id: <20220830230012.9429-1-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220820102925.29476-1-pali@kernel.org> References: <20220820102925.29476-1-pali@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org This new optional priority property allows to specify custom priority level of reset device. Default level was always 192. Signed-off-by: Pali Rohár --- Changes in v2: * Change sint32 to int32 * Add default --- .../devicetree/bindings/power/reset/syscon-reboot.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Documentation/devicetree/bindings/power/reset/syscon-reboot.yaml b/Documentation/devicetree/bindings/power/reset/syscon-reboot.yaml index da2509724812..4c8b0d0a0111 100644 --- a/Documentation/devicetree/bindings/power/reset/syscon-reboot.yaml +++ b/Documentation/devicetree/bindings/power/reset/syscon-reboot.yaml @@ -42,6 +42,11 @@ properties: $ref: /schemas/types.yaml#/definitions/uint32 description: The reset value written to the reboot register (32 bit access). + priority: + $ref: /schemas/types.yaml#/definitions/int32 + description: Priority level of this syscon reset device. + default: 192 + required: - compatible - offset From patchwork Tue Aug 30 23:00:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Pali_Roh=C3=A1r?= X-Patchwork-Id: 601603 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 425C4ECAAD5 for ; Tue, 30 Aug 2022 23:00:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229797AbiH3XAh (ORCPT ); Tue, 30 Aug 2022 19:00:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43666 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231402AbiH3XAg (ORCPT ); Tue, 30 Aug 2022 19:00:36 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2A2F194EF2; Tue, 30 Aug 2022 16:00:35 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id BD1E6615F7; Tue, 30 Aug 2022 23:00:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0C239C433D6; Tue, 30 Aug 2022 23:00:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1661900434; bh=WsFP+jr/JWJOetQbqvy3jJUBEs3QY1vpJJXVmKgr98I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DCQd396YFLgvuF4XThnikjVixCDiSZOaINBCx35IpPqiz5QbcT7s26bFCXwG0c21e PXYKnc9IzRbYzQLOu4MHgp3h7yMs2KlNhf3ctwmo+y+NjN6n+VV/418wj5hCxyxRU8 anvOsHeViJNMXcuVXZqZGz2Y0rbQ86vampAqqeUm/jL8Td0ydG0famYqt05Say96n2 tvzCiQ0wM72LNF0wRA7nz36tYg5K2577ZzpDQKqpctjzxxue5JOkhKRfWgWmMwUH8W 87dXenm3LoEKrhWxMRzObcGi1TAJYg6TIj2Zl4qpC1OW/KSFDP5WQbks1FIIYPKQlW 7Qtad5T7pPRQw== Received: by pali.im (Postfix) id 72ECD834; Wed, 31 Aug 2022 01:00:31 +0200 (CEST) From: =?utf-8?q?Pali_Roh=C3=A1r?= To: Rob Herring , Krzysztof Kozlowski , Michael Ellerman Cc: devicetree@vger.kernel.org, linux-pm@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, =?utf-8?q?Mare?= =?utf-8?q?k_Beh=C3=BAn?= Subject: [PATCH v2 2/3] power: reset: syscon-reboot: Add support for specifying priority Date: Wed, 31 Aug 2022 01:00:11 +0200 Message-Id: <20220830230012.9429-2-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220830230012.9429-1-pali@kernel.org> References: <20220820102925.29476-1-pali@kernel.org> <20220830230012.9429-1-pali@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Read new optional device tree property priority for specifying priority level of reset handler. Default value is 192 as before. Signed-off-by: Pali Rohár --- drivers/power/reset/syscon-reboot.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/power/reset/syscon-reboot.c b/drivers/power/reset/syscon-reboot.c index 510e363381ca..45e34e6885f7 100644 --- a/drivers/power/reset/syscon-reboot.c +++ b/drivers/power/reset/syscon-reboot.c @@ -44,6 +44,7 @@ static int syscon_reboot_probe(struct platform_device *pdev) struct syscon_reboot_context *ctx; struct device *dev = &pdev->dev; int mask_err, value_err; + int priority; int err; ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL); @@ -57,6 +58,9 @@ static int syscon_reboot_probe(struct platform_device *pdev) return PTR_ERR(ctx->map); } + if (of_property_read_s32(pdev->dev.of_node, "priority", &priority)) + priority = 192; + if (of_property_read_u32(pdev->dev.of_node, "offset", &ctx->offset)) return -EINVAL; @@ -77,7 +81,7 @@ static int syscon_reboot_probe(struct platform_device *pdev) } ctx->restart_handler.notifier_call = syscon_restart_handle; - ctx->restart_handler.priority = 192; + ctx->restart_handler.priority = priority; err = register_restart_handler(&ctx->restart_handler); if (err) dev_err(dev, "can't register restart notifier (err=%d)\n", err); From patchwork Tue Aug 30 23:00:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Pali_Roh=C3=A1r?= X-Patchwork-Id: 601161 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 858E2C3DA6B for ; Tue, 30 Aug 2022 23:00:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230093AbiH3XAj (ORCPT ); Tue, 30 Aug 2022 19:00:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43618 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231514AbiH3XAh (ORCPT ); Tue, 30 Aug 2022 19:00:37 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA6C093502; Tue, 30 Aug 2022 16:00:36 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 4819461614; Tue, 30 Aug 2022 23:00:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 857A6C433D6; Tue, 30 Aug 2022 23:00:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1661900435; bh=t182bdU7U0dEHPhdYXFdbvLZ9arqgWMZzee1Mf+ZirY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hVHEzCTx1vfsL5No6e64f9sD8YRfWm+grVLiy3uxPtvkSx0h55ACTzzRJWYPsbjG0 VzHmfG+stwfgv7Y0PgUjpwUfRE8E4NsseluknbE7GjmJ1xjGndM1+Ybrq4Kqhq1ZVc XUUVPbnhDOsmDs3+qDLTRonw0YRLAfnni3a/JcSDQdvqRnSF9e+csG3CZWS0K5M4Tz nYeDxEullW4l7y3ib1VrjAH6MLIMAvZnAPmFeld/A2/5pTKqMBk+1daOPPWuL1h5bk 2o8+ajQzMax8iVEzhXdaNJhMPa84rePwhGhkssz7P+We6LuSg6QZ6nrnGsP/2kqSWP b+jClHfuQtkdQ== Received: by pali.im (Postfix) id 3DEEA1A76; Wed, 31 Aug 2022 01:00:33 +0200 (CEST) From: =?utf-8?q?Pali_Roh=C3=A1r?= To: Rob Herring , Krzysztof Kozlowski , Michael Ellerman Cc: devicetree@vger.kernel.org, linux-pm@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, =?utf-8?q?Mare?= =?utf-8?q?k_Beh=C3=BAn?= Subject: [PATCH v2 3/3] powerpc: dts: turris1x.dts: Set lower priority for CPLD syscon-reboot Date: Wed, 31 Aug 2022 01:00:12 +0200 Message-Id: <20220830230012.9429-3-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220830230012.9429-1-pali@kernel.org> References: <20220820102925.29476-1-pali@kernel.org> <20220830230012.9429-1-pali@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Due to CPLD firmware bugs, set CPLD syscon-reboot priority level to 64 (between rstcr and watchdog) to ensure that rstcr's global-utilities reset method which is preferred stay as default one, and to ensure that CPLD syscon-reboot is more preferred than watchdog reset method. Fixes: 0531a4abd1c6 ("powerpc: dts: turris1x.dts: Add CPLD reboot node") Signed-off-by: Pali Rohár --- arch/powerpc/boot/dts/turris1x.dts | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/arch/powerpc/boot/dts/turris1x.dts b/arch/powerpc/boot/dts/turris1x.dts index 69c38ed8a3a5..c189293d5a1e 100644 --- a/arch/powerpc/boot/dts/turris1x.dts +++ b/arch/powerpc/boot/dts/turris1x.dts @@ -353,11 +353,34 @@ }; reboot@d { + /* + * CPLD firmware which manages system reset and + * watchdog registers has bugs. It does not + * autoclear system reset register after change + * and watchdog ignores reset line on immediate + * succeeding reset cycle triggered by watchdog. + * These bugs have to be workarounded in U-Boot + * bootloader. So use system reset via syscon as + * a last resort because older U-Boot versions + * do not have workaround for watchdog. + * + * Reset method via rstcr's global-utilities + * (the preferred one) has priority level 128, + * watchdog has priority level 0 and default + * syscon-reboot priority level is 192. + * + * So define syscon-reboot with custom priority + * level 64 (between rstcr and watchdog) because + * rstcr should stay as default preferred reset + * method and reset via watchdog is more broken + * than system reset via syscon. + */ compatible = "syscon-reboot"; reg = <0x0d 0x01>; offset = <0x0d>; mask = <0x01>; value = <0x01>; + priority = <64>; }; led-controller@13 {