From: Matt Fleming <matt-mF/unelCI9GS6iBeEJttW/XRex20P6io@public.gmane.org>
To: David Daney <ddaney.cavm-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org>,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
Frank Rowand
<frowand.list-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
Grant Likely
<grant.likely-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>,
Pawel Moll <pawel.moll-5wv7dgnIgG8@public.gmane.org>,
Ian Campbell
<ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org>,
Kumar Gala <galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>,
Ganapatrao Kulkarni
<gkulkarni-M3mlKVOIwJVv6pq1l3V1OdBPR1lH4CV8@public.gmane.org>,
Robert Richter <rrichter-YGCgFSpz5w/QT0dZR+AlfA@public.gmane.org>,
Ard Biesheuvel
<ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>,
Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org>,
Catalin Marinas <catalin.marinas-5wv7dgnIgG8@public.gmane.org>,
linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
David Daney <david.daney-YGCgFSpz5w/QT0dZR+AlfA@public.gmane.org>
Subject: Re: [PATCH v15 1/6] efi: ARM/arm64: ignore DT memory nodes instead of removing them
Date: Fri, 18 Mar 2016 12:26:09 +0000 [thread overview]
Message-ID: <20160318122609.GS2619@codeblueprint.co.uk> (raw)
In-Reply-To: <1457481587-8976-2-git-send-email-ddaney.cavm-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
On Tue, 08 Mar, at 03:59:42PM, David Daney wrote:
> From: Ard Biesheuvel <ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
>
> There are two problems with the UEFI stub DT memory node removal
> routine:
> - it deletes nodes as it traverses the tree, which happens to work
> but is not supported, as deletion invalidates the node iterator;
> - deleting memory nodes entirely may discard annotations in the form
> of additional properties on the nodes.
>
> Since the discovery of DT memory nodes occurs strictly before the
> UEFI init sequence, we can simply clear the memblock memory table
> before parsing the UEFI memory map. This way, it is no longer
> necessary to remove the nodes, so we can remove that logic from the
> stub as well.
>
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> Signed-off-by: David Daney <david.daney-YGCgFSpz5w/QT0dZR+AlfA@public.gmane.org>
> ---
> drivers/firmware/efi/arm-init.c | 8 ++++++++
> drivers/firmware/efi/libstub/fdt.c | 24 +-----------------------
> 2 files changed, 9 insertions(+), 23 deletions(-)
I've not delved into the rest of the series too deeply, but this looks
like a straight forward change.
Reviewed-by: Matt Fleming <matt-mF/unelCI9GS6iBeEJttW/XRex20P6io@public.gmane.org>
> diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c
> index 9e15d57..40c9d85 100644
> --- a/drivers/firmware/efi/arm-init.c
> +++ b/drivers/firmware/efi/arm-init.c
> @@ -143,6 +143,14 @@ static __init void reserve_regions(void)
> if (efi_enabled(EFI_DBG))
> pr_info("Processing EFI memory map:\n");
>
> + /*
> + * Discard memblocks discovered so far: if there are any at this
> + * point, they originate from memory nodes in the DT, and UEFI
> + * uses its own memory map instead.
> + */
> + memblock_dump_all();
> + memblock_remove(0, ULLONG_MAX);
> +
> for_each_efi_memory_desc(&memmap, md) {
> paddr = md->phys_addr;
> npages = md->num_pages;
Out of curiosity, could some kind person explain (or point me at a
previous explanation for) why we may have both DT memory nodes and a
UEFI memory map and why they're not compatible enough to co-exist?
WARNING: multiple messages have this Message-ID (diff)
From: matt@codeblueprint.co.uk (Matt Fleming)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v15 1/6] efi: ARM/arm64: ignore DT memory nodes instead of removing them
Date: Fri, 18 Mar 2016 12:26:09 +0000 [thread overview]
Message-ID: <20160318122609.GS2619@codeblueprint.co.uk> (raw)
In-Reply-To: <1457481587-8976-2-git-send-email-ddaney.cavm@gmail.com>
On Tue, 08 Mar, at 03:59:42PM, David Daney wrote:
> From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>
> There are two problems with the UEFI stub DT memory node removal
> routine:
> - it deletes nodes as it traverses the tree, which happens to work
> but is not supported, as deletion invalidates the node iterator;
> - deleting memory nodes entirely may discard annotations in the form
> of additional properties on the nodes.
>
> Since the discovery of DT memory nodes occurs strictly before the
> UEFI init sequence, we can simply clear the memblock memory table
> before parsing the UEFI memory map. This way, it is no longer
> necessary to remove the nodes, so we can remove that logic from the
> stub as well.
>
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Signed-off-by: David Daney <david.daney@cavium.com>
> ---
> drivers/firmware/efi/arm-init.c | 8 ++++++++
> drivers/firmware/efi/libstub/fdt.c | 24 +-----------------------
> 2 files changed, 9 insertions(+), 23 deletions(-)
I've not delved into the rest of the series too deeply, but this looks
like a straight forward change.
Reviewed-by: Matt Fleming <matt@codeblueprint.co.uk>
> diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c
> index 9e15d57..40c9d85 100644
> --- a/drivers/firmware/efi/arm-init.c
> +++ b/drivers/firmware/efi/arm-init.c
> @@ -143,6 +143,14 @@ static __init void reserve_regions(void)
> if (efi_enabled(EFI_DBG))
> pr_info("Processing EFI memory map:\n");
>
> + /*
> + * Discard memblocks discovered so far: if there are any at this
> + * point, they originate from memory nodes in the DT, and UEFI
> + * uses its own memory map instead.
> + */
> + memblock_dump_all();
> + memblock_remove(0, ULLONG_MAX);
> +
> for_each_efi_memory_desc(&memmap, md) {
> paddr = md->phys_addr;
> npages = md->num_pages;
Out of curiosity, could some kind person explain (or point me at a
previous explanation for) why we may have both DT memory nodes and a
UEFI memory map and why they're not compatible enough to co-exist?
WARNING: multiple messages have this Message-ID (diff)
From: Matt Fleming <matt@codeblueprint.co.uk>
To: David Daney <ddaney.cavm@gmail.com>
Cc: Will Deacon <will.deacon@arm.com>,
linux-arm-kernel@lists.infradead.org,
Rob Herring <robh+dt@kernel.org>,
Frank Rowand <frowand.list@gmail.com>,
Grant Likely <grant.likely@linaro.org>,
Pawel Moll <pawel.moll@arm.com>,
Ian Campbell <ijc+devicetree@hellion.org.uk>,
Kumar Gala <galak@codeaurora.org>,
Ganapatrao Kulkarni <gkulkarni@caviumnetworks.com>,
Robert Richter <rrichter@cavium.com>,
Ard Biesheuvel <ard.biesheuvel@linaro.org>,
Mark Rutland <mark.rutland@arm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org,
devicetree@vger.kernel.org, David Daney <david.daney@cavium.com>
Subject: Re: [PATCH v15 1/6] efi: ARM/arm64: ignore DT memory nodes instead of removing them
Date: Fri, 18 Mar 2016 12:26:09 +0000 [thread overview]
Message-ID: <20160318122609.GS2619@codeblueprint.co.uk> (raw)
In-Reply-To: <1457481587-8976-2-git-send-email-ddaney.cavm@gmail.com>
On Tue, 08 Mar, at 03:59:42PM, David Daney wrote:
> From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>
> There are two problems with the UEFI stub DT memory node removal
> routine:
> - it deletes nodes as it traverses the tree, which happens to work
> but is not supported, as deletion invalidates the node iterator;
> - deleting memory nodes entirely may discard annotations in the form
> of additional properties on the nodes.
>
> Since the discovery of DT memory nodes occurs strictly before the
> UEFI init sequence, we can simply clear the memblock memory table
> before parsing the UEFI memory map. This way, it is no longer
> necessary to remove the nodes, so we can remove that logic from the
> stub as well.
>
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Signed-off-by: David Daney <david.daney@cavium.com>
> ---
> drivers/firmware/efi/arm-init.c | 8 ++++++++
> drivers/firmware/efi/libstub/fdt.c | 24 +-----------------------
> 2 files changed, 9 insertions(+), 23 deletions(-)
I've not delved into the rest of the series too deeply, but this looks
like a straight forward change.
Reviewed-by: Matt Fleming <matt@codeblueprint.co.uk>
> diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c
> index 9e15d57..40c9d85 100644
> --- a/drivers/firmware/efi/arm-init.c
> +++ b/drivers/firmware/efi/arm-init.c
> @@ -143,6 +143,14 @@ static __init void reserve_regions(void)
> if (efi_enabled(EFI_DBG))
> pr_info("Processing EFI memory map:\n");
>
> + /*
> + * Discard memblocks discovered so far: if there are any at this
> + * point, they originate from memory nodes in the DT, and UEFI
> + * uses its own memory map instead.
> + */
> + memblock_dump_all();
> + memblock_remove(0, ULLONG_MAX);
> +
> for_each_efi_memory_desc(&memmap, md) {
> paddr = md->phys_addr;
> npages = md->num_pages;
Out of curiosity, could some kind person explain (or point me at a
previous explanation for) why we may have both DT memory nodes and a
UEFI memory map and why they're not compatible enough to co-exist?
next prev parent reply other threads:[~2016-03-18 12:26 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-08 23:59 [PATCH v15 0/6] arm64, numa: Add numa support for arm64 platforms David Daney
2016-03-08 23:59 ` David Daney
2016-03-08 23:59 ` [PATCH v15 1/6] efi: ARM/arm64: ignore DT memory nodes instead of removing them David Daney
2016-03-08 23:59 ` David Daney
[not found] ` <1457481587-8976-2-git-send-email-ddaney.cavm-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-03-18 12:26 ` Matt Fleming [this message]
2016-03-18 12:26 ` Matt Fleming
2016-03-18 12:26 ` Matt Fleming
2016-03-18 12:31 ` Ard Biesheuvel
2016-03-18 12:31 ` Ard Biesheuvel
[not found] ` <CAKv+Gu8STa=tF0o1qje6LorYxzBon704Q_O2U=cvigg9v53hZw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2016-03-18 12:56 ` Matt Fleming
2016-03-18 12:56 ` Matt Fleming
2016-03-18 12:56 ` Matt Fleming
[not found] ` <20160318125600.GT2619-mF/unelCI9GS6iBeEJttW/XRex20P6io@public.gmane.org>
2016-03-18 13:11 ` Ard Biesheuvel
2016-03-18 13:11 ` Ard Biesheuvel
2016-03-18 13:11 ` Ard Biesheuvel
[not found] ` <1457481587-8976-1-git-send-email-ddaney.cavm-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-03-08 23:59 ` [PATCH v15 2/6] Documentation, dt, numa: dt bindings for NUMA David Daney
2016-03-08 23:59 ` David Daney
2016-03-08 23:59 ` David Daney
2016-03-08 23:59 ` [PATCH v15 3/6] of, numa: Add NUMA of binding implementation David Daney
2016-03-08 23:59 ` David Daney
2016-03-08 23:59 ` David Daney
2016-03-08 23:59 ` [PATCH v15 5/6] arm64, numa: Add NUMA support for arm64 platforms David Daney
2016-03-08 23:59 ` David Daney
2016-03-08 23:59 ` David Daney
[not found] ` <1457481587-8976-6-git-send-email-ddaney.cavm-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-04-13 14:09 ` Steve Capper
2016-04-13 14:09 ` Steve Capper
2016-04-13 14:09 ` Steve Capper
2016-04-13 14:30 ` Steve Capper
2016-04-13 14:30 ` Steve Capper
2016-04-13 14:30 ` Steve Capper
2016-03-08 23:59 ` [PATCH v15 6/6] arm64, mm, numa: Add NUMA balancing support for arm64 David Daney
2016-03-08 23:59 ` David Daney
2016-03-08 23:59 ` David Daney
2016-03-22 18:48 ` [PATCH v15 0/6] arm64, numa: Add numa support for arm64 platforms Jon Masters
2016-03-22 18:48 ` Jon Masters
2016-03-22 18:48 ` Jon Masters
[not found] ` <56F1936E.1090407-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2016-03-22 21:45 ` David Daney
2016-03-22 21:45 ` David Daney
2016-03-22 21:45 ` David Daney
2016-04-05 13:08 ` Graeme Gregory
[not found] ` <56F1BD15.4000701-M3mlKVOIwJVv6pq1l3V1OdBPR1lH4CV8@public.gmane.org>
2016-04-05 13:08 ` Graeme Gregory
2016-04-05 13:08 ` Graeme Gregory
2016-04-05 13:08 ` Graeme Gregory
2016-04-05 13:08 ` Graeme Gregory
2016-04-05 13:08 ` Graeme Gregory
2016-04-05 13:08 ` Graeme Gregory
2016-03-08 23:59 ` [PATCH v15 4/6] arm64: Move unflatten_device_tree() call earlier David Daney
2016-03-08 23:59 ` David Daney
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=20160318122609.GS2619@codeblueprint.co.uk \
--to=matt-mf/unelci9gs6ibeejttw/xrex20p6io@public.gmane.org \
--cc=ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \
--cc=catalin.marinas-5wv7dgnIgG8@public.gmane.org \
--cc=david.daney-YGCgFSpz5w/QT0dZR+AlfA@public.gmane.org \
--cc=ddaney.cavm-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=frowand.list-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org \
--cc=gkulkarni-M3mlKVOIwJVv6pq1l3V1OdBPR1lH4CV8@public.gmane.org \
--cc=grant.likely-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \
--cc=ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org \
--cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=mark.rutland-5wv7dgnIgG8@public.gmane.org \
--cc=pawel.moll-5wv7dgnIgG8@public.gmane.org \
--cc=robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
--cc=rrichter-YGCgFSpz5w/QT0dZR+AlfA@public.gmane.org \
--cc=will.deacon-5wv7dgnIgG8@public.gmane.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.