From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Michael Ellerman <mpe@ellerman•id.au>
Cc: Rob Herring <robherring2@gmail•com>,
PowerPC <linuxppc-dev@lists•ozlabs.org>,
Hari Bathini <hbathini@linux•ibm.com>,
Lakshmi Ramasubramanian <nramas@linux•microsoft.com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Rob Herring <robh@kernel•org>
Subject: Re: linux-next: manual merge of the devicetree tree with the powerpc tree
Date: Thu, 18 Feb 2021 22:34:27 +1100 [thread overview]
Message-ID: <20210218223427.77109d83@canb.auug.org.au> (raw)
In-Reply-To: <874ki9vene.fsf@mpe.ellerman.id.au>
[-- Attachment #1: Type: text/plain, Size: 1229 bytes --]
Hi Michael,
On Thu, 18 Feb 2021 21:44:37 +1100 Michael Ellerman <mpe@ellerman•id.au> wrote:
>
> I think it just needs this?
>
> diff --git a/arch/powerpc/kexec/elf_64.c b/arch/powerpc/kexec/elf_64.c
> index 87e34611f93d..0492ca6003f3 100644
> --- a/arch/powerpc/kexec/elf_64.c
> +++ b/arch/powerpc/kexec/elf_64.c
> @@ -104,7 +104,7 @@ static void *elf64_load(struct kimage *image, char *kernel_buf,
>
> fdt = of_kexec_alloc_and_setup_fdt(image, initrd_load_addr,
> initrd_len, cmdline,
> - fdt_totalsize(initial_boot_params));
> + kexec_fdt_totalsize_ppc64(image));
> if (!fdt) {
> pr_err("Error setting up the new device tree.\n");
> ret = -EINVAL;
>
I thought about that, but the last argument to
of_kexec_alloc_and_setup_fdt() is extra_fdt_size and the allocation
done is for this:
fdt_size = fdt_totalsize(initial_boot_params) +
(cmdline ? strlen(cmdline) : 0) +
FDT_EXTRA_SPACE +
extra_fdt_size;
and kexec_fdt_totalsize_ppc64() also includes
fdt_totalsize(initial_boot_params) so I was not sure. Maybe
kexec_fdt_totalsize_ppc64() needs modification as well?
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2021-02-18 12:27 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-18 3:48 linux-next: manual merge of the devicetree tree with the powerpc tree Stephen Rothwell
2021-02-18 10:44 ` Michael Ellerman
2021-02-18 11:34 ` Stephen Rothwell [this message]
2021-02-18 13:52 ` Rob Herring
2021-02-18 20:31 ` Stephen Rothwell
2021-02-18 23:28 ` Michael Ellerman
-- strict thread matches above, loose matches on Subject: below --
2012-03-13 5:01 Stephen Rothwell
2012-03-13 18:26 ` Grant Likely
2012-03-14 1:53 ` Gavin Shan
2012-03-14 8:29 ` Benjamin Herrenschmidt
2012-03-14 9:02 ` Gavin Shan
2012-02-28 2:06 Stephen Rothwell
2012-02-28 4:38 ` Grant Likely
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=20210218223427.77109d83@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hbathini@linux$(echo .)ibm.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=mpe@ellerman$(echo .)id.au \
--cc=nramas@linux$(echo .)microsoft.com \
--cc=robh@kernel$(echo .)org \
--cc=robherring2@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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