diff --git a/include/kernel-5.10 b/include/kernel-5.10 index 8a4895d91b2ef4..14b00f4002e609 100644 --- a/include/kernel-5.10 +++ b/include/kernel-5.10 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.10 = .135 -LINUX_KERNEL_HASH-5.10.135 = e499a61be9ce670716dd27b5124bb9ef6c6bc0e8fab443abf717a77136543344 +LINUX_VERSION-5.10 = .136 +LINUX_KERNEL_HASH-5.10.136 = 1c099d0d59e7d9f671dfc947e16891b7a3a45efd7dfcc6b1e55a194961e45159 diff --git a/include/kernel-5.15 b/include/kernel-5.15 index 716bcddf805028..962cd0a3ad7820 100644 --- a/include/kernel-5.15 +++ b/include/kernel-5.15 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.15 = .59 -LINUX_KERNEL_HASH-5.15.59 = e6ddc642057340db06b3b921c2b31bfed2c611359e8f144c3e5cf9c3ac33bccb +LINUX_VERSION-5.15 = .60 +LINUX_KERNEL_HASH-5.15.60 = 2d9545f7c96faffd8407522011b9533adefd1360118494dfb6c862f2f15e237a diff --git a/package/kernel/mac80211/patches/brcm/999-backport-to-linux-5.18.patch b/package/kernel/mac80211/patches/brcm/999-backport-to-linux-5.18.patch index 4187db38f32baa..d71c5c902536d9 100644 --- a/package/kernel/mac80211/patches/brcm/999-backport-to-linux-5.18.patch +++ b/package/kernel/mac80211/patches/brcm/999-backport-to-linux-5.18.patch @@ -36,7 +36,7 @@ index 44a11b0..178e692 100644 ndev->ethtool_ops = &brcmf_ethtool_ops; /* set the mac address & netns */ -++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0) memcpy(ndev->dev_addr, ifp->mac_addr, ETH_ALEN); +#else + eth_hw_addr_set(ifp->ndev, ifp->mac_addr); @@ -117,7 +117,7 @@ index 57aa863..f5ebb5a 100644 local->hw.wiphy->perm_addr, ETH_ALEN); +#else -+ eth_hw_addr_set(ndev, params->macaddr); ++ eth_hw_addr_set(dev, local->hw.wiphy->perm_addr); +#endif memcpy(dev->perm_addr, dev->dev_addr, ETH_ALEN); diff --git a/target/linux/ipq807x/Makefile b/target/linux/ipq807x/Makefile index 4ce2582357f7b3..3947a8ab793efc 100644 --- a/target/linux/ipq807x/Makefile +++ b/target/linux/ipq807x/Makefile @@ -18,6 +18,7 @@ DEFAULT_PACKAGES += \ autocore-arm htop wpad-openssl zram-swap uboot-envtools \ kmod-qca-nss-dp kmod-qca-nss-drv-64 \ kmod-qca-nss-drv-pppoe-64 kmod-qca-nss-ecm-64 \ + kmod-qca-nss-drv-bridge-mgr-64 kmod-qca-nss-drv-vlan-mgr-64 \ nss-firmware-ipq8074 luci-app-ipsec-vpnd \ luci-app-unblockmusic luci-app-zerotier diff --git a/target/linux/rockchip/armv8/base-files/etc/board.d/02_network b/target/linux/rockchip/armv8/base-files/etc/board.d/02_network index ecf4348fe98f5c..16530cea3bde2e 100755 --- a/target/linux/rockchip/armv8/base-files/etc/board.d/02_network +++ b/target/linux/rockchip/armv8/base-files/etc/board.d/02_network @@ -10,17 +10,19 @@ rockchip_setup_interfaces() case "$board" in embedfire,doornet1|\ embedfire,doornet2|\ - fastrhino,r66s|\ friendlyarm,nanopi-r2c|\ friendlyarm,nanopi-r2s|\ friendlyarm,nanopi-r4s|\ friendlyarm,nanopi-r4se|\ sharevdi,guangmiao-g4c|\ xunlong,orangepi-r1-plus|\ - xunlong,orangepi-r1-plus-lts|\ - firefly,rk3568-roc-pc) + xunlong,orangepi-r1-plus-lts) ucidef_set_interfaces_lan_wan 'eth1' 'eth0' ;; + fastrhino,r66s|\ + firefly,rk3568-roc-pc) + ucidef_set_interfaces_lan_wan "eth0" "eth1" + ;; friendlyelec,nanopi-r5s) ucidef_set_interfaces_lan_wan "eth1 eth2" "eth0" ;; diff --git a/target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity b/target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity index e9a0687a807774..7577d1cf4f2a7c 100644 --- a/target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity +++ b/target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity @@ -43,6 +43,7 @@ sharevdi,guangmiao-g4c) set_interface_core 10 "eth0" set_interface_core 20 "eth1" ;; +fastrhino,r66s|\ firefly,rk3568-roc-pc) set_interface_core 2 "eth0" set_interface_core 4 "eth1" diff --git a/target/linux/rockchip/armv8/base-files/lib/preinit/04_reorder_eth b/target/linux/rockchip/armv8/base-files/lib/preinit/04_reorder_eth deleted file mode 100644 index e4576fd923b09c..00000000000000 --- a/target/linux/rockchip/armv8/base-files/lib/preinit/04_reorder_eth +++ /dev/null @@ -1,13 +0,0 @@ -. /lib/functions.sh - -preinit_reorder_eth() { - case $(board_name) in - firefly,rk3568-roc-pc) - ip link set eth0 name ethtmp - ip link set eth1 name eth0 - ip link set ethtmp name eth1 - ;; - esac -} - -boot_hook_add preinit_main preinit_reorder_eth diff --git a/target/linux/rockchip/files-5.19/arch/arm64/boot/dts/rockchip/rk3568-r66s.dts b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-r66s.dts similarity index 100% rename from target/linux/rockchip/files-5.19/arch/arm64/boot/dts/rockchip/rk3568-r66s.dts rename to target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-r66s.dts diff --git a/target/linux/rockchip/files-5.19/arch/arm64/boot/dts/rockchip/rk3568-station-p2.dts b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-station-p2.dts similarity index 100% rename from target/linux/rockchip/files-5.19/arch/arm64/boot/dts/rockchip/rk3568-station-p2.dts rename to target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-station-p2.dts diff --git a/target/linux/rockchip/patches-5.19/105-nanopi-r4s-sd-signalling.patch b/target/linux/rockchip/patches-5.19/0105-nanopi-r4s-sd-signalling.patch similarity index 100% rename from target/linux/rockchip/patches-5.19/105-nanopi-r4s-sd-signalling.patch rename to target/linux/rockchip/patches-5.19/0105-nanopi-r4s-sd-signalling.patch diff --git a/target/linux/rockchip/patches-5.19/0911-kernel-dma-adjust-default-coherent_pool-to-2MiB.patch b/target/linux/rockchip/patches-5.19/0911-kernel-dma-adjust-default-coherent_pool-to-2MiB.patch new file mode 100644 index 00000000000000..690c85dbb65323 --- /dev/null +++ b/target/linux/rockchip/patches-5.19/0911-kernel-dma-adjust-default-coherent_pool-to-2MiB.patch @@ -0,0 +1,28 @@ +From 16bdf3e76fec6ddb44f1fcf221139fb39d225031 Mon Sep 17 00:00:00 2001 +From: Igor Pecovnik +Date: Sat, 2 Jan 2021 05:23:55 +0000 +Subject: [PATCH] kernel: dma: adjust default coherent_pool to 2MiB + +--- + kernel/dma/pool.c | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +--- a/kernel/dma/pool.c ++++ b/kernel/dma/pool.c +@@ -189,13 +189,11 @@ static int __init dma_atomic_pool_init(v + int ret = 0; + + /* +- * If coherent_pool was not used on the command line, default the pool +- * sizes to 128KB per 1GB of memory, min 128KB, max MAX_ORDER-1. ++ * Always use 2MiB as default pool size. ++ * See: https://forum.armbian.com/topic/4811-uas-mainline-kernel-coherent-pool-memory-size/ + */ + if (!atomic_pool_size) { +- unsigned long pages = totalram_pages() / (SZ_1G / SZ_128K); +- pages = min_t(unsigned long, pages, MAX_ORDER_NR_PAGES); +- atomic_pool_size = max_t(size_t, pages << PAGE_SHIFT, SZ_128K); ++ atomic_pool_size = SZ_2M; + } + INIT_WORK(&atomic_pool_work, atomic_pool_work_fn); +