From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail•com>
To: Kevin Hao <haokexin@gmail•com>
Cc: Chris Proctor <cproctor@csc•com.au>,
Arnd Bergmann <arnd@arndb•de>,
devicetree <devicetree@vger•kernel.org>,
Stephen N Chivers <schivers@csc•com.au>,
Scott Wood <scottwood@freescale•com>,
linuxppc-dev@lists•ozlabs.org
Subject: Re: Linux-3.14-rc2: Order of serial node compatibles in DTS files.
Date: Wed, 12 Feb 2014 12:26:14 +0100 [thread overview]
Message-ID: <52FB5A56.2050402@gmail.com> (raw)
In-Reply-To: <20140212103153.GC15434@pek-khao-d1.corp.ad.wrs.com>
On 02/12/14 11:31, Kevin Hao wrote:
> On Wed, Feb 12, 2014 at 09:30:00AM +0100, Sebastian Hesselbarth wrote:
>> On 02/12/2014 06:28 AM, Kevin Hao wrote:
>>> On Wed, Feb 12, 2014 at 10:21:58AM +1000, Stephen N Chivers wrote:
>>>> But, the Interrupt Controller (MPIC)
>>>> goes AWOL and it is down hill from there.
>>>>
>>>> The MPIC is specified in the DTS as:
>>>>
>>>> mpic: pic@40000 {
>>>> interrupt-controller;
>>>> #address-cells = <0>;
>>>> #interrupt-cells = <2>;
>>>> reg = <0x40000 0x40000>;
>>>> compatible = "chrp,open-pic";
>>>> device_type = "open-pic";
>>>> big-endian;
>>>> };
>>>>
>>>> The board support file has the standard mechanism for allocating
>>>> the PIC:
>>>>
>>>> struct mpic *mpic;
>>>>
>>>> mpic = mpic_alloc(NULL, 0, 0, 0, 256, " OpenPIC ");
>>>> BUG_ON(mpic == NULL);
>>>>
>>>> mpic_init(mpic);
>>>>
>>>> I checked for damage in applying the patch and it has applied
>>>> correctly.
>>>
>>> How about the following fix?
>>>
>>> diff --git a/drivers/of/base.c b/drivers/of/base.c
>>> index ff85450d5683..ca91984d3c4b 100644
>>> --- a/drivers/of/base.c
>>> +++ b/drivers/of/base.c
>>> @@ -730,32 +730,40 @@ out:
>>> }
>>> EXPORT_SYMBOL(of_find_node_with_property);
>>>
>>> +static int of_match_type_name(const struct device_node *node,
>>> + const struct of_device_id *m)
>>
>> I am fine with having a sub-function here, but it should rather be
>> named of_match_type_or_name.
>
> OK.
>
>>
>>> +{
>>> + int match = 1;
>>> +
>>> + if (m->name[0])
>>> + match &= node->name && !strcmp(m->name, node->name);
>>> +
>>> + if (m->type[0])
>>> + match &= node->type && !strcmp(m->type, node->type);
>>> +
>>> + return match;
>>> +}
>> [...]
>>> + /* Check against matches without compatible string */
>>> + m = matches;
>>> + while (!m->compatible[0] && (m->name[0] || m->type[0])) {
>>
>> We shouldn't check for anything else than the sentinel here.
>> Although I guess yours will not quit early as mine did but that
>> way we don't have to worry about it.
>
> Yes, this is still buggy. I will change something like this:
>
> m = matches;
> /* Check against matches without compatible string */
> while (m->name[0] || m->type[0] || m->compatible[0]) {
> if (m->compatible[0]) {
> m++;
> continue;
> }
>
> match = of_match_type_name(node, m);
> if (match)
> return m;
> m++;
> }
You can cook it down to:
m = matches;
/* Check against matches without compatible string */
while (m->name[0] || m->type[0] || m->compatible[0]) {
if (!m->compatible[0] && of_match_type_or_name(node, m)
return m;
m++;
}
next prev parent reply other threads:[~2014-02-12 11:26 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-06 2:09 arch/powerpc/math-emu/mtfsf.c - incorrect mask? Stephen N Chivers
2014-02-06 8:26 ` Gabriel Paubert
2014-02-07 1:27 ` Stephen N Chivers
2014-02-07 10:10 ` Gabriel Paubert
2014-02-07 20:49 ` James Yang
2014-02-09 19:42 ` Stephen N Chivers
2014-02-10 16:50 ` James Yang
2014-02-10 11:03 ` Gabriel Paubert
2014-02-10 11:17 ` David Laight
2014-02-10 12:21 ` Gabriel Paubert
2014-02-10 12:32 ` David Laight
2014-02-10 13:00 ` Gabriel Paubert
2014-02-10 17:03 ` James Yang
2014-02-11 7:26 ` Gabriel Paubert
2014-02-11 20:57 ` Linux-3.14-rc2: Order of serial node compatibles in DTS files Stephen N Chivers
2014-02-11 22:33 ` Kumar Gala
2014-02-11 22:51 ` Sebastian Hesselbarth
2014-02-11 23:38 ` Stephen N Chivers
2014-02-11 23:43 ` Sebastian Hesselbarth
2014-02-12 11:00 ` Arnd Bergmann
2014-02-11 23:41 ` Scott Wood
2014-02-11 23:46 ` Sebastian Hesselbarth
2014-02-12 0:21 ` Stephen N Chivers
2014-02-12 5:28 ` Kevin Hao
2014-02-12 8:30 ` Sebastian Hesselbarth
2014-02-12 10:31 ` Kevin Hao
2014-02-12 11:26 ` Sebastian Hesselbarth [this message]
2014-02-12 11:32 ` Kevin Hao
2014-02-12 8:25 ` Sebastian Hesselbarth
2014-02-12 10:35 ` Kevin Hao
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=52FB5A56.2050402@gmail.com \
--to=sebastian.hesselbarth@gmail$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=cproctor@csc$(echo .)com.au \
--cc=devicetree@vger$(echo .)kernel.org \
--cc=haokexin@gmail$(echo .)com \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=schivers@csc$(echo .)com.au \
--cc=scottwood@freescale$(echo .)com \
/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