Skip to content

uefi edge: bump to 7.0#9547

Open
EvilOlaf wants to merge 5 commits intoarmbian:mainfrom
EvilOlaf:uefi-edge-bump-to-7.0
Open

uefi edge: bump to 7.0#9547
EvilOlaf wants to merge 5 commits intoarmbian:mainfrom
EvilOlaf:uefi-edge-bump-to-7.0

Conversation

@EvilOlaf
Copy link
Member

@EvilOlaf EvilOlaf commented Mar 16, 2026

Description

  • bump uefi edge to 7.0
  • rewrite kernel configs for x86 and arm64
  • rewrite patches for x86 and arm64

loong64 needs to be taken care of somebody else. @amazingfate ?

How Has This Been Tested?

  • build arm64
  • build x86

Checklist:

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • My changes generate no new warnings
  • Any dependent changes have been merged and published in downstream modules

Summary by CodeRabbit

  • New Features

    • Added support for additional display drivers and panels
    • Introduced Apple T2 Mac trackpad compatibility
  • Bug Fixes

    • Resolved Ethernet driver compilation warnings
  • Chores

    • Upgraded kernel version to 7.0
    • Reorganized network filtering and NAT configurations
    • Removed legacy audio and obsolete hardware drivers

@github-actions github-actions bot added size/large PR with 250 lines or more 05 Milestone: Second quarter release labels Mar 16, 2026
@coderabbitai
Copy link
Contributor

coderabbitai bot commented Mar 16, 2026

📝 Walkthrough

Walkthrough

This PR upgrades the Armbian Linux kernel to version 7.0 across ARM64 and x86 UEFI architectures, refactoring kernel configurations to modernize DRM drivers, netfilter options, and remove legacy audio subsystems while introducing targeted patches for ARM-based Mac support (stmmac ethernet, trackpad/HID handling).

Changes

Cohort / File(s) Summary
Kernel Version Upgrade
config/sources/families/include/uefi_common.inc
Updated KERNEL_MAJOR_MINOR from 6.19 to 7.0 for edge branch.
ARM64 Configuration
config/kernel/linux-uefi-arm64-edge.config
Defconfig version bump to 7.0; added CONFIG_NETFILTER_XTABLES_LEGACY; extensive DRM driver rework (Panfrost, Rockchip, bridge modules); NAT/REDIRECT target reorganization; WWAN modularization adjustments.
x86 Configuration
config/kernel/linux-uefi-x86-edge.config
Defconfig version bump to 7.0; removed legacy drivers (PREEMPT_VOLUNTARY, GHES, OSS audio subsystems); added modern netfilter NAT targets, DRM backends (AST, QXL, GMA500, Hyper-V); PCI/USB/NIC driver restructuring.
STMMAC Ethernet Driver Patches
patch/kernel/archive/uefi-arm64-7.0/1000-net-stmicro-stmmac-*.patch, patch/kernel/archive/uefi-arm64-7.0/1004-fix-stmmac-*.patch
Modified field assignments (lpi_irq → sfty_irq); made dwmac_phytium_get_resources, fw_get_phy_mode, stmmac_acpi_clock_setup static to fix compilation warnings.
Intel GPU Driver Patch
patch/kernel/archive/uefi-x86-7.0/2008-i915-4-lane-quirk-*.patch
Added early-exit guard in intel_ddi_a_force_4_lanes function for MacBook Pro 15" 4-lane quirk.
Apple Trackpad & HID Support
patch/kernel/archive/uefi-x86-7.0/4001-asahi-trackpad.patch, patch/kernel/archive/uefi-x86-7.0/4003-HID-apple-ignore-*.patch, patch/kernel/archive/uefi-x86-7.0/4004-HID-magicmouse-*.patch, patch/kernel/archive/uefi-x86-7.0/4005-HID-magicmouse-fix-regression-*.patch
Added rtkit-helper.c for Asahi support; registered new Apple T2 Mac trackpad device ID; added SPI bus registration path for magicmouse trackpad compatibility.

