Skip to content

Revert "watchdog: fixing incorrect watchdog address and details" - #926

Merged
Shiraz Hashim (shashim-quic) merged 1 commit into
qualcomm-linux:staging/nordfrom
apateriy-qcom:nord-staging-wdog
Aug 11, 2026
Merged

Shiraz Hashim (shashim-quic) merged 1 commit into
qualcomm-linux:staging/nordfrom
apateriy-qcom:nord-staging-wdog

Conversation

@apateriy-qcom

@apateriy-qcom apateriy-qcom commented Aug 9, 2026

Copy link
Copy Markdown

This reverts commit c07f7f7.

Watchdog WWDOG address was incorrect.
Changing it correct WDT address fixes kernel panic going to download mode path.

The reverted commit pointed the qcom,kpss-wdt node at WWDOG address.
The corrected address was pointed to NSEC_APSS_WDT address.

@qswat-orbit-external

Copy link
Copy Markdown

Merge Check Failed: No CR Numbers Found

Error: No Change Request numbers were found.

Please add Change Request numbers to your pull request description in the format CRs-Fixed: 12345 or link GitHub issues that are associated with Change Requests.

This reverts commit c07f7f7.

0x17821000 is APSS_WDT_NSEC_WWDOG (windowed watchdog), not the
register layout the qcom,kpss-wdt driver expects. That layout
lives at 0x17826000 (APSS_WDT_SW_NSEC_APSS_WDT), matching
reg_offset_data_kpss. With the wrong address, driver writes hit
the wrong registers, so the counter never advanced and no bite
ever occurred despite valid-looking MMIO reads. Restores
GIC_ESPI 848 to match the block at 0x17826000.

Signed-off-by: Anurag Pateriya <anurag.pateriya@oss.qualcomm.com>

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

on the other hand, let's not overdo the commit log. Do not mention things like ip catalogue etc. which is internal.

Just mention what was wrong and your revert corrects it.

@qswat-orbit-external

Copy link
Copy Markdown

Merge Check Failed: No CR Numbers Found

Error: No Change Request numbers were found.

Please add Change Request numbers to your pull request description in the format CRs-Fixed: 12345 or link GitHub issues that are associated with Change Requests.

1 similar comment
@qswat-orbit-external

Copy link
Copy Markdown

Merge Check Failed: No CR Numbers Found

Error: No Change Request numbers were found.

Please add Change Request numbers to your pull request description in the format CRs-Fixed: 12345 or link GitHub issues that are associated with Change Requests.

@shashim-quic
Shiraz Hashim (shashim-quic) merged commit 29d05ff into qualcomm-linux:staging/nord Aug 11, 2026
1 of 3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants