Re: [PATCH] PPC: Skip over OF_DT_NOP when unflattening the device tree
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: 2010-03-19 05:50:59
Also in:
lkml
On Tue, 2010-03-09 at 12:30 -0700, Jason Gunthorpe wrote:
NOPs within the property section are skipped, but NOPs between OF_DT_END_NODE and OF_DT_BEGIN_NODE were not. My firmware NOPs out entire nodes depending on various environment parameters. of_scan_flat_dt already handles NOP more generally..
Good catch, though that code has now moved over to drivers/of and is a bit different. Grant is going to fix it up though. Cheers, Ben.
quoted hunk ↗ jump to hunk
Signed-off-by: Jason Gunthorpe <redacted> --- arch/powerpc/kernel/prom.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index 4ec3008..92137b2 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c@@ -408,8 +408,11 @@ static unsigned long __init unflatten_dt_node(unsigned long mem, if (!np->type) np->type = "<NULL>"; } - while (tag == OF_DT_BEGIN_NODE) { - mem = unflatten_dt_node(mem, p, np, allnextpp, fpsize); + while (tag == OF_DT_BEGIN_NODE || tag == OF_DT_NOP) { + if (tag == OF_DT_NOP) + *p += 4; + else + mem = unflatten_dt_node(mem, p, np, allnextpp, fpsize); tag = *((u32 *)(*p)); } if (tag != OF_DT_END_NODE) {