From patchwork Sat Aug 20 10:29:23 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: 598856 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 E272FC3F6B0 for ; Sat, 20 Aug 2022 10:30:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345192AbiHTKaU (ORCPT ); Sat, 20 Aug 2022 06:30:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39176 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345152AbiHTKaT (ORCPT ); Sat, 20 Aug 2022 06:30:19 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8AD68A571F; Sat, 20 Aug 2022 03:30:18 -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 sin.source.kernel.org (Postfix) with ESMTPS id E4695CE0187; Sat, 20 Aug 2022 10:30:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DEF3FC433D6; Sat, 20 Aug 2022 10:30:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660991415; bh=5Sem2MQf+IZyyC+DHcRKkeVWonfrn1+/FxE8deI3vSk=; h=From:To:Cc:Subject:Date:From; b=hKibc8kvdqgNmlTp9kiYFyYjoqFM+L8jEsJGJhvwqG7vrMIgI2qL/0S5yuxYUd6EW Q8dlCXC92YU9ZTtV33FrCbLqdJfUUuZzcIPCCArWCoKFSUB1qIEvOlulG5GUIKvTOA bCy/VhB83GoZzO+0EKAxElV7S8elnVqa9CiTuIE+Uo30kA6MYUoXRVZOz42SS+os0S cJKWKxorl62ZSjJjotc5hVfZae89Lwh6fL/ZdzUsUQgjTHZ4jthSKSHlWeTXhwUZAN pYRYJMmX/fX+RWcfG2ImisOxzxun6kTMcGDZC457RaYqe4s1jtiaSeFbKn6Jr162t7 fkL9QeItCIDkw== Received: by pali.im (Postfix) id C7E995D0; Sat, 20 Aug 2022 12:30:11 +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 1/3] dt-bindings: reset: syscon-reboot: Add priority property Date: Sat, 20 Aug 2022 12:29:23 +0200 Message-Id: <20220820102925.29476-1-pali@kernel.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@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 Acked-by: Krzysztof Kozlowski --- .../devicetree/bindings/power/reset/syscon-reboot.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Documentation/devicetree/bindings/power/reset/syscon-reboot.yaml b/Documentation/devicetree/bindings/power/reset/syscon-reboot.yaml index da2509724812..d905133aab27 100644 --- a/Documentation/devicetree/bindings/power/reset/syscon-reboot.yaml +++ b/Documentation/devicetree/bindings/power/reset/syscon-reboot.yaml @@ -42,6 +42,10 @@ 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/sint32 + description: Priority level of this syscon reset device. Default 192. + required: - compatible - offset From patchwork Sat Aug 20 10:29:24 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: 598857 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 D8A3FC32774 for ; Sat, 20 Aug 2022 10:30:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345124AbiHTKaS (ORCPT ); Sat, 20 Aug 2022 06:30:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39134 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241503AbiHTKaR (ORCPT ); Sat, 20 Aug 2022 06:30:17 -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 B408E13D58; Sat, 20 Aug 2022 03:30:16 -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 4207F6116E; Sat, 20 Aug 2022 10:30:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 72D2DC433D7; Sat, 20 Aug 2022 10:30:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660991415; bh=WsFP+jr/JWJOetQbqvy3jJUBEs3QY1vpJJXVmKgr98I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DaeyduZu9fDvkDrCMcVoiev3mBo9aSdoe+coVR7E+P9i43H/NnZa4lE94p5iHEGeA /T9Gqmc+3HRwZMOB8mVTdw3Af975yjoERP5L3eteajZpaocgCuAReN26N9vs6tyepc fi4xNlqqDb+Q1hZG39mVs6WnZQfKeL1mgPbmdFurObLi5EU/nUM9XTJai8/i++AOd+ qSngJH/Mh2gfC4MPPYa1l0oDQBD7gt/mrsPE/vaA0odvSO7ODOpzMCO3a50FJrQPbz r1uXtzztsfff9EfM6FVtOVR7eInLe4FnYeAOgYpbbJ4Mc8B0cnZ4rF+K8P4oOJz6Wp 1ildIgrKVI87A== Received: by pali.im (Postfix) id C1E5A2B8F; Sat, 20 Aug 2022 12:30:12 +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 2/3] power: reset: syscon-reboot: Add support for specifying priority Date: Sat, 20 Aug 2022 12:29:24 +0200 Message-Id: <20220820102925.29476-2-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: linux-pm@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 Sat Aug 20 10:29:25 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: 599414 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 975F5C25B08 for ; Sat, 20 Aug 2022 10:30:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241503AbiHTKaV (ORCPT ); Sat, 20 Aug 2022 06:30:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39186 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345159AbiHTKaT (ORCPT ); Sat, 20 Aug 2022 06:30:19 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D5BF7A572C; Sat, 20 Aug 2022 03:30:18 -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 90396B80B93; Sat, 20 Aug 2022 10:30:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 27155C43470; Sat, 20 Aug 2022 10:30:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660991416; bh=t182bdU7U0dEHPhdYXFdbvLZ9arqgWMZzee1Mf+ZirY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NCc7Xx617SRw8T03pXTirShIfv/L/8gUvO46Anrc5amwzv3MI6d3FBfFkKup+J7+x sywNGWX/nPsCgobgR+1Z7w3phYd/fzJRdY9Pg+UppCWvcnpWEDhJqzlCk8LavgBLBU SBq+ehrkh+qlerdjLPV9Vus5fO3yh78oEUx2QPCBCrTjUaNMMEX32m59qiBKfNWXYP clwoeiPDPS5w74K3MZr9eA8h92EkxswvILaq/47PV/YF3j3RmM/CygCnIDOO0CltIa QI4tMk7ZoAfRw+ehdyJ47bw+Ni2Mk1ze9W3pPOgVLunurp79D26okRdaibhy296yTk ECQanl+rOoeNQ== Received: by pali.im (Postfix) id BAA5E2BA5; Sat, 20 Aug 2022 12:30:13 +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 3/3] powerpc: dts: turris1x.dts: Set lower priority for CPLD syscon-reboot Date: Sat, 20 Aug 2022 12:29:25 +0200 Message-Id: <20220820102925.29476-3-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: linux-pm@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 {