From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
To: robh+dt@kernel.org, catalin.marinas@arm.com, hch@lst.de,
ardb@kernel.org, linux-kernel@vger.kernel.org
Cc: robin.murphy@arm.com, linux-arm-kernel@lists.infradead.org,
linux-rpi-kernel@lists.infradead.org, jeremy.linton@arm.com,
iommu@lists.linux-foundation.org, devicetree@vger.kernel.org,
Nicolas Saenz Julienne <nsaenzjulienne@suse.de>,
Will Deacon <will@kernel.org>
Subject: [PATCH v3 2/8] arm64: mm: Move zone_dma_bits initialization into zone_sizes_init()
Date: Wed, 14 Oct 2020 21:12:04 +0200 [thread overview]
Message-ID: <20201014191211.27029-3-nsaenzjulienne@suse.de> (raw)
In-Reply-To: <20201014191211.27029-1-nsaenzjulienne@suse.de>
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 <nsaenzjulienne@suse.de>
---
arch/arm64/mm/init.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index 1d29f2ca81c7..ef0ef0087e2c 100644
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -196,6 +196,8 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max)
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
@@ -386,11 +388,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
--
2.28.0
next prev parent reply other threads:[~2020-10-14 19:12 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-14 19:12 [PATCH v3 0/8] arm64: Default to 32-bit wide ZONE_DMA Nicolas Saenz Julienne
2020-10-14 19:12 ` [PATCH v3 1/8] arm64: mm: Move reserve_crashkernel() into mem_init() Nicolas Saenz Julienne
2020-10-15 8:40 ` Will Deacon
2020-10-15 8:55 ` Nicolas Saenz Julienne
2020-10-14 19:12 ` Nicolas Saenz Julienne [this message]
2020-10-14 19:12 ` [PATCH v3 3/8] of/address: Introduce of_dma_get_max_cpu_address() Nicolas Saenz Julienne
2020-10-14 22:02 ` Rob Herring
2020-10-15 6:56 ` Ard Biesheuvel
2020-10-15 9:16 ` Nicolas Saenz Julienne
2020-10-15 9:18 ` Ard Biesheuvel
2020-10-15 8:54 ` Nicolas Saenz Julienne
2020-10-15 5:42 ` Christoph Hellwig
2020-10-15 10:03 ` Nicolas Saenz Julienne
2020-10-16 13:19 ` Rob Herring
2020-10-14 19:12 ` [PATCH v3 4/8] of: unittest: Add test for of_dma_get_max_cpu_address() Nicolas Saenz Julienne
2020-10-14 22:04 ` Rob Herring
2020-10-15 9:51 ` Nicolas Saenz Julienne
2020-10-14 19:12 ` [PATCH v3 5/8] dma-direct: Turn zone_dma_bits default value into a define Nicolas Saenz Julienne
2020-10-15 5:38 ` Christoph Hellwig
2020-10-15 10:05 ` Nicolas Saenz Julienne
2020-10-14 19:12 ` [PATCH v3 6/8] arm64: mm: Set ZONE_DMA size based on devicetree's dma-ranges Nicolas Saenz Julienne
2020-10-15 5:39 ` Christoph Hellwig
2020-10-15 10:05 ` Nicolas Saenz Julienne
2020-10-14 19:12 ` [PATCH v3 7/8] arm64: mm: Set ZONE_DMA size based on early IORT scan Nicolas Saenz Julienne
2020-10-15 10:31 ` Lorenzo Pieralisi
2020-10-16 6:56 ` Ard Biesheuvel
2020-10-15 14:26 ` Hanjun Guo
2020-10-15 15:15 ` Nicolas Saenz Julienne
2020-10-15 18:03 ` Catalin Marinas
2020-10-16 6:51 ` Hanjun Guo
2020-10-16 6:54 ` Ard Biesheuvel
2020-10-16 7:27 ` Hanjun Guo
2020-10-16 7:34 ` Hanjun Guo
2020-10-14 19:12 ` [PATCH v3 8/8] mm: Update DMA zones description Nicolas Saenz Julienne
2020-10-15 5:40 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201014191211.27029-3-nsaenzjulienne@suse.de \
--to=nsaenzjulienne@suse.de \
--cc=ardb@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=devicetree@vger.kernel.org \
--cc=hch@lst.de \
--cc=iommu@lists.linux-foundation.org \
--cc=jeremy.linton@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=robh+dt@kernel.org \
--cc=robin.murphy@arm.com \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).