From 5eaffd803e5857980d31eeba92d11d2f0cb2125c Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Thu, 14 Dec 2023 16:45:10 +0800 Subject: [PATCH] sunxi: replace coherent pool hack with bootargs Signed-off-by: Tianling Shen --- package/boot/uboot-sunxi/uEnv-a64.txt | 2 +- package/boot/uboot-sunxi/uEnv-default.txt | 2 +- package/boot/uboot-sunxi/uEnv-h6.txt | 2 +- package/boot/uboot-sunxi/uEnv-h616.txt | 2 +- package/boot/uboot-sunxi/uEnv-pangolin.txt | 2 +- ...adjust-default-coherent_pool-to-2MiB.patch | 28 ------------------- 6 files changed, 5 insertions(+), 33 deletions(-) delete mode 100644 target/linux/sunxi/patches-5.15/911-kernel-dma-adjust-default-coherent_pool-to-2MiB.patch diff --git a/package/boot/uboot-sunxi/uEnv-a64.txt b/package/boot/uboot-sunxi/uEnv-a64.txt index a47ebda613..7de35de03f 100644 --- a/package/boot/uboot-sunxi/uEnv-a64.txt +++ b/package/boot/uboot-sunxi/uEnv-a64.txt @@ -2,6 +2,6 @@ setenv mmc_rootpart 2 part uuid mmc ${mmc_bootdev}:${mmc_rootpart} uuid setenv loadkernel fatload mmc \$mmc_bootdev \$kernel_addr_r uImage setenv loaddtb fatload mmc \$mmc_bootdev \$fdt_addr_r dtb -setenv bootargs console=ttyS0,115200 earlyprintk root=PARTUUID=${uuid} rootwait earlycon=uart,mmio32,0x01c28000 +setenv bootargs coherent_pool=2M console=ttyS0,115200 earlyprintk root=PARTUUID=${uuid} rootwait earlycon=uart,mmio32,0x01c28000 setenv uenvcmd run loadkernel \&\& run loaddtb \&\& booti \$kernel_addr_r - \$fdt_addr_r run uenvcmd diff --git a/package/boot/uboot-sunxi/uEnv-default.txt b/package/boot/uboot-sunxi/uEnv-default.txt index 36e41c59b1..4ea55edc78 100644 --- a/package/boot/uboot-sunxi/uEnv-default.txt +++ b/package/boot/uboot-sunxi/uEnv-default.txt @@ -3,6 +3,6 @@ setenv mmc_rootpart 2 part uuid mmc ${mmc_bootdev}:${mmc_rootpart} uuid setenv loadkernel fatload mmc \$mmc_bootdev \$kernel_addr_r uImage setenv loaddtb fatload mmc \$mmc_bootdev \$fdt_addr_r dtb -setenv bootargs console=ttyS0,115200 earlyprintk root=PARTUUID=${uuid} rootwait +setenv bootargs coherent_pool=2M console=ttyS0,115200 earlyprintk root=PARTUUID=${uuid} rootwait setenv uenvcmd run loadkernel \&\& run loaddtb \&\& bootm \$kernel_addr_r - \$fdt_addr_r run uenvcmd diff --git a/package/boot/uboot-sunxi/uEnv-h6.txt b/package/boot/uboot-sunxi/uEnv-h6.txt index 78810ff223..53c7707929 100644 --- a/package/boot/uboot-sunxi/uEnv-h6.txt +++ b/package/boot/uboot-sunxi/uEnv-h6.txt @@ -2,6 +2,6 @@ setenv mmc_rootpart 2 part uuid mmc ${mmc_bootdev}:${mmc_rootpart} uuid setenv loadkernel fatload mmc \$mmc_bootdev \$kernel_addr_r uImage setenv loaddtb fatload mmc \$mmc_bootdev \$fdt_addr_r dtb -setenv bootargs console=ttyS0,115200 earlyprintk root=PARTUUID=${uuid} rootwait +setenv bootargs coherent_pool=2M console=ttyS0,115200 earlyprintk root=PARTUUID=${uuid} rootwait setenv uenvcmd run loadkernel \&\& run loaddtb \&\& booti \$kernel_addr_r - \$fdt_addr_r run uenvcmd diff --git a/package/boot/uboot-sunxi/uEnv-h616.txt b/package/boot/uboot-sunxi/uEnv-h616.txt index 78810ff223..53c7707929 100644 --- a/package/boot/uboot-sunxi/uEnv-h616.txt +++ b/package/boot/uboot-sunxi/uEnv-h616.txt @@ -2,6 +2,6 @@ setenv mmc_rootpart 2 part uuid mmc ${mmc_bootdev}:${mmc_rootpart} uuid setenv loadkernel fatload mmc \$mmc_bootdev \$kernel_addr_r uImage setenv loaddtb fatload mmc \$mmc_bootdev \$fdt_addr_r dtb -setenv bootargs console=ttyS0,115200 earlyprintk root=PARTUUID=${uuid} rootwait +setenv bootargs coherent_pool=2M console=ttyS0,115200 earlyprintk root=PARTUUID=${uuid} rootwait setenv uenvcmd run loadkernel \&\& run loaddtb \&\& booti \$kernel_addr_r - \$fdt_addr_r run uenvcmd diff --git a/package/boot/uboot-sunxi/uEnv-pangolin.txt b/package/boot/uboot-sunxi/uEnv-pangolin.txt index 9c4fa11220..b12717ea0d 100644 --- a/package/boot/uboot-sunxi/uEnv-pangolin.txt +++ b/package/boot/uboot-sunxi/uEnv-pangolin.txt @@ -1,6 +1,6 @@ setenv fdt_high ffffffff setenv loadkernel fatload mmc 0 \$kernel_addr_r uImage setenv loaddtb fatload mmc 0 \$fdt_addr_r dtb -setenv bootargs console=ttyS2,115200 earlyprintk root=/dev/mmcblk0p2 rootwait +setenv bootargs coherent_pool=2M console=ttyS2,115200 earlyprintk root=/dev/mmcblk0p2 rootwait setenv uenvcmd run loadkernel \&\& run loaddtb \&\& bootm \$kernel_addr_r - \$fdt_addr_r run uenvcmd diff --git a/target/linux/sunxi/patches-5.15/911-kernel-dma-adjust-default-coherent_pool-to-2MiB.patch b/target/linux/sunxi/patches-5.15/911-kernel-dma-adjust-default-coherent_pool-to-2MiB.patch deleted file mode 100644 index 690c85dbb6..0000000000 --- a/target/linux/sunxi/patches-5.15/911-kernel-dma-adjust-default-coherent_pool-to-2MiB.patch +++ /dev/null @@ -1,28 +0,0 @@ -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); -