[PATCH] mvebu: add linux 5.10 support

Tomasz Maciej Nowak tmn505 at gmail.com
Thu Feb 18 13:25:52 EST 2021


Hi Sebastian.

W dniu 17.02.2021 o 08:00, Sebastian Careba pisze:
> Signed-off-by: Sebastian Careba <nitroshift at yahoo.com>

You have multiply issues with this kernel bump, some I'll write here, some inline.

The lack of commit message, explaining why You dropped some patches when transitioning from 5.4 to 5.10.
What also missing is: config refresh for cortexa53, cortexa72, and split of files because dts for ESPRESSObin got upstreamed.
For example how to do it better (I don't claim it's proper), You can check what I did two weeks ago in this tree: https://github.com/tmn505/openwrt/commits/mvebu-next
the commits lack commit messages (I had intention to add them later), but You'll get a gist of the changes, and that way You'll preserve changes between major kernel bumps.

> ---
>  target/linux/mvebu/Makefile                   |   8 +-
>  target/linux/mvebu/config-5.10                | 436 ++++++++++
>  .../patches-5.10/002-add_powertables.patch    | 770 ++++++++++++++++++
>  .../004-add_sata_disk_activity_trigger.patch  |  39 +
>  ...5-linksys_hardcode_nand_ecc_settings.patch |  17 +
>  ...Mangle-bootloader-s-kernel-arguments.patch | 189 +++++
>  ...sallow-XDP-program-on-hardware-buffe.patch |  53 ++
>  .../030-linkstation-poweroff.patch            |  20 +
>  .../patches-5.10/100-find_active_root.patch   |  60 ++
>  .../patches-5.10/102-revert_i2c_delay.patch   |  15 +
>  .../205-armada-385-rd-mtd-partitions.patch    |  19 +
>  .../206-ARM-mvebu-385-ap-Add-partitions.patch |  35 +
>  ...-armada-xp-linksys-mamba-broken-idle.patch |  10 +
>  .../231-armada-xp-linksys-mamba-wan.patch     |  11 +
>  .../patches-5.10/240-linksys-status-led.patch |  50 ++
>  .../241-linksys-use-eth0-as-cpu-port.patch    |  25 +
>  .../250-adjust-compatible-for-linksys.patch   |  68 ++
>  .../300-mvneta-tx-queue-workaround.patch      |  26 +
>  ...dicate-failure-to-enter-deeper-sleep.patch |  40 +
>  ...-pci-mvebu-time-out-reset-on-link-up.patch |  60 ++
>  ...5-PCI-aardvark-Improve-link-training.patch | 135 +++
>  ...06-PCI-aardvark-Issue-PERST-via-GPIO.patch |  57 ++
>  .../407-PCI-aardvark-Add-PHY-support.patch    | 116 +++
>  ...-t-touch-PCIe-registers-if-no-card-c.patch |  50 ++
>  ...-initialization-with-old-Marvell-s-A.patch |  44 +
>  ...da388-clearfog-emmc-on-clearfog-base.patch |  87 ++
>  ...ts-marvell-armada37xx-Add-eth0-alias.patch |  20 +
>  ...witch-PHY-operation-mode-to-2500base.patch |  20 +
>  .../560-helios4-dts-status-led-alias.patch    |  28 +
>  ...-mvebu-armada-38x-enable-libata-leds.patch |  10 +
>  .../999-resize mamba kernel.patch             |  50 ++
>  31 files changed, 2565 insertions(+), 3 deletions(-)
>  create mode 100644 target/linux/mvebu/config-5.10

Please copy patches from latest master, which have changed numbering according to target/linux/generic/PATCHES, it's easier to track backports.

>  create mode 100644 target/linux/mvebu/patches-5.10/002-add_powertables.patch
>  create mode 100644 target/linux/mvebu/patches-5.10/004-add_sata_disk_activity_trigger.patch
>  create mode 100644 target/linux/mvebu/patches-5.10/005-linksys_hardcode_nand_ecc_settings.patch
>  create mode 100644 target/linux/mvebu/patches-5.10/006-mvebu-Mangle-bootloader-s-kernel-arguments.patch

I'm missing a chunk from this patch in init/main.c. If it doesn't apply cleanly, it doesn't mean You can delete it, please rework it.

>  create mode 100644 target/linux/mvebu/patches-5.10/022-mvneta-driver-disallow-XDP-program-on-hardware-buffe.patch
>  create mode 100644 target/linux/mvebu/patches-5.10/030-linkstation-poweroff.patch
>  create mode 100644 target/linux/mvebu/patches-5.10/100-find_active_root.patch
>  create mode 100644 target/linux/mvebu/patches-5.10/102-revert_i2c_delay.patch
>  create mode 100644 target/linux/mvebu/patches-5.10/205-armada-385-rd-mtd-partitions.patch
>  create mode 100644 target/linux/mvebu/patches-5.10/206-ARM-mvebu-385-ap-Add-partitions.patch
>  create mode 100644 target/linux/mvebu/patches-5.10/230-armada-xp-linksys-mamba-broken-idle.patch
>  create mode 100644 target/linux/mvebu/patches-5.10/231-armada-xp-linksys-mamba-wan.patch
>  create mode 100644 target/linux/mvebu/patches-5.10/240-linksys-status-led.patch
>  create mode 100644 target/linux/mvebu/patches-5.10/241-linksys-use-eth0-as-cpu-port.patch
>  create mode 100644 target/linux/mvebu/patches-5.10/250-adjust-compatible-for-linksys.patch
>  create mode 100644 target/linux/mvebu/patches-5.10/300-mvneta-tx-queue-workaround.patch

Also missing chunk here, please rework it.

>  create mode 100644 target/linux/mvebu/patches-5.10/400-cpuidle-mvebu-indicate-failure-to-enter-deeper-sleep.patch
>  create mode 100644 target/linux/mvebu/patches-5.10/401-pci-mvebu-time-out-reset-on-link-up.patch

>  create mode 100644 target/linux/mvebu/patches-5.10/405-PCI-aardvark-Improve-link-training.patch
>  create mode 100644 target/linux/mvebu/patches-5.10/406-PCI-aardvark-Issue-PERST-via-GPIO.patch
>  create mode 100644 target/linux/mvebu/patches-5.10/407-PCI-aardvark-Add-PHY-support.patch
>  create mode 100644 target/linux/mvebu/patches-5.10/408-PCI-aardvark-Don-t-touch-PCIe-registers-if-no-card-c.patch
>  create mode 100644 target/linux/mvebu/patches-5.10/410-PCI-aardvark-Fix-initialization-with-old-Marvell-s-A.patch

All the PCI aardvark patches are included in 5.10 kernel no need to carry them.

>  create mode 100644 target/linux/mvebu/patches-5.10/412-ARM-dts-armada388-clearfog-emmc-on-clearfog-base.patch
>  create mode 100644 target/linux/mvebu/patches-5.10/520-arm64-dts-marvell-armada37xx-Add-eth0-alias.patch
>  create mode 100644 target/linux/mvebu/patches-5.10/550-arm64-dts-uDPU-switch-PHY-operation-mode-to-2500base.patch
>  create mode 100644 target/linux/mvebu/patches-5.10/560-helios4-dts-status-led-alias.patch
>  create mode 100644 target/linux/mvebu/patches-5.10/561-mvebu-armada-38x-enable-libata-leds.patch
>  create mode 100644 target/linux/mvebu/patches-5.10/999-resize mamba kernel.patch

What's the last patch? 

> 
> diff --git a/target/linux/mvebu/Makefile b/target/linux/mvebu/Makefile
> index 1e67bcfacb..e574715648 100644
> --- a/target/linux/mvebu/Makefile
> +++ b/target/linux/mvebu/Makefile
> @@ -1,7 +1,9 @@
> -# SPDX-License-Identifier: GPL-2.0-only
>  #
>  # Copyright (C) 2012-2015 OpenWrt.org
> -
> +#
> +# This is free software, licensed under the GNU General Public License v2.
> +# See /LICENSE for more information.
> +#
>  include $(TOPDIR)/rules.mk
>  
>  BOARD:=mvebu
> @@ -9,7 +11,7 @@ BOARDNAME:=Marvell EBU Armada
>  FEATURES:=fpu usb pci pcie gpio nand squashfs ramdisk boot-part rootfs-part
>  SUBTARGETS:=cortexa9 cortexa53 cortexa72
>  
> -KERNEL_PATCHVER:=5.4
> +KERNEL_PATCHVER:=5.10

This should have been changed in KERNEL_TESTING_PATCHVER, it's bit too early.

>  KERNEL_TESTING_PATCHVER:=5.4
>  
>  include $(INCLUDE_DIR)/target.mk

[snip]

Regards

-- 
TMN



More information about the openwrt-devel mailing list