From: Jing Xiangfeng <jingxiangfeng@huawei.com>
To: <gregkh@linuxfoundation.org>, <catalin.marinas@arm.com>,
<will@kernel.org>, <akpm@linux-foundation.org>,
<nsaenzjulienne@suse.de>, <paul.walmsley@sifive.com>,
<palmer@dabbelt.com>, <aou@eecs.berkeley.edu>, <rppt@kernel.org>,
<lorenzo.pieralisi@arm.com>, <guohanjun@huawei.com>,
<sudeep.holla@arm.com>, <rjw@rjwysocki.net>, <lenb@kernel.org>,
<song.bao.hua@hisilicon.com>, <ardb@kernel.org>,
<anshuman.khandual@arm.com>, <bhelgaas@google.com>, <guro@fb.com>,
<robh+dt@kernel.org>
Cc: <stable@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org>,
<frowand.list@gmail.com>, <devicetree@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <linux-mm@kvack.org>,
<linux-riscv@lists.infradead.org>, <jingxiangfeng@huawei.com>,
<wangkefeng.wang@huawei.com>,
Jeremy Linton <jeremy.linton@arm.com>
Subject: [PATCH stable v5.10 2/7] arm64: mm: Move zone_dma_bits initialization into zone_sizes_init()
Date: Wed, 3 Mar 2021 15:33:14 +0800 [thread overview]
Message-ID: <20210303073319.2215839-3-jingxiangfeng@huawei.com> (raw)
In-Reply-To: <20210303073319.2215839-1-jingxiangfeng@huawei.com>
From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
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 <nsaenzjulienne@suse.de>
Tested-by: Jeremy Linton <jeremy.linton@arm.com>
Link: https://lore.kernel.org/r/20201119175400.9995-3-nsaenzjulienne@suse.de
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Jing Xiangfeng <jingxiangfeng@huawei.com>
---
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 686653e33250..7da912bf4222 100644
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -190,6 +190,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
@@ -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
--
2.25.1
next prev parent reply other threads:[~2021-03-03 7:20 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-03 7:33 [PATCH stable v5.10 0/7] arm64: Default to 32-bit wide ZONE_DMA Jing Xiangfeng
2021-03-03 7:33 ` [PATCH stable v5.10 1/7] arm64: mm: Move reserve_crashkernel() into mem_init() Jing Xiangfeng
2021-03-07 15:25 ` Patch "arm64: mm: Move reserve_crashkernel() into mem_init()" has been added to the 5.10-stable tree gregkh
2021-03-03 7:33 ` Jing Xiangfeng [this message]
2021-03-07 15:25 ` Patch "arm64: mm: Move zone_dma_bits initialization into zone_sizes_init()" " gregkh
2021-03-03 7:33 ` [PATCH stable v5.10 3/7] of/address: Introduce of_dma_get_max_cpu_address() Jing Xiangfeng
2021-03-07 15:25 ` Patch "of/address: Introduce of_dma_get_max_cpu_address()" has been added to the 5.10-stable tree gregkh
2021-03-03 7:33 ` [PATCH stable v5.10 4/7] of: unittest: Add test for of_dma_get_max_cpu_address() Jing Xiangfeng
2021-03-07 15:25 ` Patch "of: unittest: Add test for of_dma_get_max_cpu_address()" has been added to the 5.10-stable tree gregkh
2021-03-03 7:33 ` [PATCH stable v5.10 5/7] arm64: mm: Set ZONE_DMA size based on devicetree's dma-ranges Jing Xiangfeng
2021-03-07 15:25 ` Patch "arm64: mm: Set ZONE_DMA size based on devicetree's dma-ranges" has been added to the 5.10-stable tree gregkh
2021-03-03 7:33 ` [PATCH stable v5.10 6/7] arm64: mm: Set ZONE_DMA size based on early IORT scan Jing Xiangfeng
2021-03-07 15:25 ` Patch "arm64: mm: Set ZONE_DMA size based on early IORT scan" has been added to the 5.10-stable tree gregkh
2021-03-03 7:33 ` [PATCH stable v5.10 7/7] mm: Remove examples from enum zone_type comment Jing Xiangfeng
2021-03-07 15:25 ` Patch "mm: Remove examples from enum zone_type comment" has been added to the 5.10-stable tree gregkh
2021-03-04 13:46 ` [PATCH stable v5.10 0/7] arm64: Default to 32-bit wide ZONE_DMA Greg KH
2021-03-04 14:05 ` Nicolas Saenz Julienne
2021-03-04 14:17 ` Greg KH
2021-03-04 15:09 ` Nicolas Saenz Julienne
2021-03-07 15:24 ` Greg KH
2021-03-08 3:20 ` Jing Xiangfeng
2021-03-08 9:58 ` Greg KH
2021-05-11 12:35 ` Kefeng Wang
2021-05-12 12:06 ` Greg KH
2021-06-23 6:59 ` Kefeng Wang
2021-06-23 7:12 ` Greg KH
2021-06-23 7:25 ` Kefeng Wang
2021-06-23 7:34 ` Greg KH
2021-06-23 8:01 ` Kefeng Wang
2021-06-25 10:19 ` Greg KH
2021-06-26 1:19 ` Kefeng Wang
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=20210303073319.2215839-3-jingxiangfeng@huawei.com \
--to=jingxiangfeng@huawei.com \
--cc=akpm@linux-foundation.org \
--cc=anshuman.khandual@arm.com \
--cc=aou@eecs.berkeley.edu \
--cc=ardb@kernel.org \
--cc=bhelgaas@google.com \
--cc=catalin.marinas@arm.com \
--cc=devicetree@vger.kernel.org \
--cc=frowand.list@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=guohanjun@huawei.com \
--cc=guro@fb.com \
--cc=jeremy.linton@arm.com \
--cc=lenb@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-riscv@lists.infradead.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=nsaenzjulienne@suse.de \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=rjw@rjwysocki.net \
--cc=robh+dt@kernel.org \
--cc=rppt@kernel.org \
--cc=song.bao.hua@hisilicon.com \
--cc=stable@vger.kernel.org \
--cc=sudeep.holla@arm.com \
--cc=wangkefeng.wang@huawei.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).