Message ID | 20091126051641.GB27334@yookeroo (mailing list archive) |
---|---|
State | Not Applicable |
Delegated to: | Benjamin Herrenschmidt |
Headers | show |
On Wed, Nov 25, 2009 at 10:16 PM, David Gibson <david@gibson.dropbear.id.au> wrote: > Grant, this is based on your test-devicetree branch, if it could be > merged via there would be great. > > Currently when processing flattened device trees, the kernel expects > the phandle in a property called "linux,phandle". The ePAPR spec - > not being Linux specific - instead requires phandles to be encoded in > a property named simply "phandle". This patch makes the kernel accept > either form when unflattening the device tree. > > Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Looks okay to me. g. > > Index: working-2.6/drivers/of/fdt.c > =================================================================== > --- working-2.6.orig/drivers/of/fdt.c 2009-11-26 09:58:06.052792325 +1100 > +++ working-2.6/drivers/of/fdt.c 2009-11-26 10:00:08.309570256 +1100 > @@ -314,10 +314,19 @@ unsigned long __init unflatten_dt_node(u > pp = unflatten_dt_alloc(&mem, sizeof(struct property), > __alignof__(struct property)); > if (allnextpp) { > - if (strcmp(pname, "linux,phandle") == 0) { > + /* We accept flattened tree phandles either in > + * ePAPR-style "phandle" properties, or the > + * legacy "linux,phandle" properties. If both > + * appear and have different values, things > + * will get weird. Don't do that. */ > + if ((strcmp(pname, "phandle") == 0) > + || (strcmp(pname, "linux,phandle") == 0)) { > if (np->phandle == 0) > np->phandle = *((u32 *)*p); > } > + /* And we process the "ibm,phandle" property > + * used in pSeries dynamic device tree > + * stuff */ > if (strcmp(pname, "ibm,phandle") == 0) > np->phandle = *((u32 *)*p); > pp->name = pname; > > > -- > David Gibson | I'll have my music baroque, and my code > david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ > | _way_ _around_! > http://www.ozlabs.org/~dgibson >
Index: working-2.6/drivers/of/fdt.c =================================================================== --- working-2.6.orig/drivers/of/fdt.c 2009-11-26 09:58:06.052792325 +1100 +++ working-2.6/drivers/of/fdt.c 2009-11-26 10:00:08.309570256 +1100 @@ -314,10 +314,19 @@ unsigned long __init unflatten_dt_node(u pp = unflatten_dt_alloc(&mem, sizeof(struct property), __alignof__(struct property)); if (allnextpp) { - if (strcmp(pname, "linux,phandle") == 0) { + /* We accept flattened tree phandles either in + * ePAPR-style "phandle" properties, or the + * legacy "linux,phandle" properties. If both + * appear and have different values, things + * will get weird. Don't do that. */ + if ((strcmp(pname, "phandle") == 0) + || (strcmp(pname, "linux,phandle") == 0)) { if (np->phandle == 0) np->phandle = *((u32 *)*p); } + /* And we process the "ibm,phandle" property + * used in pSeries dynamic device tree + * stuff */ if (strcmp(pname, "ibm,phandle") == 0) np->phandle = *((u32 *)*p); pp->name = pname;
Grant, this is based on your test-devicetree branch, if it could be merged via there would be great. Currently when processing flattened device trees, the kernel expects the phandle in a property called "linux,phandle". The ePAPR spec - not being Linux specific - instead requires phandles to be encoded in a property named simply "phandle". This patch makes the kernel accept either form when unflattening the device tree. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>