sunxi: remove BSP GMAC/EPHY patch that breaks H6 internal EMAC#9609
Merged
Conversation
The chraac BSP patch (driver-allwinner-h618-emac / 0203) introduced conflicting out-of-tree drivers (sunxi-gmac, sunxi-ephy, sunxi-ac200) that clash with the correct mainline AC200 stack already in place: - sunxi-ac200.c conflicts with the mainline ac200.c (0201) - sunxi-ephy.c conflicts with the mainline ac200-phy.c (0202) - sunxi-gmac.c is an unnecessary BSP replacement for dwmac-sun8i - removes of_gpio_flags enum from gpiolib-of.c, breaking other drivers - depends on PWM_SUNXI_ENHANCE which doesn't exist in mainline H6 internal EMAC is correctly handled by the mainline stack: ac200.c + ac200-ephy-ctl.c (ac200-v3) + ac200-phy.c + DTS patches. H618 EMAC is covered by dwmac-sun8i + drv-net-stmmac-dwmac-sun8i- add-second-emac-clock patch. Remove the patch from sunxi-6.12, 6.18 and 7.0, and drop the leftover CONFIG_SUNXI_GMAC=m from the legacy kernel config. Also align CONFIG_SUN4I_EMAC to =m (matching current/edge) in legacy config. Signed-off-by: Igor Pecovnik <igor@armbian.com>
igorpecovnik
requested review from
AGM1968,
JohnTheCoolingFan,
PanderMusubi,
TheSnowfield,
Tonymac32,
chraac,
janprunk,
krachlatte,
pyavitz,
schwar3kat,
sgjava and
teknoid
as code owners
Contributor
|
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 (7)
💤 Files with no reviewable changes (3)
📝 WalkthroughWalkthroughKernel configuration and patch series for Sunxi are modified: the SUN4I_EMAC driver switches from built-in to loadable module, the SUNXI_GMAC configuration is removed, and three EMAC-related patches are removed from patch series configurations for kernel versions 6.12, 6.18, and 7.0. Changes
Estimated code review effort🎯 1 (Trivial) | ⏱️ ~5 minutes Poem
🚥 Pre-merge checks | ✅ 3✅ Passed checks (3 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 |
github-actions
Bot
added
Needs review
Member
|
The H618 test wasn't done and exactly this breakage seem to have happened. Needs another round of testing on other devices if this correction works for everything: #9815 |
7 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
sunxi-gmac/sunxi-ephy/sunxi-ac200patch (by chraac) from sunxi-6.12, 6.18 and 7.0, which was introduced in 01176b0 and breaks H6 internal EMACCONFIG_SUNXI_GMAC=mfromlinux-sunxi64-legacy.config(driver no longer in tree)CONFIG_SUN4I_EMACto=min legacy config (matches current/edge)Problem
The BSP patch introduces conflicting out-of-tree drivers that clash with the correct mainline AC200 stack already present:
sunxi-ac200.cac200.c(0201)sunxi-ephy.cac200-phy.c(0202)sunxi-gmac.cdwmac-sun8iAdditionally the patch removes the
of_gpio_flagsenum fromgpiolib-of.c(breaking other drivers) and depends onPWM_SUNXI_ENHANCEwhich does not exist in mainline.Correct stack (already in place)
H6 internal EMAC is correctly handled by:
ac200.c+ac200-ephy-ctl.c(from Jernej's ac200-v3 branch) +ac200-phy.c+ DTS patchesH618 EMAC is covered by
dwmac-sun8i+drv-net-stmmac-dwmac-sun8i-add-second-emac-clockpatch.Test plan
Summary by CodeRabbit