From: Nick Desaulniers <ndesaulniers@google.com>
To: song.bao.hua@hisilicon.com
Cc: akpm@linux-foundation.org, guro@fb.com,
linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org,
linuxarm@huawei.com, mike.kravetz@oracle.com,
sfr@canb.auug.org.au, will@kernel.org, ardb@kernel.org,
clang-built-linux@googlegroups.com
Subject: Re: arm64: mm: move dma_contiguous_reserve() to be after paging_init()
Date: Wed, 16 Sep 2020 17:19:34 -0700 [thread overview]
Message-ID: <20200917001934.2793370-1-ndesaulniers@google.com> (raw)
In-Reply-To: <20200916085933.25220-1-song.bao.hua@hisilicon.com>
It looks like that change referenced may also break arm32 boots with today's
next?
The following allows me to boot, but I have no idea if it's incorrect or not.
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 45f9d5ec2360..7118b98c1f5f 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -226,9 +226,6 @@ void __init arm_memblock_init(const struct machine_desc *mdesc)
early_init_fdt_reserve_self();
early_init_fdt_scan_reserved_mem();
- /* reserve memory for DMA contiguous allocations */
- dma_contiguous_reserve(arm_dma_limit);
-
arm_memblock_steal_permitted = false;
memblock_dump_all();
}
@@ -248,6 +245,9 @@ void __init bootmem_init(void)
*/
sparse_init();
+ /* reserve memory for DMA contiguous allocations */
+ dma_contiguous_reserve(arm_dma_limit);
+
/*
* Now free the memory - free_area_init needs
* the sparse mem_map arrays initialized by sparse_init()
next prev parent reply other threads:[~2020-09-17 0:19 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-16 8:59 [PATCH] " Barry Song
2020-09-16 15:12 ` Anders Roxell
2020-09-17 0:19 ` Nick Desaulniers [this message]
2020-09-17 0:27 ` Mike Kravetz
2020-09-17 1:35 ` Song Bao Hua (Barry Song)
2020-09-17 9:02 ` Will Deacon
2020-09-17 9:13 ` Stephen Rothwell
2020-09-17 9:36 ` Will Deacon
2020-09-17 0:57 ` Song Bao Hua (Barry Song)
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=20200917001934.2793370-1-ndesaulniers@google.com \
--to=ndesaulniers@google.com \
--cc=akpm@linux-foundation.org \
--cc=ardb@kernel.org \
--cc=clang-built-linux@googlegroups.com \
--cc=guro@fb.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-mm@kvack.org \
--cc=linuxarm@huawei.com \
--cc=mike.kravetz@oracle.com \
--cc=sfr@canb.auug.org.au \
--cc=song.bao.hua@hisilicon.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