Skip to content

[26.04_linux-nvidia] NVIDIA: SAUCE: watchdog: sbsa_gwdt: stop ping worker during system sleep - #632

Closed
bdintakurti-nv wants to merge 1 commit into
NVIDIA:26.04_linux-nvidiafrom
bdintakurti-nv:sbsa-watchdog-stop-ping-on-suspend-26.04
Closed

bdintakurti-nv wants to merge 1 commit into
NVIDIA:26.04_linux-nvidiafrom
bdintakurti-nv:sbsa-watchdog-stop-ping-on-suspend-26.04

Conversation

@bdintakurti-nv

@bdintakurti-nv bdintakurti-nv commented Oct 7, 2026 •

Copy link
Copy Markdown

On MediaTek SBSA watchdogs in action=1 mode, the sleep notifier parks the hardware during system sleep, but the watchdog-core keepalive timer can remain armed. Its SYS_TIMER interrupt can wake MT8901 from S3 even though the hardware watchdog is parked.

This change opts only that mode into the existing watchdog-core suspend hook, canceling the ping timer and work at PM prepare and restoring the worker on resume. action=0 remains unchanged because its WS0 heartbeat workaround needs separate resume-time accounting. The watchdog core's existing prepare-to-freeze rearm window is outside this PR's scope.

Validation: On MT8901 with action=1, early_enable=1, and a 10-second timeout, three 60-second deep S3 cycles with TAD wake resumed without an early SYS_TIMER wake or watchdog reset. The boot ID was unchanged.

Follow-up to #627.

BugLink: https://bugs.launchpad.net/bugs/2169002

@nirmoy

nirmoy commented Oct 7, 2026 •

Copy link
Copy Markdown
Collaborator

BaseOS Kernel Review

Tip

✅ Review passed

No issues found across the reviewed commits.

Findings: none

🔍 Review artifacts

📦 Build checks — 🟢 4/4 passed

Note

Build reports and debs are retained for 10 days after the PR closes.

  • ⚪ PR explanation: inactive
Review metadata
  • Reviewed head: 0fa2e333e898
  • Overall status: kernel validation regression
  • Build checks: 4/4 passed

This comment is maintained by BaseOS Reviewer and updated when the GitHub watcher publishes a newer review.

@github-actions

github-actions Bot commented Oct 7, 2026 •

Copy link
Copy Markdown
Contributor

PR Validation Report

Patchscan ✅ No Missing Fixes

All cherry-picked commits checked — no missing upstream fixes found.

PR Lint ✅ All checks passed

Details
Checking 1 commits...

Cherry-pick digest:
┌──────────────┬──────────────────────────────────────────────────────────────────┬────────────┬─────────┬───────────────────────────┐
│ Local        │ Referenced upstream / Patch subject                              │ Patch-ID   │ Subject │ SoB chain                 │
├──────────────┼──────────────────────────────────────────────────────────────────┼────────────┼─────────┼───────────────────────────┤
│ 0fa2e333e898 │ [SAUCE] watchdog: sbsa_gwdt: stop mt8901 ping worker during susp │ N/A        │ N/A     │ bdintaku                  │
└──────────────┴──────────────────────────────────────────────────────────────────┴────────────┴─────────┴───────────────────────────┘

Lint: all checks passed.

@nvmochs

nvmochs commented Oct 7, 2026

Copy link
Copy Markdown
Collaborator

No issues from me for this specific commit, however I did have a review finding that I shared in sibling PR 633 that should be addressed in a follow-on fix/series (acknowledged by Bharat in that PR).

Acked-by: Matthew R. Ochs <mochs@nvidia.com>

@bdintakurti-nv
bdintakurti-nv force-pushed the sbsa-watchdog-stop-ping-on-suspend-26.04 branch 3 times, most recently from 38ebfd6 to a0966b5 Compare October 8, 2026 02:19
@nirmoy

nirmoy commented Oct 8, 2026

Copy link
Copy Markdown
Collaborator

Please add the following Fixes: trailer:

Fixes: 280db0e8cf30f4003624580b5a9f0c7a96779588 ("NVIDIA: SAUCE: watchdog: sbsa_gwdt: park the watchdog around system sleep on MediaTek implementations")

Please also wrap the commit-message body at 72 columns, keeping the Fixes: trailer on one line, and update the PR description to match the current action=1 scope.

Otherwise, this change looks fine to me.

…spend

On MediaTek SBSA watchdogs in action=1 mode, the sleep notifier
parks the hardware watchdog, but the watchdog-core keepalive timer
remains armed. Its SYS_TIMER interrupt can wake MT8901 from S3 even
though the hardware watchdog is parked.

Use the existing watchdog-core PM hook in this mode to cancel the
ping worker during system sleep and restore it on resume. Leave
action=0 unchanged: its WS0 heartbeat workaround needs separate
resume-time accounting before its core worker can be quiesced.

Fixes: 280db0e ("NVIDIA: SAUCE: watchdog: sbsa_gwdt: park the watchdog around system sleep on MediaTek implementations")
Signed-off-by: Bharat Dintakurti <bdintakurti@nvidia.com>
@bdintakurti-nv
bdintakurti-nv force-pushed the sbsa-watchdog-stop-ping-on-suspend-26.04 branch from a0966b5 to 0fa2e33 Compare October 8, 2026 12:19
@clsotog

clsotog commented Oct 8, 2026

Copy link
Copy Markdown
Collaborator

Acked-by: Carol L Soto <csoto@nvidia.com>

@nirmoy

nirmoy commented Oct 8, 2026

Copy link
Copy Markdown
Collaborator

Acked-by: Nirmoy Das <nirmoyd@nvidia.com>

@nirmoy nirmoy added has_2_acks and removed help wanted Extra attention is needed has_1_ack labels Oct 8, 2026
@nvmochs

nvmochs commented Oct 8, 2026

Copy link
Copy Markdown
Collaborator

Merged, closing PR.

ca1f359ffea2 (nresolute/main-next) NVIDIA: SAUCE: watchdog: sbsa_gwdt: stop MT8901 ping worker during suspend

@nvmochs nvmochs closed this Oct 8, 2026
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.

4 participants