From: frowand.list@gmail.com
To: Rob Herring <robh+dt@kernel.org>,
pantelis.antoniou@konsulko.com,
Pantelis Antoniou <panto@antoniou-consulting.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ivan Gorinov <ivan.gorinov@intel.com>,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>
Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
geert@linux-m68k.org, laurent.pinchart+renesas@ideasonboard.com
Subject: [PATCH v7 1/5] x86: devicetree: fix config option around x86_flattree_get_config()
Date: Sat, 3 Mar 2018 16:17:49 -0800 [thread overview]
Message-ID: <1520122673-11003-2-git-send-email-frowand.list@gmail.com> (raw)
In-Reply-To: <1520122673-11003-1-git-send-email-frowand.list@gmail.com>
From: Frank Rowand <frank.rowand@sony.com>
x86_flattree_get_config() is incorrectly protected by
ifdef CONFIG_OF_FLATTREE. It uses of_get_flat_dt_size(), which
only exists if CONFIG_OF_EARLY_FLATTREE. This issue has not
been exposed previously because OF_FLATTREE did not occur unless
it was selected by OF_EARLY_FLATTREE. A devicetree overlay change
is selecting OF_FLATTREE directly instead of indirectly enabling
it by selecting OF_EARLY_FLATTREE.
This problem was exposed by a randconfig generated by the kbuild
test robot, where Platform OLPC was enabled. OLPC selects
OF_PROMTREE instead of OF_EARLY_FLATREE. The only other x86
platform that selects OF is X86_INTEL_CE, which does select
OF_EARLY_FLATTREE.
Signed-off-by: Frank Rowand <frank.rowand@sony.com>
---
x86 Maintainers, please ack this patch for Rob to accept
This patch previously submitted separately as:
"x86: devicetree: fix config option around x86_flattree_get_config()"
https://lkml.org/lkml/2018/3/2/1148
so this is a jump from version 1 to version 6.
No changes from version 1.
arch/x86/kernel/devicetree.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c
index 25de5f6ca997..45416826f6ee 100644
--- a/arch/x86/kernel/devicetree.c
+++ b/arch/x86/kernel/devicetree.c
@@ -259,7 +259,7 @@ static void __init dtb_apic_setup(void)
dtb_ioapic_setup();
}
-#ifdef CONFIG_OF_FLATTREE
+#ifdef CONFIG_OF_EARLY_FLATTREE
static void __init x86_flattree_get_config(void)
{
u32 size, map_len;
--
Frank Rowand <frank.rowand@sony.com>
next prev parent reply other threads:[~2018-03-04 0:18 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-04 0:17 [PATCH v7 0/5] of: change overlay apply input data from unflattened frowand.list
2018-03-04 0:17 ` frowand.list [this message]
2018-03-04 0:27 ` [PATCH v7 1/5] x86: devicetree: fix config option around x86_flattree_get_config() Frank Rowand
2018-03-04 7:20 ` Thomas Gleixner
2018-03-04 0:17 ` [PATCH v7 2/5] of: change overlay apply input data from unflattened to FDT frowand.list
2018-04-04 22:35 ` Jan Kiszka
2018-04-05 0:55 ` Rob Herring
2018-04-05 7:22 ` Jan Kiszka
2018-04-05 19:16 ` Frank Rowand
2018-04-05 19:26 ` Rob Herring
2018-04-05 19:37 ` Frank Rowand
2018-04-05 19:13 ` Frank Rowand
2018-04-05 19:17 ` Jan Kiszka
2018-04-05 18:59 ` Frank Rowand
2018-04-05 19:13 ` Jan Kiszka
2018-04-05 19:28 ` Frank Rowand
2018-04-05 19:38 ` Jan Kiszka
2018-04-05 20:33 ` Frank Rowand
2018-04-05 21:12 ` Rob Herring
2018-04-11 5:42 ` Jan Kiszka
2018-04-22 10:30 ` Jan Kiszka
2018-04-23 22:38 ` Frank Rowand
2018-04-24 5:29 ` Jan Kiszka
2018-04-24 16:08 ` Alan Tull
2018-04-24 18:26 ` Alan Tull
2018-04-25 5:38 ` Jan Kiszka
2018-04-24 21:15 ` Frank Rowand
2018-04-25 5:22 ` Jan Kiszka
2018-04-25 18:56 ` Frank Rowand
2018-04-25 19:02 ` Frank Rowand
2018-04-25 19:40 ` Jan Kiszka
2018-04-25 19:53 ` Geert Uytterhoeven
2018-04-25 20:09 ` Jan Kiszka
2018-04-25 23:07 ` Frank Rowand
2018-04-24 20:56 ` Frank Rowand
2018-04-25 5:23 ` Jan Kiszka
2018-04-25 18:40 ` Frank Rowand
2018-04-25 20:07 ` Jan Kiszka
2018-04-25 20:26 ` Alan Tull
2018-04-26 0:20 ` Frank Rowand
2018-04-25 14:59 ` Alan Tull
2018-04-25 17:41 ` Frank Rowand
2018-04-25 18:19 ` Alan Tull
2018-04-26 0:07 ` Frank Rowand
2018-04-26 0:10 ` Frank Rowand
2018-03-04 0:17 ` [PATCH v7 3/5] of: Documentation: of_overlay_apply() replaced by of_overlay_fdt_apply() frowand.list
2018-03-04 0:17 ` [PATCH v7 4/5] of: convert unittest overlay devicetree source to sugar syntax frowand.list
2018-03-04 0:17 ` [PATCH v7 5/5] of: improve reporting invalid overlay target path frowand.list
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=1520122673-11003-2-git-send-email-frowand.list@gmail.com \
--to=frowand.list@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=geert@linux-m68k.org \
--cc=hpa@zytor.com \
--cc=ivan.gorinov@intel.com \
--cc=laurent.pinchart+renesas@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=pantelis.antoniou@konsulko.com \
--cc=panto@antoniou-consulting.com \
--cc=robh+dt@kernel.org \
--cc=tglx@linutronix.de \
/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).