drivers: watchdog: Add support for the GD32 watchdog timers #41673

soburi · 2022-01-09T14:17:28Z

This PR adds watchdog drivers for GD32.
GD32 has two types of the watchdog timer, such as

FWDGT free watchdog timer
WWDGT Window watchdog timer

This PR adds support for both types of watchdogs.

I verified with Longan Nano Board with GD32VF103.

More GD32 work #38657

martinjaeger

Thanks @soburi for this contribution. Good to see the GD32 ecosystem support grow.

Got some rather small change requests and some questions below.

drivers/watchdog/wdt_wwdgt_gd32.c

drivers/watchdog/Kconfig.gd32

drivers/watchdog/wdt_fwdgt_gd32.c

nandojve · 2022-01-14T01:02:26Z

Hi @soburi ,

Rebase and squash update commits on the originals.

soburi · 2022-01-14T01:14:18Z

Hi @soburi ,

Rebase and squash update commits on the originals.

Hi @nandojve
I was apply review comments with [Commit Suggestion] button.
I'm now working to correct this PR.
I will soon re-push.

nandojve

Hi @soburi ,

A few comments.

nandojve · 2022-01-15T17:48:57Z

drivers/watchdog/Kconfig.gd32

I would like know what is the USE_GD32_DBG Kconfig used for?

USE_GD32_DBG must be enabled to use dbg_periph_enable.

https://github.com/soburi/zephyr/blob/c4b8a0358d2c6b1b6dc1b9636a1f12890f413ced/drivers/watchdog/wdt_fwdgt_gd32.c#L77
https://github.com/soburi/zephyr/blob/c4b8a0358d2c6b1b6dc1b9636a1f12890f413ced/drivers/watchdog/wdt_wwdgt_gd32.c#L94

It is used to stop the watchdog counter at the CPU halted.

http://www.gd32mcu.com/data/documents/shujushouce/GD32VF103_User_Manual_EN_V1.2.pdf#page=1&zoom=auto,-218,842

Ok, Is this required in production? or is this only required when debugging board?

Change to set the register directly not use the vendor provided function, and removing USE_GD32_DBG.

Just a remind that the USE_GD32_DBG still there.
Note, you can keep it by adding another Kconfig variable to enable it by demand with default as disabled.

nandojve · 2022-01-15T17:51:15Z

drivers/watchdog/wdt_fwdgt_gd32.c

Try keep short lines always possible, for instance:

uint32_t ticks = (uint64_t)CONFIG_GD32_LOW_SPEED_IRC_FREQUENCY * timeout / MSEC_PER_SEC;

drivers/watchdog/wdt_fwdgt_gd32.c

nandojve · 2022-01-15T17:53:52Z

drivers/watchdog/wdt_fwdgt_gd32.c

ARG_UNUSED(channel_id); fwdgt_counter_reload(); return 0;

nandojve · 2022-01-15T17:54:48Z

drivers/watchdog/wdt_fwdgt_gd32.c

#endif return ret;

nandojve · 2022-01-15T18:03:51Z

drivers/watchdog/wdt_wwdgt_gd32.c

wwdgt_enable(); wwdgt_flag_clear(); wwdgt_interrupt_enable(); return 0;

nandojve · 2022-01-15T18:04:19Z

drivers/watchdog/wdt_wwdgt_gd32.c

wwdgt_config(counter, window, prescaler); return 0;

nandojve · 2022-01-15T18:04:41Z

drivers/watchdog/wdt_wwdgt_gd32.c

ARG_UNUSED(channel_id); wwdgt_counter_update(data->counter); return 0;

nandojve · 2022-01-15T18:05:06Z

drivers/watchdog/wdt_wwdgt_gd32.c

wwdgt_flag_clear(); if (data->callback) { data->callback(dev, 0); }

nandojve · 2022-01-15T18:08:38Z

samples/drivers/watchdog/src/main.c

You are doing more than simple add overlay files. I think you should explain better at commit message why you are changing the example or split the changes.

I got it. Splitting this commit.

fkokosinski · 2022-09-22T08:55:21Z

Hi @soburi, you seem to have introduced undefined references to log_output_flush in your code and some minor style issues, which is why the CI now fails.

Add options about Internal RC(IRC) oscillator. - GD32_HAS_IRC_32K/40K indicates IRC types. - GD32_LOW_SPEED_IRC_FREQUENCY is the numeric value of frequency Signed-off-by: TOKITA Hiroshi <[email protected]>

Add GD32_DBG_SUPPORT options to enable HAL debug functions. Signed-off-by: TOKITA Hiroshi <[email protected]>

Add support for GD32 Free watchdog timer. Signed-off-by: TOKITA Hiroshi <[email protected]>

soburi · 2022-09-24T04:28:17Z

Hi, @fkokosinski

Hi @soburi, you seem to have introduced undefined references to log_output_flush in your code and some minor style issues, which is why the CI now fails.

Rebase and fix CI failure done.

gmarull

one last nitpick, thanks for this work

gmarull · 2022-09-27T08:31:18Z

dts/bindings/watchdog/gd,gd32-wwdgt.yaml

nit: resets required true missing

It is significant issue!
Fixed it.

Add support for GD32 Window watchdog timer. Signed-off-by: TOKITA Hiroshi <[email protected]>

Add watchdog node for GD32 series SoC's dts files. Signed-off-by: TOKITA Hiroshi <[email protected]>

Enable watchdog in each GD32 implemented board. Add the watchdog function as a supported function in each yaml files. Signed-off-by: TOKITA Hiroshi <[email protected]>

