| Message ID | 20221226114513.4569-1-pali@kernel.org |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
| Series | [v4,1/3] dt-bindings: reset: syscon-reboot: Add priority property | expand |
| Context | Check | Description |
|---|---|---|
| robh/checkpatch | success | |
| robh/patch-applied | success | |
| robh/dt-meta-schema | fail | build log |
On 26/12/2022 12:45, Pali Rohár wrote: > This new optional priority property allows to specify custom priority level > of reset device. Prior this change priority level was hardcoded to 192 and > not possible to specify or change. Specifying other value is needed for > some boards. Default level when not specified stays at 192 as before. > > Signed-off-by: Pali Rohár <pali@kernel.org> > > --- > Changes in v4: > * Use restart-handler.yaml Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Best regards, Krzysztof
On Mon, 26 Dec 2022 12:45:11 +0100, Pali Rohár wrote: > This new optional priority property allows to specify custom priority level > of reset device. Prior this change priority level was hardcoded to 192 and > not possible to specify or change. Specifying other value is needed for > some boards. Default level when not specified stays at 192 as before. > > Signed-off-by: Pali Rohár <pali@kernel.org> > > --- > Changes in v4: > * Use restart-handler.yaml > > Changes in v3: > * Add explanation into commit message > > Changes in v2: > * Change sint32 to int32 > * Add default > --- > .../devicetree/bindings/power/reset/syscon-reboot.yaml | 6 ++++++ > 1 file changed, 6 insertions(+) > My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' on your patch (DT_CHECKER_FLAGS is new in v5.13): yamllint warnings/errors: ./Documentation/devicetree/bindings/power/reset/syscon-reboot.yaml:57:1: [error] duplication of key "allOf" in mapping (key-duplicates) dtschema/dtc warnings/errors: make[1]: *** Deleting file 'Documentation/devicetree/bindings/power/reset/syscon-reboot.example.dts' Documentation/devicetree/bindings/power/reset/syscon-reboot.yaml:57:1: found duplicate key "allOf" with value "[]" (original value: "[]") make[1]: *** [Documentation/devicetree/bindings/Makefile:26: Documentation/devicetree/bindings/power/reset/syscon-reboot.example.dts] Error 1 make[1]: *** Waiting for unfinished jobs.... ./Documentation/devicetree/bindings/soc/samsung/exynos-pmu.yaml: Unable to find schema file matching $id: http://devicetree.org/schemas/power/reset/syscon-reboot.yaml ./Documentation/devicetree/bindings/mfd/canaan,k210-sysctl.yaml: Unable to find schema file matching $id: http://devicetree.org/schemas/power/reset/syscon-reboot.yaml ./Documentation/devicetree/bindings/power/reset/syscon-reboot.yaml:57:1: found duplicate key "allOf" with value "[]" (original value: "[]") /builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/power/reset/syscon-reboot.yaml: ignoring, error parsing file make: *** [Makefile:1508: dt_binding_check] Error 2 doc reference errors (make refcheckdocs): Documentation/cdrom/packet-writing.rst: Documentation/ABI/testing/sysfs-class-pktcdvd Documentation/cdrom/packet-writing.rst: Documentation/ABI/testing/debugfs-pktcdvd tools/power/cpupower/man/cpupower-powercap-info.1: Documentation/power/powercap/powercap.txt See https://patchwork.ozlabs.org/project/devicetree-bindings/patch/20221226114513.4569-1-pali@kernel.org The base for the series is generally the latest rc1. A different dependency should be noted in *this* patch. If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date: pip3 install dtschema --upgrade Please check and re-submit after running the above command yourself. Note that DT_SCHEMA_FILES can be set to your schema file to speed up checking your schema. However, it must be unset to test all examples with your schema.
Reminder: Any plan how to handle these patches? On Monday 26 December 2022 12:45:11 Pali Rohár wrote: > This new optional priority property allows to specify custom priority level > of reset device. Prior this change priority level was hardcoded to 192 and > not possible to specify or change. Specifying other value is needed for > some boards. Default level when not specified stays at 192 as before. > > Signed-off-by: Pali Rohár <pali@kernel.org> > > --- > Changes in v4: > * Use restart-handler.yaml > > Changes in v3: > * Add explanation into commit message > > Changes in v2: > * Change sint32 to int32 > * Add default > --- > .../devicetree/bindings/power/reset/syscon-reboot.yaml | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/Documentation/devicetree/bindings/power/reset/syscon-reboot.yaml b/Documentation/devicetree/bindings/power/reset/syscon-reboot.yaml > index da2509724812..f721bdf63a98 100644 > --- a/Documentation/devicetree/bindings/power/reset/syscon-reboot.yaml > +++ b/Documentation/devicetree/bindings/power/reset/syscon-reboot.yaml > @@ -19,6 +19,9 @@ description: |+ > sub-node of a "syscon", "simple-mfd" node. Though the regmap property > pointing to the system controller node is also supported. > > +allOf: > + - $ref: restart-handler.yaml# > + > properties: > compatible: > const: syscon-reboot > @@ -42,6 +45,9 @@ properties: > $ref: /schemas/types.yaml#/definitions/uint32 > description: The reset value written to the reboot register (32 bit access). > > + priority: > + default: 192 > + > required: > - compatible > - offset > -- > 2.20.1 >
Hi, On Sun, Jan 22, 2023 at 12:27:44PM +0100, Pali Rohár wrote: > On Monday 26 December 2022 12:45:11 Pali Rohár wrote: > > This new optional priority property allows to specify custom priority level > > of reset device. Prior this change priority level was hardcoded to 192 and > > not possible to specify or change. Specifying other value is needed for > > some boards. Default level when not specified stays at 192 as before. > > > > Signed-off-by: Pali Rohár <pali@kernel.org> > > Reminder: Any plan how to handle these patches? Please don't top-post :) Sorry, I'm a bit slow with processing patches this cycle. Technically this was also throwing a DT warning reported by the bot, so I expected a new version. Anyways, I fixed the DT warning myself and applied patches 1-2. Thanks, -- Sebastian
On 03/02/2023 13:16, Sebastian Reichel wrote: > Hi, > > On Sun, Jan 22, 2023 at 12:27:44PM +0100, Pali Rohár wrote: >> On Monday 26 December 2022 12:45:11 Pali Rohár wrote: >>> This new optional priority property allows to specify custom priority level >>> of reset device. Prior this change priority level was hardcoded to 192 and >>> not possible to specify or change. Specifying other value is needed for >>> some boards. Default level when not specified stays at 192 as before. >>> >>> Signed-off-by: Pali Rohár <pali@kernel.org> >> >> Reminder: Any plan how to handle these patches? > > Please don't top-post :) Sorry, I'm a bit slow with processing > patches this cycle. Technically this was also throwing a DT > warning reported by the bot, so I expected a new version. Anyways, > I fixed the DT warning myself and applied patches 1-2. Everyone was expecting new version, so that checks pass. We should not take known-broken code, because then the duty to check for other errors is on you Sebastian. :) Best regards, Krzysztof
On Monday 26 December 2022 12:45:13 Pali Rohár wrote: > 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 <pali@kernel.org> May I ask who can take this 3/3 patch? powersupply or powerpc tree? > --- > 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 e9cda34a140e..c9b619f6ed5c 100644 > --- a/arch/powerpc/boot/dts/turris1x.dts > +++ b/arch/powerpc/boot/dts/turris1x.dts > @@ -367,11 +367,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 { > -- > 2.20.1 >
On Thursday 09 February 2023 01:10:21 Pali Rohár wrote: > On Monday 26 December 2022 12:45:13 Pali Rohár wrote: > > 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 <pali@kernel.org> > > May I ask who can take this 3/3 patch? powersupply or powerpc tree? + Christophe > > --- > > 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 e9cda34a140e..c9b619f6ed5c 100644 > > --- a/arch/powerpc/boot/dts/turris1x.dts > > +++ b/arch/powerpc/boot/dts/turris1x.dts > > @@ -367,11 +367,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 { > > -- > > 2.20.1 > >
Pali Rohár <pali@kernel.org> writes: > On Thursday 09 February 2023 01:10:21 Pali Rohár wrote: >> On Monday 26 December 2022 12:45:13 Pali Rohár wrote: >> > 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 <pali@kernel.org> >> >> May I ask who can take this 3/3 patch? powersupply or powerpc tree? I assume the fact that Sebastian applied patches 1 & 2 means he didn't want to take this one. So the best way to get it applied by me is to send a new version with just patch 3, with the changelog explaining that commit xxxyyy implements the property and this patch is just wiring it up. cheers
diff --git a/Documentation/devicetree/bindings/power/reset/syscon-reboot.yaml b/Documentation/devicetree/bindings/power/reset/syscon-reboot.yaml index da2509724812..f721bdf63a98 100644 --- a/Documentation/devicetree/bindings/power/reset/syscon-reboot.yaml +++ b/Documentation/devicetree/bindings/power/reset/syscon-reboot.yaml @@ -19,6 +19,9 @@ description: |+ sub-node of a "syscon", "simple-mfd" node. Though the regmap property pointing to the system controller node is also supported. +allOf: + - $ref: restart-handler.yaml# + properties: compatible: const: syscon-reboot @@ -42,6 +45,9 @@ properties: $ref: /schemas/types.yaml#/definitions/uint32 description: The reset value written to the reboot register (32 bit access). + priority: + default: 192 + required: - compatible - offset
This new optional priority property allows to specify custom priority level of reset device. Prior this change priority level was hardcoded to 192 and not possible to specify or change. Specifying other value is needed for some boards. Default level when not specified stays at 192 as before. Signed-off-by: Pali Rohár <pali@kernel.org> --- Changes in v4: * Use restart-handler.yaml Changes in v3: * Add explanation into commit message Changes in v2: * Change sint32 to int32 * Add default --- .../devicetree/bindings/power/reset/syscon-reboot.yaml | 6 ++++++ 1 file changed, 6 insertions(+)