From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933750AbeCDA1a (ORCPT ); Sat, 3 Mar 2018 19:27:30 -0500 Received: from mail-pl0-f65.google.com ([209.85.160.65]:36266 "EHLO mail-pl0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933051AbeCDA10 (ORCPT ); Sat, 3 Mar 2018 19:27:26 -0500 X-Google-Smtp-Source: AG47ELuNtIXQglNhB44SCi+iHYvL/Gz2C3lcNADmuX+56vbJ4ormwxWdnhTvmbUKkLehVyB1SPr3iQ== Subject: Re: [PATCH v7 1/5] x86: devicetree: fix config option around x86_flattree_get_config() From: Frank Rowand To: Rob Herring , pantelis.antoniou@konsulko.com, Pantelis Antoniou , Thomas Gleixner , Ivan Gorinov , Ingo Molnar , "H. Peter Anvin" Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, geert@linux-m68k.org, laurent.pinchart+renesas@ideasonboard.com References: <1520122673-11003-1-git-send-email-frowand.list@gmail.com> <1520122673-11003-2-git-send-email-frowand.list@gmail.com> Message-ID: <822454a2-19f1-48d2-0ef6-e2d86f0c5406@gmail.com> Date: Sat, 3 Mar 2018 16:27:23 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: <1520122673-11003-2-git-send-email-frowand.list@gmail.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 03/03/18 16:17, frowand.list@gmail.com wrote: > From: Frank Rowand > > 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 > --- > > 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. ^^^^^^^^^ version 7 > > 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; >