Patch "arm64: mm: Move zone_dma_bits initialization into zone_sizes_init()" has been added to the 5.10-stable tree
From: <gregkh@linuxfoundation.org>
Date: 2021-03-07 15:25:57
Also in:
linux-arm-kernel, linux-riscv
This is a note to let you know that I've just added the patch titled
arm64: mm: Move zone_dma_bits initialization into zone_sizes_init()
to the 5.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
arm64-mm-move-zone_dma_bits-initialization-into-zone_sizes_init.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let [off-list ref] know about it.
From foo@baz Sun Mar 7 04:22:37 PM CET 2021
From: Jing Xiangfeng <redacted>
Date: Wed, 3 Mar 2021 15:33:14 +0800
Subject: arm64: mm: Move zone_dma_bits initialization into zone_sizes_init()
To: <gregkh@linuxfoundation.org>, <catalin.marinas@arm.com>, <will@kernel.org>, <akpm@linux-foundation.org>, <redacted>, <redacted>, <palmer@dabbelt.com>, <aou@eecs.berkeley.edu>, <rppt@kernel.org>, <redacted>, <guohanjun@huawei.com>, <redacted>, <redacted>, <lenb@kernel.org>, <redacted>, <ardb@kernel.org>, <redacted>, <bhelgaas@google.com>, <redacted>, <robh+dt@kernel.org>
Cc: <redacted>, <redacted>, <redacted>, <redacted>, <redacted>, <redacted>, <redacted>, <redacted>, <redacted>, Jeremy Linton <redacted>
Message-ID: [ref]
From: Nicolas Saenz Julienne <redacted>
commit 9804f8c69b04a39d0ba41d19e6bdc6aa91c19725 upstream
zone_dma_bits's initialization happens earlier that it's actually
needed, in arm64_memblock_init(). So move it into the more suitable
zone_sizes_init().
Signed-off-by: Nicolas Saenz Julienne <redacted>
Tested-by: Jeremy Linton <redacted>
Link: https://lore.kernel.org/r/20201119175400.9995-3-nsaenzjulienne@suse.de (local)
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: <redacted>
Signed-off-by: Jing Xiangfeng <redacted>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
arch/arm64/mm/init.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c@@ -190,6 +190,8 @@ static void __init zone_sizes_init(unsig unsigned long max_zone_pfns[MAX_NR_ZONES] = {0}; #ifdef CONFIG_ZONE_DMA + zone_dma_bits = ARM64_ZONE_DMA_BITS; + arm64_dma_phys_limit = max_zone_phys(zone_dma_bits); max_zone_pfns[ZONE_DMA] = PFN_DOWN(arm64_dma_phys_limit); #endif #ifdef CONFIG_ZONE_DMA32
@@ -376,11 +378,6 @@ void __init arm64_memblock_init(void) early_init_fdt_scan_reserved_mem(); - if (IS_ENABLED(CONFIG_ZONE_DMA)) { - zone_dma_bits = ARM64_ZONE_DMA_BITS; - arm64_dma_phys_limit = max_zone_phys(ARM64_ZONE_DMA_BITS); - } - if (IS_ENABLED(CONFIG_ZONE_DMA32)) arm64_dma32_phys_limit = max_zone_phys(32); else
Patches currently in stable-queue which might be from jingxiangfeng@huawei.com are queue-5.10/of-unittest-add-test-for-of_dma_get_max_cpu_address.patch queue-5.10/mm-remove-examples-from-enum-zone_type-comment.patch queue-5.10/arm64-mm-set-zone_dma-size-based-on-devicetree-s-dma-ranges.patch queue-5.10/of-address-introduce-of_dma_get_max_cpu_address.patch queue-5.10/arm64-mm-move-zone_dma_bits-initialization-into-zone_sizes_init.patch queue-5.10/arm64-mm-set-zone_dma-size-based-on-early-iort-scan.patch queue-5.10/arm64-mm-move-reserve_crashkernel-into-mem_init.patch