From: Stafford Horne <shorne@gmail.com>
To: openrisc@lists.librecores.org
Subject: [OpenRISC] [PATCH] hw/openrisc: page-align FDT address
Date: Thu, 28 Apr 2022 21:01:52 +0900 [thread overview]
Message-ID: <YmqCMNHhFCMqjjVF@antec> (raw)
In-Reply-To: <20220428103516.1149436-1-Jason@zx2c4.com>
On Thu, Apr 28, 2022 at 12:35:16PM +0200, Jason A. Donenfeld wrote:
> The QEMU-provided FDT was only being recognized by the kernel when it
> was used in conjunction with -initrd. Without it, the magic bytes
> wouldn't be there and the kernel couldn't load it. This patch fixes the
> issue by page aligning the provided FDT.
>
> Cc: Stafford Horne <shorne@gmail.com>
> Cc: Peter Maydell <peter.maydell@linaro.org>
> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
> ---
> hw/openrisc/openrisc_sim.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c
> index 8184caa60b..99b14940f4 100644
> --- a/hw/openrisc/openrisc_sim.c
> +++ b/hw/openrisc/openrisc_sim.c
> @@ -356,7 +356,7 @@ static uint32_t openrisc_load_fdt(Or1ksimState *state, hwaddr load_start,
> }
>
> /* We put fdt right after the kernel and/or initrd. */
> - fdt_addr = ROUND_UP(load_start, 4);
> + fdt_addr = TARGET_PAGE_ALIGN(load_start);
>
> ret = fdt_pack(fdt);
> /* Should only fail if we've built a corrupted tree */
> --
> 2.35.1
This looks OK to me, just for clarity we currently are loading:
- 0x100 - Kernel
- page aligned - Initrd
- word aligned - FDT
In the absense of the initrd we need to ensure the FDT is page aligned.
If someone else wants to pick this up to push to qemu if would help, I don't
have anything planned at the moment.
If not I will start a queue in a few days.
Acked-by: Stafford Horne <shorne@gmail.com>
prev parent reply other threads:[~2022-04-28 12:01 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-28 10:35 [OpenRISC] [PATCH] hw/openrisc: page-align FDT address Jason A. Donenfeld
2022-04-28 12:01 ` Stafford Horne [this message]
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=YmqCMNHhFCMqjjVF@antec \
--to=shorne@gmail.com \
--cc=openrisc@lists.librecores.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 read-only IMAP folder(s) and NNTP newsgroup(s).