W dniu 20.02.2021 o 12:53, Rui Salvaterra pisze: > Also delete already upstreamed patches/changes. > > Signed-off-by: Rui Salvaterra <[email protected]> > --- > ...t-for-endpoint-to-be-ready-before-tr.patch | 50 --- > ...-t-rely-on-jiffies-while-holding-spi.patch | 54 --- > ...ntroduce-mvneta_update_stats-routine.patch | 95 ------ > ...duce-page-pool-API-for-sw-buffer-man.patch | 181 ---------- > ...on-build_skb-in-mvneta_rx_swbm-poll-.patch | 303 ----------------- > ...006-net-mvneta-add-basic-XDP-support.patch | 311 ------------------ > ...avoid_error_message_for_optional_IRQ.patch | 31 -- > ...header-prefetch-in-mvneta_swbm_rx_fr.patch | 43 --- > ...mvneta-make-tx-buffer-array-agnostic.patch | 210 ------------ > .../009-net-mvneta-add-XDP_TX-support.patch | 175 ---------- > ...fix-build-skb-for-bm-capable-devices.patch | 41 --- > ...-arm64-dts-uDPU-remove-i2c-fast-mode.patch | 31 -- > ...ts-uDPU-SFP-cages-support-3W-modules.patch | 34 -- > ...on-page_pool_recycle_direct-in-mvnet.patch | 39 --- > ...sallow-XDP-program-on-hardware-buffe.patch | 53 --- > ...DP-support-if-sw-bm-is-used-as-fallb.patch | 67 ---- > ...in-link-immediately-after-enabling-t.patch | 60 ---- > ...7-PCI-aardvark-Improve-link-training.patch | 208 ------------ > ...18-PCI-aardvark-Issue-PERST-via-GPIO.patch | 123 ------- > .../019-PCI-aardvark-Add-PHY-support.patch | 152 --------- > ...l-armada-37xx-Set-pcie_reset_pin-to-.patch | 93 ------ > ...l-armada-37xx-Move-PCIe-comphy-handl.patch | 57 ---- > ...l-armada-37xx-Move-PCIe-max-link-spe.patch | 44 --- > ...-arm64-dts-add-uDPU-i2c-bus-recovery.patch | 53 --- > ...-t-touch-PCIe-registers-if-no-card-c.patch | 50 --- > ...add-driver-for-LinkStation-power-off.patch | 207 ------------ > ...-initialization-with-old-Marvell-s-A.patch | 44 --- > ...l-espressobin-Add-ethernet-switch-al.patch | 88 ----- > ...Mangle-bootloader-s-kernel-arguments.patch | 37 +-- > ...-mvebu-armada-38x-enable-libata-leds.patch | 4 +- > ...l-armada-3720-espressobin-add-ports-.patch | 26 -- > .../patches-5.10/400-find_active_root.patch | 2 +- > .../700-mvneta-tx-queue-workaround.patch | 6 +- > ...-pci-mvebu-time-out-reset-on-link-up.patch | 6 +- > 34 files changed, 18 insertions(+), 2960 deletions(-) > delete mode 100644 > target/linux/mvebu/patches-5.10/001-PCI-aardvark-Wait-for-endpoint-to-be-ready-before-tr.patch > delete mode 100644 > target/linux/mvebu/patches-5.10/002-PCI-aardvark-Don-t-rely-on-jiffies-while-holding-spi.patch > delete mode 100644 > target/linux/mvebu/patches-5.10/003-net-mvneta-introduce-mvneta_update_stats-routine.patch > delete mode 100644 > target/linux/mvebu/patches-5.10/004-net-mvneta-introduce-page-pool-API-for-sw-buffer-man.patch > delete mode 100644 > target/linux/mvebu/patches-5.10/005-net-mvneta-rely-on-build_skb-in-mvneta_rx_swbm-poll-.patch > delete mode 100644 > target/linux/mvebu/patches-5.10/006-net-mvneta-add-basic-XDP-support.patch > delete mode 100644 > target/linux/mvebu/patches-5.10/007-gpio-mvebu-avoid_error_message_for_optional_IRQ.patch > delete mode 100644 > target/linux/mvebu/patches-5.10/007-net-mvneta-move-header-prefetch-in-mvneta_swbm_rx_fr.patch > delete mode 100644 > target/linux/mvebu/patches-5.10/008-net-mvneta-make-tx-buffer-array-agnostic.patch > delete mode 100644 > target/linux/mvebu/patches-5.10/009-net-mvneta-add-XDP_TX-support.patch > delete mode 100644 > target/linux/mvebu/patches-5.10/010-net-mvneta-fix-build-skb-for-bm-capable-devices.patch > delete mode 100644 > target/linux/mvebu/patches-5.10/011-arm64-dts-uDPU-remove-i2c-fast-mode.patch > delete mode 100644 > target/linux/mvebu/patches-5.10/012-arm64-dts-uDPU-SFP-cages-support-3W-modules.patch > delete mode 100644 > target/linux/mvebu/patches-5.10/013-net-mvneta-rely-on-page_pool_recycle_direct-in-mvnet.patch > delete mode 100644 > target/linux/mvebu/patches-5.10/014-mvneta-driver-disallow-XDP-program-on-hardware-buffe.patch > delete mode 100644 > target/linux/mvebu/patches-5.10/015-net-mvneta-fix-XDP-support-if-sw-bm-is-used-as-fallb.patch > delete mode 100644 > target/linux/mvebu/patches-5.10/016-PCI-aardvark-Train-link-immediately-after-enabling-t.patch > delete mode 100644 > target/linux/mvebu/patches-5.10/017-PCI-aardvark-Improve-link-training.patch > delete mode 100644 > target/linux/mvebu/patches-5.10/018-PCI-aardvark-Issue-PERST-via-GPIO.patch > delete mode 100644 > target/linux/mvebu/patches-5.10/019-PCI-aardvark-Add-PHY-support.patch > delete mode 100644 > target/linux/mvebu/patches-5.10/020-arm64-dts-marvell-armada-37xx-Set-pcie_reset_pin-to-.patch > delete mode 100644 > target/linux/mvebu/patches-5.10/021-arm64-dts-marvell-armada-37xx-Move-PCIe-comphy-handl.patch > delete mode 100644 > target/linux/mvebu/patches-5.10/022-arm64-dts-marvell-armada-37xx-Move-PCIe-max-link-spe.patch > delete mode 100644 > target/linux/mvebu/patches-5.10/023-arm64-dts-add-uDPU-i2c-bus-recovery.patch > delete mode 100644 > target/linux/mvebu/patches-5.10/024-PCI-aardvark-Don-t-touch-PCIe-registers-if-no-card-c.patch > delete mode 100644 > target/linux/mvebu/patches-5.10/025-power-reset-add-driver-for-LinkStation-power-off.patch > delete mode 100644 > target/linux/mvebu/patches-5.10/026-PCI-aardvark-Fix-initialization-with-old-Marvell-s-A.patch > delete mode 100644 > target/linux/mvebu/patches-5.10/027-arm64-dts-marvell-espressobin-Add-ethernet-switch-al.patch > delete mode 100644 > target/linux/mvebu/patches-5.10/315-arm64-dts-marvell-armada-3720-espressobin-add-ports-.patch >
Please reset the number of 028 to 001, the backports should be sorted chronologically so any subsequent patch addition will have minimal diff. Also reset the number of patch 316 to 315. [snip] > diff --git > a/target/linux/mvebu/patches-5.10/300-mvebu-Mangle-bootloader-s-kernel-arguments.patch > > b/target/linux/mvebu/patches-5.10/300-mvebu-Mangle-bootloader-s-kernel-arguments.patch > index fd60cdb322..35896121cc 100644 > --- > a/target/linux/mvebu/patches-5.10/300-mvebu-Mangle-bootloader-s-kernel-arguments.patch > +++ > b/target/linux/mvebu/patches-5.10/300-mvebu-Mangle-bootloader-s-kernel-arguments.patch > @@ -28,7 +28,7 @@ Signed-off-by: Michael Gray <[email protected]> > > --- a/arch/arm/Kconfig > +++ b/arch/arm/Kconfig > -@@ -1827,6 +1827,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN > +@@ -1780,6 +1780,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN > The command-line arguments provided by the boot loader will be > appended to the the device tree bootargs property. > > @@ -48,7 +48,7 @@ Signed-off-by: Michael Gray <[email protected]> > config CMDLINE > --- a/arch/arm/boot/compressed/atags_to_fdt.c > +++ b/arch/arm/boot/compressed/atags_to_fdt.c > -@@ -4,6 +4,8 @@ > +@@ -5,6 +5,8 @@ > > #if defined(CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND) > #define do_extend_cmdline 1 > @@ -57,7 +57,7 @@ Signed-off-by: Michael Gray <[email protected]> > #else > #define do_extend_cmdline 0 > #endif > -@@ -67,6 +69,72 @@ static uint32_t get_cell_size(const void > +@@ -69,6 +71,72 @@ static uint32_t get_cell_size(const void > return cell_size; > } > > @@ -130,7 +130,7 @@ Signed-off-by: Michael Gray > <[email protected]> > static void merge_fdt_bootargs(void *fdt, const char *fdt_cmdline) > { > char cmdline[COMMAND_LINE_SIZE]; > -@@ -86,12 +154,21 @@ static void merge_fdt_bootargs(void *fdt > +@@ -88,12 +156,21 @@ static void merge_fdt_bootargs(void *fdt > > /* and append the ATAG_CMDLINE */ > if (fdt_cmdline) { > @@ -152,7 +152,7 @@ Signed-off-by: Michael Gray > <[email protected]> > } > *ptr = '\0'; > > -@@ -166,7 +243,9 @@ int atags_to_fdt(void *atag_list, void * > +@@ -168,7 +245,9 @@ int atags_to_fdt(void *atag_list, void * > else > setprop_string(fdt, "/chosen", "bootargs", > atag->u.cmdline.cmdline); > @@ -163,7 +163,7 @@ Signed-off-by: Michael Gray > <[email protected]> > if (memcount >= sizeof(mem_reg_property)/4) > continue; > if (!atag->u.mem.size) > -@@ -210,6 +289,10 @@ int atags_to_fdt(void *atag_list, void * > +@@ -212,6 +291,10 @@ int atags_to_fdt(void *atag_list, void * > setprop(fdt, "/memory", "reg", mem_reg_property, > 4 * memcount * memsize); > } > @@ -176,9 +176,9 @@ Signed-off-by: Michael Gray > <[email protected]> > } > --- a/init/main.c > +++ b/init/main.c > -@@ -104,6 +104,10 @@ > - #define CREATE_TRACE_POINTS > - #include <trace/events/initcall.h> > +@@ -110,6 +110,10 @@ > + > + #include <kunit/test.h> > > +#if defined(CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_MANGLE) > +#include <linux/of.h> > @@ -187,22 +187,3 @@ Signed-off-by: Michael Gray > <[email protected]> > static int kernel_init(void *); > > extern void init_IRQ(void); > -@@ -631,6 +635,18 @@ asmlinkage __visible void __init start_k > - page_alloc_init(); > - > - pr_notice("Kernel command line: %s\n", boot_command_line); > -+ > -+#if defined(CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_MANGLE) > -+ //Show bootloader's original command line for reference > -+ if(of_chosen) { > -+ const char *prop = of_get_property(of_chosen, > "bootloader-args", NULL); > -+ if(prop) > -+ pr_notice("Bootloader command line (ignored): %s\n", > prop); > -+ else > -+ pr_notice("Bootloader command line not present\n"); > -+ } > -+#endif > -+ Why is this chunk deleted? I see no explanation in commit message. > - /* parameters may set static keys */ > - jump_label_init(); > - parse_early_param(); [snip] -- TMN _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
