From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Lakshmi Ramasubramanian <nramas@linux.microsoft.com>,
Rob Herring <robh@kernel.org>
Cc: Mimi Zohar <zohar@linux.ibm.com>,
Thiago Jung Bauermann <bauerman@linux.ibm.com>,
AKASHI Takahiro <takahiro.akashi@linaro.org>,
Greg KH <gregkh@linuxfoundation.org>,
Will Deacon <will@kernel.org>, Joe Perches <joe@perches.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Michael Ellerman <mpe@ellerman.id.au>,
Stephen Rothwell <sfr@canb.auug.org.au>,
James Morse <james.morse@arm.com>,
Sasha Levin <sashal@kernel.org>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
Frank Rowand <frowand.list@gmail.com>,
Vincenzo Frascino <vincenzo.frascino@arm.com>,
Mark Rutland <mark.rutland@arm.com>,
dmitry.kasatkin@gmail.com, James Morris <jmorris@namei.org>,
"Serge E. Hallyn" <serge@hallyn.com>,
Pavel Tatashin <pasha.tatashin@soleen.com>,
Allison Randal <allison@lohutok.net>,
Masahiro Yamada <masahiroy@kernel.org>,
Matthias Brugger <mbrugger@suse.com>,
Hsin-Yi Wang <hsinyi@chromium.org>,
tao.li@vivo.com, Christophe Leroy <christophe.leroy@c-s.fr>,
prsriva@linux.microsoft.com, balajib@linux.microsoft.com,
linux-integrity <linux-integrity@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux ARM <linux-arm-kernel@lists.infradead.org>,
"open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS"
<devicetree@vger.kernel.org>,
linuxppc-dev <linuxppc-dev@lists.ozlabs.org>
Subject: Re: [PATCH v19 05/13] of: Add a common kexec FDT setup function
Date: Tue, 15 Jun 2021 14:17:59 +0200 [thread overview]
Message-ID: <CAMuHMdVSuNS4edh-zM0_sbC0i1AAjQ9Y0n_8Mjz=3CALkW4pgg@mail.gmail.com> (raw)
In-Reply-To: <20210221174930.27324-6-nramas@linux.microsoft.com>
Hi Lakshmi and Rob,
On Sun, Feb 21, 2021 at 6:52 PM Lakshmi Ramasubramanian
<nramas@linux.microsoft.com> wrote:
> From: Rob Herring <robh@kernel.org>
>
> Both arm64 and powerpc do essentially the same FDT /chosen setup for
> kexec. The differences are either omissions that arm64 should have
> or additional properties that will be ignored. The setup code can be
> combined and shared by both powerpc and arm64.
>
> The differences relative to the arm64 version:
> - If /chosen doesn't exist, it will be created (should never happen).
> - Any old dtb and initrd reserved memory will be released.
> - The new initrd and elfcorehdr are marked reserved.
> - "linux,booted-from-kexec" is set.
>
> The differences relative to the powerpc version:
> - "kaslr-seed" and "rng-seed" may be set.
> - "linux,elfcorehdr" is set.
> - Any existing "linux,usable-memory-range" is removed.
>
> Combine the code for setting up the /chosen node in the FDT and updating
> the memory reservation for kexec, for powerpc and arm64, in
> of_kexec_alloc_and_setup_fdt() and move it to "drivers/of/kexec.c".
>
> Signed-off-by: Rob Herring <robh@kernel.org>
> Signed-off-by: Lakshmi Ramasubramanian <nramas@linux.microsoft.com>
> --- /dev/null
> +++ b/drivers/of/kexec.c
> +/*
> + * of_kexec_alloc_and_setup_fdt - Alloc and setup a new Flattened Device Tree
> + *
> + * @image: kexec image being loaded.
> + * @initrd_load_addr: Address where the next initrd will be loaded.
> + * @initrd_len: Size of the next initrd, or 0 if there will be none.
> + * @cmdline: Command line for the next kernel, or NULL if there will
> + * be none.
> + * @extra_fdt_size: Additional size for the new FDT buffer.
> + *
> + * Return: fdt on success, or NULL errno on error.
> + */
> +void *of_kexec_alloc_and_setup_fdt(const struct kimage *image,
> + unsigned long initrd_load_addr,
> + unsigned long initrd_len,
> + const char *cmdline, size_t extra_fdt_size)
> +{
> + /* Did we boot using an initrd? */
> + prop = fdt_getprop(fdt, chosen_node, "linux,initrd-start", NULL);
> + if (prop) {
> + u64 tmp_start, tmp_end, tmp_size;
> +
> + tmp_start = fdt64_to_cpu(*((const fdt64_t *) prop));
> +
> + prop = fdt_getprop(fdt, chosen_node, "linux,initrd-end", NULL);
> + if (!prop) {
> + ret = -EINVAL;
> + goto out;
> + }
> +
> + tmp_end = fdt64_to_cpu(*((const fdt64_t *) prop));
Some kernel code assumes "linux,initrd-{start,end}" are 64-bit,
other code assumes 32-bit.
linux/Documentation/arm/uefi.rst says 64-bit,
dt-schema/schemas/chosen.yaml says 32-bit.
> +
> + /*
> + * kexec reserves exact initrd size, while firmware may
> + * reserve a multiple of PAGE_SIZE, so check for both.
> + */
> + tmp_size = tmp_end - tmp_start;
> + ret = fdt_find_and_del_mem_rsv(fdt, tmp_start, tmp_size);
> + if (ret == -ENOENT)
> + ret = fdt_find_and_del_mem_rsv(fdt, tmp_start,
> + round_up(tmp_size, PAGE_SIZE));
> + if (ret == -EINVAL)
> + goto out;
> + }
> +
> + /* add initrd-* */
> + if (initrd_load_addr) {
> + ret = fdt_setprop_u64(fdt, chosen_node, FDT_PROP_INITRD_START,
> + initrd_load_addr);
> + if (ret)
> + goto out;
> +
> + ret = fdt_setprop_u64(fdt, chosen_node, FDT_PROP_INITRD_END,
> + initrd_load_addr + initrd_len);
> + if (ret)
> + goto out;
> +
> + ret = fdt_add_mem_rsv(fdt, initrd_load_addr, initrd_len);
> + if (ret)
> + goto out;
> +
> + } else {
> + ret = fdt_delprop(fdt, chosen_node, FDT_PROP_INITRD_START);
> + if (ret && (ret != -FDT_ERR_NOTFOUND))
> + goto out;
> +
> + ret = fdt_delprop(fdt, chosen_node, FDT_PROP_INITRD_END);
> + if (ret && (ret != -FDT_ERR_NOTFOUND))
> + goto out;
> + }
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-06-15 19:14 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-21 17:49 [PATCH v19 00/13] Carry forward IMA measurement log on kexec on ARM64 Lakshmi Ramasubramanian
2021-02-21 17:49 ` [PATCH v19 01/13] kexec: Move ELF fields to struct kimage Lakshmi Ramasubramanian
2021-02-24 1:03 ` Thiago Jung Bauermann
2021-02-21 17:49 ` [PATCH v19 02/13] arm64: Use ELF fields defined in 'struct kimage' Lakshmi Ramasubramanian
2021-02-24 1:07 ` Thiago Jung Bauermann
2021-02-21 17:49 ` [PATCH v19 03/13] powerpc: " Lakshmi Ramasubramanian
2021-02-24 1:07 ` Thiago Jung Bauermann
2021-02-21 17:49 ` [PATCH v19 04/13] x86: " Lakshmi Ramasubramanian
2021-02-24 1:08 ` Thiago Jung Bauermann
2021-02-24 1:13 ` Thiago Jung Bauermann
2021-02-21 17:49 ` [PATCH v19 05/13] of: Add a common kexec FDT setup function Lakshmi Ramasubramanian
2021-02-24 1:20 ` Thiago Jung Bauermann
2021-02-24 1:57 ` Lakshmi Ramasubramanian
2021-06-15 12:17 ` Geert Uytterhoeven [this message]
2021-06-15 14:01 ` Rob Herring
2021-06-15 16:13 ` nramas
2021-06-15 16:34 ` Rob Herring
2021-06-16 2:23 ` Michael Ellerman
2021-06-16 15:12 ` Rob Herring
2021-02-21 17:49 ` [PATCH v19 06/13] arm64: Use common of_kexec_alloc_and_setup_fdt() Lakshmi Ramasubramanian
2021-02-21 17:49 ` [PATCH v19 07/13] powerpc: " Lakshmi Ramasubramanian
2021-02-21 17:49 ` [PATCH v19 08/13] powerpc: Move ima buffer fields to struct kimage Lakshmi Ramasubramanian
2021-02-21 17:49 ` [PATCH v19 09/13] powerpc: Enable passing IMA log to next kernel on kexec Lakshmi Ramasubramanian
2021-02-21 17:49 ` [PATCH v19 10/13] powerpc: Move arch independent ima kexec functions to drivers/of/kexec.c Lakshmi Ramasubramanian
2021-02-21 17:49 ` [PATCH v19 11/13] kexec: Use fdt_appendprop_addrrange() to add ima buffer to FDT Lakshmi Ramasubramanian
2021-02-21 17:49 ` [PATCH v19 12/13] powerpc: Delete unused function delete_fdt_mem_rsv() Lakshmi Ramasubramanian
2021-02-21 17:49 ` [PATCH v19 13/13] arm64: Enable passing IMA log to next kernel on kexec Lakshmi Ramasubramanian
2021-03-02 15:06 ` [PATCH v19 00/13] Carry forward IMA measurement log on kexec on ARM64 Rob Herring
2021-03-02 15:25 ` Lakshmi Ramasubramanian
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='CAMuHMdVSuNS4edh-zM0_sbC0i1AAjQ9Y0n_8Mjz=3CALkW4pgg@mail.gmail.com' \
--to=geert@linux-m68k.org \
--cc=allison@lohutok.net \
--cc=balajib@linux.microsoft.com \
--cc=bauerman@linux.ibm.com \
--cc=benh@kernel.crashing.org \
--cc=catalin.marinas@arm.com \
--cc=christophe.leroy@c-s.fr \
--cc=devicetree@vger.kernel.org \
--cc=dmitry.kasatkin@gmail.com \
--cc=frowand.list@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=hsinyi@chromium.org \
--cc=james.morse@arm.com \
--cc=jmorris@namei.org \
--cc=joe@perches.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mark.rutland@arm.com \
--cc=masahiroy@kernel.org \
--cc=mbrugger@suse.com \
--cc=mpe@ellerman.id.au \
--cc=nramas@linux.microsoft.com \
--cc=pasha.tatashin@soleen.com \
--cc=paulus@samba.org \
--cc=prsriva@linux.microsoft.com \
--cc=robh@kernel.org \
--cc=sashal@kernel.org \
--cc=serge@hallyn.com \
--cc=sfr@canb.auug.org.au \
--cc=takahiro.akashi@linaro.org \
--cc=tao.li@vivo.com \
--cc=vincenzo.frascino@arm.com \
--cc=will@kernel.org \
--cc=zohar@linux.ibm.com \
/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).