From: David Gow <davidgow@google.com>
To: Stephen Boyd <sboyd@kernel.org>
Cc: Rob Herring <robh+dt@kernel.org>,
linux-kernel@vger.kernel.org, patches@lists.linux.dev,
linux-um@lists.infradead.org,
linux-arm-kernel@lists.infradead.org,
kunit-dev@googlegroups.com, linux-kselftest@vger.kernel.org,
devicetree@vger.kernel.org,
Frank Rowand <frowand.list@gmail.com>,
Brendan Higgins <brendan.higgins@linux.dev>
Subject: Re: [PATCH 6/6] of: Add KUnit test to confirm DTB is loaded
Date: Wed, 24 Jan 2024 15:25:34 +0800 [thread overview]
Message-ID: <CABVgOSkFY_c5-=g2HeND4J4Fyxnx+_m0EtW8E=5JgJSRmXFdtg@mail.gmail.com> (raw)
In-Reply-To: <47062115ff518edf8c4b02e22f3058bc.sboyd@kernel.org>
[-- Attachment #1: Type: text/plain, Size: 3521 bytes --]
On Tue, 23 Jan 2024 at 06:48, Stephen Boyd <sboyd@kernel.org> wrote:
>
> Quoting David Gow (2024-01-15 21:03:12)
> > On Sat, 13 Jan 2024 at 04:07, Stephen Boyd <sboyd@kernel.org> wrote:
> > >
> > > Add a KUnit test that confirms a DTB has been loaded, i.e. there is a
> > > root node, and that the of_have_populated_dt() API works properly.
> > >
> > > Cc: Rob Herring <robh+dt@kernel.org>
> > > Cc: Frank Rowand <frowand.list@gmail.com>
> > > Cc: David Gow <davidgow@google.com>
> > > Cc: Brendan Higgins <brendan.higgins@linux.dev>
> > > Signed-off-by: Stephen Boyd <sboyd@kernel.org>
> > > ---
> >
> > I won't pretend to be a devicetree expert, but this looks good to me
> > from a KUnit point of view, and passes comfortably here.
> >
> > checkpatch seems to have one complaint about the kconfig help text.
> > Personally, I think the brief description is fine.
> >
> > Reviewed-by: David Gow <davidgow@google.com>
> >
>
> Thanks! I noticed that x86 has some devicetree init code. Did you happen
> to try on an x86 kvm instance? Or only run on UML?
>
I admit, I only tested on UML, plus a quick check that the default
kunitconfig wasn't broken on anything else.
A further look is showing:
aarch64: PASSED
UML: PASSED
UML LLVM: PASSED
powerpc64: PASSED
m68k: FAILED
i386: FAILED
x86_64: FAILED
x86_64 KASAN: FAILED
The failures are all of the form:
> [15:18:34] ============ of_have_populated_dt (2 subtests) =============
> [15:18:34] # of_have_populated_dt_false_when_flag_set: ASSERTION FAILED at drivers/of/of_test.c:53
> [15:18:34] Expected of_root is not null, but is
> [15:18:34] [FAILED] of_have_populated_dt_false_when_flag_set
> [15:18:34] # of_have_populated_dt_true_when_flag_clear: ASSERTION FAILED at drivers/of/of_test.c:70
> [15:18:34] Expected of_root is not null, but is
> [15:18:34] [FAILED] of_have_populated_dt_true_when_flag_clear
> [15:18:34] # module: of_test
> [15:18:34] # of_have_populated_dt: pass:0 fail:2 skip:0 total:2
> [15:18:34] # Totals: pass:0 fail:2 skip:0 total:2
> [15:18:34] ============== [FAILED] of_have_populated_dt ===============
-- David
> ----8<----
> diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c
> index afd09924094e..650752d112a6 100644
> --- a/arch/x86/kernel/devicetree.c
> +++ b/arch/x86/kernel/devicetree.c
> @@ -283,22 +283,24 @@ void __init x86_flattree_get_config(void)
> u32 size, map_len;
> void *dt;
>
> - if (!initial_dtb)
> - return;
> + if (initial_dtb) {
> + map_len = max(PAGE_SIZE - (initial_dtb & ~PAGE_MASK), (u64)128);
>
> - map_len = max(PAGE_SIZE - (initial_dtb & ~PAGE_MASK), (u64)128);
> + dt = early_memremap(initial_dtb, map_len);
> + size = fdt_totalsize(dt);
> + if (map_len < size) {
> + early_memunmap(dt, map_len);
> + dt = early_memremap(initial_dtb, size);
> + map_len = size;
> + }
>
> - dt = early_memremap(initial_dtb, map_len);
> - size = fdt_totalsize(dt);
> - if (map_len < size) {
> - early_memunmap(dt, map_len);
> - dt = early_memremap(initial_dtb, size);
> - map_len = size;
> + early_init_dt_verify(dt);
> }
>
> - early_init_dt_verify(dt);
> unflatten_and_copy_device_tree();
> - early_memunmap(dt, map_len);
> +
> + if (initial_dtb)
> + early_memunmap(dt, map_len);
> }
> #endif
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4014 bytes --]
prev parent reply other threads:[~2024-01-24 7:25 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-12 20:07 [PATCH 0/6] of: populate of_root node if bootloader doesn't Stephen Boyd
2024-01-12 20:07 ` [PATCH 1/6] arm64: Unconditionally call unflatten_device_tree() Stephen Boyd
2024-01-15 17:57 ` Rob Herring
2024-01-16 11:51 ` Mark Rutland
2024-01-16 14:13 ` Geert Uytterhoeven
2024-01-18 15:23 ` Mark Rutland
2024-01-18 16:22 ` Geert Uytterhoeven
2024-01-17 1:27 ` Stephen Boyd
2024-01-17 17:54 ` Rob Herring
2024-01-17 23:00 ` Stephen Boyd
2024-01-18 15:26 ` Mark Rutland
2024-01-18 16:23 ` Geert Uytterhoeven
2024-01-19 23:10 ` Rob Herring
2024-01-12 20:07 ` [PATCH 2/6] um: " Stephen Boyd
2024-01-12 20:07 ` [PATCH 3/6] of: Always unflatten in unflatten_and_copy_device_tree() Stephen Boyd
2024-01-12 20:07 ` [PATCH 4/6] of: Create of_root if no dtb provided by firmware Stephen Boyd
2024-01-15 20:32 ` Rob Herring
2024-01-17 1:18 ` Stephen Boyd
2024-01-17 17:41 ` Rob Herring
2024-01-18 8:45 ` Geert Uytterhoeven
2024-01-18 13:44 ` Rob Herring
2024-01-12 20:07 ` [PATCH 5/6] of: unittest: treat missing of_root as error instead of fixing up Stephen Boyd
2024-01-12 20:07 ` [PATCH 6/6] of: Add KUnit test to confirm DTB is loaded Stephen Boyd
2024-01-16 5:03 ` David Gow
2024-01-22 22:48 ` Stephen Boyd
2024-01-24 7:25 ` David Gow [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='CABVgOSkFY_c5-=g2HeND4J4Fyxnx+_m0EtW8E=5JgJSRmXFdtg@mail.gmail.com' \
--to=davidgow@google.com \
--cc=brendan.higgins@linux.dev \
--cc=devicetree@vger.kernel.org \
--cc=frowand.list@gmail.com \
--cc=kunit-dev@googlegroups.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-um@lists.infradead.org \
--cc=patches@lists.linux.dev \
--cc=robh+dt@kernel.org \
--cc=sboyd@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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).