patch/sunxi-6.12: drop two Rockchip SPI patches (not applicable to sunxi)#9827
Conversation
…nxi)
Both patches under patches.megous/ touch drivers/spi/spi-rockchip.c
— Rockchip-only code that's never executed on Allwinner SoCs. They
were carried into the sunxi patchset as residue of megous' multi-
platform series and don't apply to current 6.12 sources (kernel
rockchip_spi_probe() drifted, hunks fail at lines 933/958/937/948/964).
Build failure visible in armbian/os run 25864949324 across both jobs
that build linux-kernel-sunxi-6.12:
- kernel-sunxi64-legacy (job 76027906041, arm64)
- kernel-sunxi-legacy (job 76027905949, armhf)
Both fail identically:
Failed to apply 2 patches:
->patches.megous/spi-rockchip-Fix-runtime-PM-and-other-issues
->patches.megous/spi-fixes
Summary: kernel patching: 458 total; 456 applied; 2 failed_apply
Dropping them is correct in three independent ways:
- they target a Rockchip SoC driver that doesn't run on sunxi,
- they don't apply to current sources (would need a rebase that
would only benefit Rockchip kernels, not us),
- the rk35xx-* kernel trees don't carry copies, so removing here
doesn't deprive any downstream of them.
The other 16 'needs_rebase' patches in the same patchset still apply
with offsets, so the kernel still builds; only these two hard-fails.
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Path: .coderabbit.yaml Review profile: CHILL Plan: Pro Run ID: 📒 Files selected for processing (2)
💤 Files with no reviewable changes (2)
📝 WalkthroughWalkthroughRemoves three patch entries from the series and applies two Rockchip SPI driver patches that refactor clock handling and runtime PM: introduce a tracked ChangesRockchip SPI driver runtime-PM and clock refactor
Patch-series (metadata) update
Sequence DiagramsequenceDiagram
participant Driver as "SPI Driver" rect rgba(100,150,240,0.5)
participant Clk as "Clock framework" rect rgba(120,200,100,0.5)
participant PM as "Runtime PM core" rect rgba(240,160,80,0.5)
participant Dev as "Device" rect rgba(200,120,180,0.5)
Dev->>Driver: probe()
Driver->>PM: devm_pm_runtime_enable()
Driver->>Clk: rockchip_spi_enable_clocks(enable)
Clk-->>Driver: ok / error
PM->>Driver: runtime_resume()
Driver->>Clk: rockchip_spi_enable_clocks(enable)
Driver->>PM: runtime_suspend()
Driver->>Clk: rockchip_spi_enable_clocks(disable)
Dev->>Driver: remove()
Driver->>Clk: rockchip_spi_enable_clocks(disable)
Estimated code review effort🎯 4 (Complex) | ⏱️ ~60 minutes Suggested reviewers
Poem
🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
Companion to the previous commit. series.conf and series.megous each listed the two .patch files we just removed; if anything ever applied patches via the series.* path (instead of the directory walk), it would hit 'patch file not found'. Strip the lines so both code paths agree.
|
✅ This PR has been reviewed and approved — all set for merge! |
What broke
armbian/os nightly run 25864949324 failed on both kernel-sunxi-6.12 jobs:
kernel-sunxi64-legacy(arm64) — full log at https://paste.armbian.com/jefifujodukernel-sunxi-legacy(armhf) — full log at https://paste.armbian.com/caheyovivoBoth fail identically:
Hunks #7, #8 of the first patch and #3, #4, #5 of the second fail at lines 933, 958, 937, 948, 964 of
drivers/spi/spi-rockchip.c::rockchip_spi_probe()— the kernel'srockchip_spi_probe()shape has drifted since the patches were last refreshed.Why dropping is the right fix (vs rebasing)
Both patches target
drivers/spi/spi-rockchip.c— Rockchip-only driver code that's never executed on Allwinner (sunxi) SoCs. They're residue of megous' multi-platform patchset.Three independent reasons:
find patch/kernel/archive -name 'spi-rockchip-Fix-runtime-PM-and-other-issues.patch'finds only the sunxi-6.12 copy. Removing here doesn't deprive Rockchip kernel trees (rk35xx-*,rockchip64-*) which don't carry these patches at all.Rebasing them would only benefit Rockchip kernels — and they don't even include the patches.
Test plan
kernel-sunxi-legacyandkernel-sunxi64-legacyshould reach the build phase.needs_rebasepatches in the same patchset already apply with offsets, so the kernel produces; only these two hard-failed before).Summary by CodeRabbit
Bug Fixes
Performance
Chores