From: Wolfram Sang <w.sang@pengutronix•de>
To: Grant Likely <grant.likely@secretlab•ca>,
linuxppc-dev@ozlabs•org, devicetree-discuss@ozlabs•org
Subject: Re: [resend] Make the kernel accept ePAPR style phandle information
Date: Mon, 1 Feb 2010 11:00:17 +0100 [thread overview]
Message-ID: <20100201100017.GA3288@pengutronix.de> (raw)
In-Reply-To: <20100201045242.GB8095@yookeroo>
[-- Attachment #1: Type: text/plain, Size: 2410 bytes --]
On Mon, Feb 01, 2010 at 03:52:42PM +1100, David Gibson wrote:
> Grant, I've updated this for your current test-devicetree branch.
> Please apply.
>
> 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>
>
> Index: working-2.6/drivers/of/fdt.c
> ===================================================================
> --- working-2.6.orig/drivers/of/fdt.c 2010-02-01 15:51:44.000000000 +1100
> +++ working-2.6/drivers/of/fdt.c 2010-02-01 15:51:46.458557615 +1100
> @@ -310,10 +310,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. */
I don't want to be just pedantic, I really think the preferred way of
multi-line comments
/*
* foo
* bar
*/
will help readability a lot here.
> + 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
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@lists•ozlabs.org
> https://lists.ozlabs.org/listinfo/linuxppc-dev
--
Pengutronix e.K. | Wolfram Sang |
Industrial Linux Solutions | http://www.pengutronix.de/ |
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 197 bytes --]
next prev parent reply other threads:[~2010-02-01 10:00 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-01 4:52 [resend] Make the kernel accept ePAPR style phandle information David Gibson
2010-02-01 10:00 ` Wolfram Sang [this message]
2010-02-01 21:20 ` Grant Likely
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=20100201100017.GA3288@pengutronix.de \
--to=w.sang@pengutronix$(echo .)de \
--cc=devicetree-discuss@ozlabs$(echo .)org \
--cc=grant.likely@secretlab$(echo .)ca \
--cc=linuxppc-dev@ozlabs$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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