Add support for boards that implement GD32 SoC. Overlay file for longan_nano_lite enables FWDGT. Add WDT_FEED_INTERVAL to make adjustable the execution cycle of wdt_feed(). And also, make waiting for the WDT_FEED_INTERVAL period for the watchdog window opens at the start of the test. Signed-off-by: TOKITA Hiroshi <[email protected]>

Enable watchdog tests for boards that implement GD32 SoC. Signed-off-by: TOKITA Hiroshi <[email protected]>

nandojve

Thank you @soburi !

soburi requested review from kgugala, nandojve, nashif and pgielda as code owners January 9, 2022 14:17

github-actions bot added area: Devicetree area: Devicetree Binding PR modifies or adds a Device Tree binding area: Samples Samples area: Watchdog Watchdog labels Jan 9, 2022

soburi force-pushed the gd32_watchdog branch from 82c1c5a to 074bacc Compare January 9, 2022 14:27

zephyrbot added platform: GD32 area: Build System labels Jan 10, 2022

zephyrbot requested review from SebastianBoe, galak, gmarull, katsuster, martinjaeger, mbolivar-nordic and tejlmand January 10, 2022 13:40

zephyrbot assigned nandojve Jan 10, 2022

martinjaeger requested changes Jan 10, 2022

View reviewed changes

SebastianBoe removed their request for review January 11, 2022 08:42

nandojve mentioned this pull request Jan 12, 2022

[RFC] GigaDevice Vendor Support #38657

Open

55 tasks

nandojve added the platform: GigaDevice label Jan 14, 2022

github-actions bot added the area: Modules label Jan 15, 2022

soburi force-pushed the gd32_watchdog branch from 83018a0 to c4b8a03 Compare January 15, 2022 04:40

soburi requested a review from martinjaeger January 15, 2022 05:17

nandojve requested changes Jan 15, 2022

View reviewed changes

soburi force-pushed the gd32_watchdog branch from c4b8a03 to 7a17b90 Compare January 17, 2022 22:47

soburi force-pushed the gd32_watchdog branch 2 times, most recently from f61ac4a to 3f6b5d8 Compare September 17, 2022 03:49

soburi requested review from gmarull and nandojve September 17, 2022 10:20

gmarull added this to the v3.3.0 milestone Sep 19, 2022

soburi added 3 commits September 23, 2022 18:40

modules: Add IRC configurations

69fc75a

Add options about Internal RC(IRC) oscillator. - GD32_HAS_IRC_32K/40K indicates IRC types. - GD32_LOW_SPEED_IRC_FREQUENCY is the numeric value of frequency Signed-off-by: TOKITA Hiroshi <[email protected]>

modules: Add option for enabling HAL debug functions

ac7144f

Add GD32_DBG_SUPPORT options to enable HAL debug functions. Signed-off-by: TOKITA Hiroshi <[email protected]>

drivers: watchdog: Add GD32 Free watchdog timer driver

eb7510e

Add support for GD32 Free watchdog timer. Signed-off-by: TOKITA Hiroshi <[email protected]>

soburi force-pushed the gd32_watchdog branch 3 times, most recently from 9fffdb5 to a648877 Compare September 23, 2022 11:05

fkokosinski previously approved these changes Sep 26, 2022

View reviewed changes

gmarull reviewed Sep 27, 2022

View reviewed changes

soburi added 5 commits October 2, 2022 19:56

drivers: watchdog: Add GD32 Window watchdog timer driver

b12582f

Add support for GD32 Window watchdog timer. Signed-off-by: TOKITA Hiroshi <[email protected]>

dts: Add watchdog configuration for GD32 SoCs

a677851

Add watchdog node for GD32 series SoC's dts files. Signed-off-by: TOKITA Hiroshi <[email protected]>

boards: Enable watchdog node for boards that implements GD32 SoCs

d1b6f53

Enable watchdog in each GD32 implemented board. Add the watchdog function as a supported function in each yaml files. Signed-off-by: TOKITA Hiroshi <[email protected]>

tests: drivers: watchdog: Add support for GD32 SoCs

c4474e7

Enable watchdog tests for boards that implement GD32 SoC. Signed-off-by: TOKITA Hiroshi <[email protected]>

soburi dismissed fkokosinski’s stale review via c4474e7 October 2, 2022 11:02

soburi force-pushed the gd32_watchdog branch from a648877 to c4474e7 Compare October 2, 2022 11:02

soburi requested a review from gmarull October 3, 2022 01:57

gmarull approved these changes Oct 3, 2022

View reviewed changes

gmarull requested a review from fkokosinski October 3, 2022 06:37

fkokosinski approved these changes Oct 3, 2022

View reviewed changes

nandojve approved these changes Oct 3, 2022

View reviewed changes

carlescufi merged commit 6bbd2b2 into zephyrproject-rtos:main Oct 3, 2022

soburi deleted the gd32_watchdog branch October 3, 2022 21:24

soburi mentioned this pull request Feb 10, 2023

doc: release: 3.3: add GigaDevice GD32 changes #54644

Merged

drivers: watchdog: Add support for the GD32 watchdog timers #41673

drivers: watchdog: Add support for the GD32 watchdog timers #41673

Uh oh!

Conversation

soburi commented Jan 9, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

martinjaeger left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

nandojve commented Jan 14, 2022

Uh oh!

soburi commented Jan 14, 2022

Uh oh!

nandojve left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

fkokosinski commented Sep 22, 2022

Uh oh!

soburi commented Sep 24, 2022

Uh oh!

gmarull left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nandojve left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

soburi commented Jan 9, 2022 •

edited

Loading