Estimated code review effort

🎯 4 (Complex) | ⏱️ ~60 minutes

Poem

🐰 Hops with glee through kernel 7.0,
DRM drivers dance and netfilters flow,
Trackpads wake on Apple machines,
STMMAC ethers in between,
From 6.19 we proudly go! 🐇✨

🚥 Pre-merge checks | ✅ 3
✅ Passed checks (3 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title 'uefi edge: bump to 7.0' clearly and concisely summarizes the main change: upgrading the uefi edge kernel version from 6.19 to 7.0, which is reflected throughout the changeset.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment
📝 Coding Plan
  • Generate coding plan for human review comments

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.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@github-actions github-actions bot added Needs review Seeking for review Hardware Hardware related like kernel, U-Boot, ... Patches Patches related to kernel, U-Boot, ... labels Mar 16, 2026
@amazingfate
Copy link
Contributor

I will check the loong64 build.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (1)
patch/kernel/archive/uefi-x86-7.0/4001-asahi-trackpad.patch (1)

230-231: ⚠️ Potential issue | 🟠 Major

SPI_HID_APPLE symbol is undefined in this patch.

Lines 231 and 548 reference SPI_HID_APPLE in Kconfig defaults, but this symbol is never defined. Only SPI_HID_APPLE_OF (line 1597) and SPI_HID_APPLE_CORE (line 1613) are defined. The defaults must reference an existing symbol.

Suggested fix
-	default !EXPERT || SPI_HID_APPLE
+	default !EXPERT || SPI_HID_APPLE_OF

Also applies to line 548:

-	default SPI_HID_APPLE
+	default SPI_HID_APPLE_OF
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In `@patch/kernel/archive/uefi-x86-7.0/4001-asahi-trackpad.patch` around lines 230
- 231, The Kconfig default references an undefined symbol SPI_HID_APPLE; fix by
replacing that undefined symbol with an existing kernel config symbol (e.g.
SPI_HID_APPLE_CORE or SPI_HID_APPLE_OF) or by adding a proper config definition
for SPI_HID_APPLE. Update the two default lines that currently use SPI_HID_APPLE
to reference the correct existing symbol (suggestion: use SPI_HID_APPLE_CORE if
you mean the core driver) so the default dependency resolves correctly.
🧹 Nitpick comments (2)
patch/kernel/archive/uefi-arm64-7.0/1004-fix-stmmac-compilation-warnings.patch (1)

6-11: Fixes are technically correct; consider consolidating into patch 1000.

The compilation fixes (making functions static, removing invalid lpi_irq assignments) are appropriate for kernel 7.0 compatibility. However, since patch 1000 is an Armbian-maintained patch (not an upstream patch being kept pristine), these fixes could be directly integrated into 1000-net-stmicro-stmmac-Phytium-onboard-ethernet-drivers-and-ACPI-glue-for-6.x.patch rather than maintained as a separate fix-up patch.

This would reduce the patch count and avoid the situation where one patch adds code that the next patch immediately removes.

🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In
`@patch/kernel/archive/uefi-arm64-7.0/1004-fix-stmmac-compilation-warnings.patch`
around lines 6 - 11, Consolidate the 1004 fixes into patch 1000 by applying the
same changes there: change the function definitions for fw_get_phy_mode,
stmmac_acpi_clock_setup, and dwmac_phytium_get_resources to be static where they
are defined to eliminate missing prototype warnings, and remove the invalid
assignments to stmmac_res->lpi_irq in stmmac_platform.c and dwmac-phytium.c
(delete the lines that assign to lpi_irq since that member does not exist);
ensure the resulting patch 1000 compiles cleanly and drop the separate 1004
fix-up patch.
patch/kernel/archive/uefi-arm64-7.0/1000-net-stmicro-stmmac-Phytium-onboard-ethernet-drivers-and-ACPI-glue-for-6.x.patch (1)

641-644: lpi_irq assignment added here is removed by patch 1004.

The stmmac_res->lpi_irq = -1; assignment added at line 641 is immediately removed by the companion patch 1004-fix-stmmac-compilation-warnings.patch because lpi_irq member reportedly doesn't exist in kernel 7.0's stmmac_resources struct.

Consider integrating the 7.0-specific fixes directly into this patch rather than adding code that a subsequent patch removes. This would make the patch series cleaner and easier to maintain.

🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In
`@patch/kernel/archive/uefi-arm64-7.0/1000-net-stmicro-stmmac-Phytium-onboard-ethernet-drivers-and-ACPI-glue-for-6.x.patch`
around lines 641 - 644, Remove the spurious assignment to stmmac_res->lpi_irq in
this patch (introduced at stmmac_res->lpi_irq = -1;) and instead incorporate the
7.0-specific fix here: either drop any reference to the lpi_irq member (since
stmmac_resources in kernel 7.0 lacks it) or wrap accesses/initialization of
lpi_irq with a kernel-version/feature conditional so the code compiles across
versions; effectively merge the change currently in patch 1004 (which removes
lpi_irq usage) into this patch so the series no longer introduces then
immediately removes the member.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.

Outside diff comments:
In `@patch/kernel/archive/uefi-x86-7.0/4001-asahi-trackpad.patch`:
- Around line 230-231: The Kconfig default references an undefined symbol
SPI_HID_APPLE; fix by replacing that undefined symbol with an existing kernel
config symbol (e.g. SPI_HID_APPLE_CORE or SPI_HID_APPLE_OF) or by adding a
proper config definition for SPI_HID_APPLE. Update the two default lines that
currently use SPI_HID_APPLE to reference the correct existing symbol
(suggestion: use SPI_HID_APPLE_CORE if you mean the core driver) so the default
dependency resolves correctly.

---

Nitpick comments:
In
`@patch/kernel/archive/uefi-arm64-7.0/1000-net-stmicro-stmmac-Phytium-onboard-ethernet-drivers-and-ACPI-glue-for-6.x.patch`:
- Around line 641-644: Remove the spurious assignment to stmmac_res->lpi_irq in
this patch (introduced at stmmac_res->lpi_irq = -1;) and instead incorporate the
7.0-specific fix here: either drop any reference to the lpi_irq member (since
stmmac_resources in kernel 7.0 lacks it) or wrap accesses/initialization of
lpi_irq with a kernel-version/feature conditional so the code compiles across
versions; effectively merge the change currently in patch 1004 (which removes
lpi_irq usage) into this patch so the series no longer introduces then
immediately removes the member.

In
`@patch/kernel/archive/uefi-arm64-7.0/1004-fix-stmmac-compilation-warnings.patch`:
- Around line 6-11: Consolidate the 1004 fixes into patch 1000 by applying the
same changes there: change the function definitions for fw_get_phy_mode,
stmmac_acpi_clock_setup, and dwmac_phytium_get_resources to be static where they
are defined to eliminate missing prototype warnings, and remove the invalid
assignments to stmmac_res->lpi_irq in stmmac_platform.c and dwmac-phytium.c
(delete the lines that assign to lpi_irq since that member does not exist);
ensure the resulting patch 1000 compiles cleanly and drop the separate 1004
fix-up patch.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: 1babd541-6a8c-4369-936c-1e638977384f

📥 Commits

Reviewing files that changed from the base of the PR and between a3f8d14 and 39e8e12.

📒 Files selected for processing (34)
  • config/kernel/linux-uefi-arm64-edge.config
  • config/kernel/linux-uefi-x86-edge.config
  • config/sources/families/include/uefi_common.inc
  • patch/kernel/archive/uefi-arm64-7.0/1000-net-stmicro-stmmac-Phytium-onboard-ethernet-drivers-and-ACPI-glue-for-6.x.patch
  • patch/kernel/archive/uefi-arm64-7.0/1001-net-stmicro-stmmac-Phytium-adapt-to-net-stmmac-remove-axi_blen-array.patch
  • patch/kernel/archive/uefi-arm64-7.0/1002-net-stmicro-stmmac-Phytium-adapt-to-net-stmmac-replace-has_xxxx-with-core_type.patch
  • patch/kernel/archive/uefi-arm64-7.0/1003-net-stmicro-stmmac-Phytium-adapt-to-net-stmmac-pass-struct-device-to-init-exit-methods.patch
  • patch/kernel/archive/uefi-arm64-7.0/1004-fix-stmmac-compilation-warnings.patch
  • patch/kernel/archive/uefi-arm64-7.0/board-hikey960-usb.patch
  • patch/kernel/archive/uefi-loong64-7.0/0001-drm-xe-bo-fix-alignment-with-non-4KiB-kernel-page-si.patch
  • patch/kernel/archive/uefi-loong64-7.0/0002-drm-xe-guc-use-GUC_SIZE-SZ_4K-for-alignment.patch
  • patch/kernel/archive/uefi-loong64-7.0/0003-drm-xe-regs-fix-RING_CTL_SIZE-size-calculation.patch
  • patch/kernel/archive/uefi-loong64-7.0/0004-drm-xe-use-4KiB-alignment-for-cursor-jumps.patch
  • patch/kernel/archive/uefi-loong64-7.0/0005-drm-xe-query-use-PAGE_SIZE-as-the-minimum-page-align.patch
  • patch/kernel/archive/uefi-loong64-7.0/0006-enable-xe-on-16K-pagesize.patch
  • patch/kernel/archive/uefi-x86-7.0/1001-Add-apple-bce-driver.patch
  • patch/kernel/archive/uefi-x86-7.0/1002-Put-apple-bce-in-drivers-staging.patch
  • patch/kernel/archive/uefi-x86-7.0/1003-Fix-freezing-on-turning-off-camera.patch
  • patch/kernel/archive/uefi-x86-7.0/2008-i915-4-lane-quirk-for-mbp15-1.patch
  • patch/kernel/archive/uefi-x86-7.0/2009-apple-gmux-allow-switching-to-igpu-at-probe.patch
  • patch/kernel/archive/uefi-x86-7.0/3001-applesmc-convert-static-structures-to-drvdata.patch
  • patch/kernel/archive/uefi-x86-7.0/3002-applesmc-make-io-port-base-addr-dynamic.patch
  • patch/kernel/archive/uefi-x86-7.0/3003-applesmc-switch-to-acpi_device-from-platform.patch
  • patch/kernel/archive/uefi-x86-7.0/3004-applesmc-key-interface-wrappers.patch
  • patch/kernel/archive/uefi-x86-7.0/3005-applesmc-basic-mmio-interface-implementation.patch
  • patch/kernel/archive/uefi-x86-7.0/3006-applesmc-fan-support-on-T2-Macs.patch
  • patch/kernel/archive/uefi-x86-7.0/3007-applesmc-Add-iMacPro-to-applesmc_whitelist.patch
  • patch/kernel/archive/uefi-x86-7.0/3008-applesmc-make-applesmc_remove-void.patch
  • patch/kernel/archive/uefi-x86-7.0/3009-applesmc-battery-charge-limiter.patch
  • patch/kernel/archive/uefi-x86-7.0/4001-asahi-trackpad.patch
  • patch/kernel/archive/uefi-x86-7.0/4003-HID-apple-ignore-the-trackpad-on-T2-Macs.patch
  • patch/kernel/archive/uefi-x86-7.0/4004-HID-magicmouse-Add-support-for-trackpads-found-on-T2.patch
  • patch/kernel/archive/uefi-x86-7.0/4005-HID-magicmouse-fix-regression-breaking-support-for-M.patch
  • patch/kernel/archive/uefi-x86-7.0/7001-drm-i915-fbdev-Discard-BIOS-framebuffers-exceeding-h.patch

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

05 Milestone: Second quarter release Hardware Hardware related like kernel, U-Boot, ... Needs review Seeking for review Patches Patches related to kernel, U-Boot, ... size/large PR with 250 lines or more

Development

Successfully merging this pull request may close these issues.

2 participants