Skip to content

[action] [PR:28518] [nexthop] watchdog implementation: temporary workaround to arm 2 watchdogs - #2883

Merged
bingwang-ms merged 1 commit into
Azure:202512from
mssonicbld:cherry/msft-202512/28518
Aug 7, 2026
Merged

[action] [PR:28518] [nexthop] watchdog implementation: temporary workaround to arm 2 watchdogs#2883
bingwang-ms merged 1 commit into
Azure:202512from
mssonicbld:cherry/msft-202512/28518

Conversation

@mssonicbld

Copy link
Copy Markdown
Collaborator

Why I did it

This is a temporary workaround to arm hardware watchdog that triggers power cycle. The workaround is needed until full SW support of both watchdog 1 and 2.

Also updates the arm value to 300 seconds as this is what platform_tests
/test_hw_watchdog.py
expects

Work item tracking
  • Microsoft ADO (number only):

How I did it

Arm watchdog 2 by writing to 0x1d8 register before arming watchdog 1.

How to verify it

Arm watchdog using watchdogutil. sonic-mgmt test tests/platform_tests/api/test_watchdog.py

Which release branch to backport (provide reason below if selected)

  • 202305
  • 202311
  • 202405
  • 202411
  • 202505
  • 202511
  • 202512
  • 202605
  • 202608

Tracking issue/work item for backport/cherry-pick request (GitHub issue or Microsoft ADO):
Failure type:

Tested branch

  • master
  • 202305
  • 202311
  • 202405
  • 202411
  • 202505
  • 202511
  • 202512
  • 202605
  • 202608
  • N/A

Test result

sudo watchdogutil status
sudo watchdogutil arm -s 10
sudo watchdogutil status
sudo watchdogutil disarm

Description for the changelog

Link to config_db schema for YANG module changes

Signed-off-by: Sonic Build Admin sonicbld@microsoft.com

A picture of a cute animal (not mandatory but encouraged)

…hdogs

#### Why I did it

This is a temporary workaround to arm hardware watchdog that triggers power cycle. The workaround is needed until full SW support of both watchdog 1 and 2.

Also updates the arm value to 300 seconds as this is what [platform_tests
/test_hw_watchdog.py](https://github.com/sonic-net/sonic-mgmt/blob/7a73917c813d20b62e72e47a15d9c4825fe8c2f8/tests/platform_tests/test_hw_watchdog.py#L90) expects

##### Work item tracking
- Microsoft ADO **(number only)**:

#### How I did it

Arm watchdog 2 by writing to `0x1d8` register before arming watchdog 1.

#### How to verify it

Arm watchdog using `watchdogutil`. sonic-mgmt test `tests/platform_tests/api/test_watchdog.py`

#### Which release branch to backport (provide reason below if selected)

<!--
- Note we only backport fixes to a release branch, *not* features!
- Please also provide a reason for the backporting below.
- e.g.
- [x] 202006
-->

- [ ] 202305
- [ ] 202311
- [ ] 202405
- [ ] 202411
- [ ] 202505
- [x] 202511
- [x] 202512
- [x] 202605
- [ ] 202608

Tracking issue/work item for backport/cherry-pick request (GitHub issue or Microsoft ADO):
Failure type: <!-- day-one issue / regression / other -->

#### Tested branch

<!--
- Select each branch where the change was tested.
- If you request a backport/cherry-pick, select the base branch and the tested
  target release branch(es).
-->

- [x] master
- [ ] 202305
- [ ] 202311
- [ ] 202405
- [ ] 202411
- [ ] 202505
- [x] 202511
- [x] 202512
- [x] 202605
- [ ] 202608
- [ ] N/A

#### Test result

```
sudo watchdogutil status
sudo watchdogutil arm -s 10
sudo watchdogutil status
sudo watchdogutil disarm
```

#### Description for the changelog
<!--
Write a short (one line) summary that describes the changes in this
pull request for inclusion in the changelog:
-->

<!--
 Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU.
-->

#### Link to config_db schema for YANG module changes
<!--
Provide a link to config_db schema for the table for which YANG model
is defined
Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md
-->

Signed-off-by: Sonic Build Admin <sonicbld@microsoft.com>

#### A picture of a cute animal (not mandatory but encouraged)
@mssonicbld

Copy link
Copy Markdown
Collaborator Author

Original PR: sonic-net/sonic-buildimage#28518

@mssonicbld

Copy link
Copy Markdown
Collaborator Author

/azp run

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines:
There may be pipelines that require an authorized user to comment /azp run to run.

@bingwang-ms
bingwang-ms merged commit 6f75293 into Azure:202512 Aug 7, 2026
4 checks passed
@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines:
Successfully started running 1 pipeline(s).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants