Skip to content

Conversation

@opsiff
Copy link
Member

@opsiff opsiff commented Feb 6, 2025

stable inclusion
from mainline-v6.6.76
category: bugfix

[ Upstream commit 09471d8 ]

The TOY_MATCH0_REG should be cleared to 0 in the RTC interrupt handler, otherwise the interrupt cannot be cleared, which will cause the loongson_rtc_isr() to be triggered multiple times.

The previous code cleared TOY_MATCH0_REG in the loongson_rtc_handler(), which is an ACPI interrupt. This did not prevent loongson_rtc_isr() from being triggered multiple times.

This commit moves the clearing of TOY_MATCH0_REG to the loongson_rtc_isr() to ensure that the interrupt is properly cleared.

Fixes: 1b733a9 ("rtc: Add rtc driver for the Loongson family chips")

Reviewed-by: Huacai Chen chenhuacai@loongson.cn
Reviewed-by: Keguang Zhang keguang.zhang@gmail.com # on LS1B
Tested-by: Keguang Zhang keguang.zhang@gmail.com
Link: https://lore.kernel.org/r/20241205114307.1891418-1-wangming01@loongson.cn

Summary by Sourcery

Bug Fixes:

  • Fix an issue where the RTC interrupt was not being cleared, causing the loongson_rtc_isr() handler to be triggered multiple times.

stable inclusion
from mainline-v6.6.76
category: bugfix

[ Upstream commit 09471d8 ]

The TOY_MATCH0_REG should be cleared to 0 in the RTC interrupt handler,
otherwise the interrupt cannot be cleared, which will cause the
loongson_rtc_isr() to be triggered multiple times.

The previous code cleared TOY_MATCH0_REG in the loongson_rtc_handler(),
which is an ACPI interrupt. This did not prevent loongson_rtc_isr()
from being triggered multiple times.

This commit moves the clearing of TOY_MATCH0_REG to the
loongson_rtc_isr() to ensure that the interrupt is properly cleared.

Fixes: 1b733a9 ("rtc: Add rtc driver for the Loongson family chips")
Signed-off-by: Ming Wang <wangming01@loongson.cn>
Reviewed-by: Huacai Chen <chenhuacai@loongson.cn>
Reviewed-by: Keguang Zhang <keguang.zhang@gmail.com> # on LS1B
Tested-by: Keguang Zhang <keguang.zhang@gmail.com>
Link: https://lore.kernel.org/r/20241205114307.1891418-1-wangming01@loongson.cn
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
@sourcery-ai
Copy link

sourcery-ai bot commented Feb 6, 2025

Reviewer's Guide by Sourcery

The pull request moves the clearing of the TOY_MATCH0_REG register from the ACPI interrupt handler (loongson_rtc_handler) to the RTC interrupt handler (loongson_rtc_isr) to ensure the RTC interrupt is properly cleared, preventing it from being triggered multiple times.

Sequence diagram showing the updated RTC interrupt handling flow

sequenceDiagram
    participant Hardware as RTC Hardware
    participant ISR as loongson_rtc_isr
    participant Handler as loongson_rtc_handler

    Hardware->>ISR: RTC Interrupt
    activate ISR
    ISR->>ISR: Update RTC IRQ
    ISR->>ISR: Clear TOY_MATCH0_REG
    ISR-->>Hardware: Interrupt Handled
    deactivate ISR

    Note over Hardware,Handler: ACPI Interrupt Path
    Hardware->>Handler: ACPI Interrupt
    activate Handler
    Handler->>Handler: Clear PM1_STS_REG
    Handler-->>Hardware: Interrupt Handled
    deactivate Handler
Loading

File-Level Changes

Change Details Files
Moved clearing of TOY_MATCH0_REG to loongson_rtc_isr()
  • Moved the regmap_write(priv->regmap, TOY_MATCH0_REG, 0) call from loongson_rtc_handler() to loongson_rtc_isr().
  • Removed the regmap_write return value from loongson_rtc_handler().
  • Added a comment explaining why TOY_MATCH0_REG is cleared in loongson_rtc_isr().
drivers/rtc/rtc-loongson.c
Modified loongson_rtc_handler() to return ACPI_INTERRUPT_HANDLED
  • Changed the return value of loongson_rtc_handler() to ACPI_INTERRUPT_HANDLED.
  • Removed the clearing of the TOY_MATCH0_REG register from this function.
drivers/rtc/rtc-loongson.c

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!
  • Generate a plan of action for an issue: Comment @sourcery-ai plan on
    an issue to generate a plan of action for it.

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@opsiff opsiff changed the title rtc: loongson: clear TOY_MATCH0_REG in loongson_rtc_isr() [Deepin-Kernel-SIG] [Upstream] [linux 6.6-y] rtc: loongson: clear TOY_MATCH0_REG in loongson_rtc_isr() Feb 6, 2025
Copy link

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

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

Hey @opsiff - I've reviewed your changes - here's some feedback:

Overall Comments:

  • The fix looks good, but ensure that ignoring the return value from regmap_write in the isr is intentional. Consider either checking the return value or adding a comment explaining why any potential failure is benign in this context.
Here's what I looked at during the review
  • 🟢 General issues: all looks good
  • 🟢 Security: all looks good
  • 🟢 Testing: all looks good
  • 🟢 Complexity: all looks good
  • 🟢 Documentation: all looks good

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

@deepin-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: sourcery-ai[bot]
Once this PR has been reviewed and has the lgtm label, please ask for approval from opsiff. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@opsiff opsiff merged commit 04f64ef into deepin-community:linux-6.6.y Feb 6, 2025
4 of 5 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