Messages in this thread Patch in this message | | | Date | Tue, 9 Mar 2010 12:30:21 -0700 | From | Jason Gunthorpe <> | Subject | [PATCH] PPC: Skip over OF_DT_NOP when unflattening the device tree |
| |
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..
Signed-off-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com> --- 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) { -- 1.5.4.2
| |