Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert kernel patch causing USB 3 and PCIe breakage on ODROID-M1/M1S #3843

Merged
merged 1 commit into from
Jan 30, 2025

Conversation

sairon
Copy link
Member

@sairon sairon commented Jan 29, 2025

Revert the patch changing phy reset behavior, requiring also changes in the device tree that are missing in the stable backport. The issue was reported to the regressions mailing list and hopefully future patch release should contain a proper fix.

The patch is added to the patches-rockchip directory, potentially affecting Green as well, although the broken peripherals are not used there.

Fixes #3837, fixes #3841

Summary by CodeRabbit

  • Revert
    • Reverted a previous PHY reset patch for Rockchip naneng-combphy driver
    • Addresses regressions in USB3 and PCIe functionality on ODROID-M1 and ODROID-M1S devices

Revert the patch changing phy reset behavior, requiring also changes in the
device tree that are missing in the stable backport. The issue was reported to
the regressions mailing list and hopefully future patch release should contain
a proper fix.

The patch is added to the patches-rockchip directory, potentially affecting
Green as well, although the broken peripherals are not used there.

Fixes #3837, fixes #3841
@sairon sairon added board/odroid Hardkernel's ODROID Boards linux Linux kernel related issue labels Jan 29, 2025
@sairon sairon requested a review from agners January 29, 2025 15:39
Copy link

coderabbitai bot commented Jan 29, 2025

📝 Walkthrough

Walkthrough

The pull request involves reverting a previous patch in the Rockchip naneng-combphy driver for Linux. The change modifies how the PHY reset control is obtained, switching from devm_reset_control_get(dev, "phy") to devm_reset_control_array_get_exclusive(dev). This reversion aims to address regressions in USB3 and PCIe functionality on ODROID-M1 and ODROID-M1S devices that occurred after a previous fix was applied.

Changes

File Change Summary
buildroot-external/patches-rockchip/linux/0004-Revert-phy-rockchip-naneng-combphy-fix-phy-reset.patch Reverts previous PHY reset control implementation
drivers/phy/rockchip/phy-rockchip-naneng-combphy.c Modified PHY reset control method from devm_reset_control_get() to devm_reset_control_array_get_exclusive()

Assessment against linked issues

Objective Addressed Explanation
Resolve SATA M2 drive unavailability [#3837] Potential impact on storage functionality unclear
Fix USB 3 ports not working [#3841] Directly addresses USB3 functionality regression

The patch appears to primarily target the USB3 port functionality issue, with potential secondary benefits for overall device connectivity. The reversion of the previous PHY reset control implementation suggests an attempt to restore previous stable behavior for the ODROID-M1 and M1S devices.


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between fbd5c2c and 8d42bef.

📒 Files selected for processing (1)
  • buildroot-external/patches-rockchip/linux/0004-Revert-phy-rockchip-naneng-combphy-fix-phy-reset.patch (1 hunks)
🔇 Additional comments (3)
buildroot-external/patches-rockchip/linux/0004-Revert-phy-rockchip-naneng-combphy-fix-phy-reset.patch (3)

1-19: Well-structured commit message with clear rationale.

The commit message follows kernel patch guidelines and properly documents:

  • The reason for the revert (USB3/PCIe regression)
  • Affected devices (ODROID-M1/M1S)
  • Link to regression report
  • Clear indication this is temporary until upstream fix

30-31: LGTM! Error handling remains robust.

The error handling is maintained with proper error checking and a descriptive error message.


28-29: Verify device tree compatibility after reset control API change.

The change from devm_reset_control_get(dev, "phy") to devm_reset_control_array_get_exclusive(dev) reverts to using all available resets instead of a specific named reset. This restores compatibility with existing device trees that don't have the "phy" reset explicitly defined.

Run the following script to verify the device tree compatibility:


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai or @coderabbitai title anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@sairon sairon merged commit f56130a into dev Jan 30, 2025
3 checks passed
@sairon sairon deleted the fix-rockchip-phy-regression branch January 30, 2025 10:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
board/odroid Hardkernel's ODROID Boards cla-signed linux Linux kernel related issue
Projects
None yet
2 participants