* [PATCH] drivers/of: Add empty ranges quirk for PA-Semi
@ 2015-03-23 3:16 Benjamin Herrenschmidt
2015-03-23 3:50 ` Michael Ellerman
0 siblings, 1 reply; 4+ messages in thread
From: Benjamin Herrenschmidt @ 2015-03-23 3:16 UTC (permalink / raw)
To: linuxppc dev list; +Cc: Olof Johansson, devicetree, Rob Herring, Steven Rostedt
The "sdc" node is missing the ranges property, it needs to be treated
as having an empty one otherwise translation fails for its children.
Tested-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
drivers/of/address.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/of/address.c b/drivers/of/address.c
index ad29069..78a7dcb 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -450,12 +450,17 @@ static struct of_bus *of_match_bus(struct device_node *np)
return NULL;
}
-static int of_empty_ranges_quirk(void)
+static int of_empty_ranges_quirk(struct device_node *np)
{
if (IS_ENABLED(CONFIG_PPC)) {
- /* To save cycles, we cache the result */
+ /* To save cycles, we cache the result for global "Mac" setting */
static int quirk_state = -1;
+ /* PA-SEMI sdc DT bug */
+ if (of_device_is_compatible(np, "1682m-sdc"))
+ return true;
+
+ /* Make quirk cached */
if (quirk_state < 0)
quirk_state =
of_machine_is_compatible("Power Macintosh") ||
@@ -490,7 +495,7 @@ static int of_translate_one(struct device_node *parent, struct of_bus *bus,
* This code is only enabled on powerpc. --gcl
*/
ranges = of_get_property(parent, rprop, &rlen);
- if (ranges == NULL && !of_empty_ranges_quirk()) {
+ if (ranges == NULL && !of_empty_ranges_quirk(parent)) {
pr_debug("OF: no ranges; cannot translate\n");
return 1;
}
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: drivers/of: Add empty ranges quirk for PA-Semi
2015-03-23 3:16 [PATCH] drivers/of: Add empty ranges quirk for PA-Semi Benjamin Herrenschmidt
@ 2015-03-23 3:50 ` Michael Ellerman
2015-03-23 4:06 ` Benjamin Herrenschmidt
0 siblings, 1 reply; 4+ messages in thread
From: Michael Ellerman @ 2015-03-23 3:50 UTC (permalink / raw)
To: Benjamin Herrenschmidt, linuxppc dev list
Cc: Olof Johansson, devicetree, Rob Herring, Steven Rostedt
On Mon, 2015-23-03 at 03:16:38 UTC, Benjamin Herrenschmidt wrote:
> The "sdc" node is missing the ranges property, it needs to be treated
> as having an empty one otherwise translation fails for its children.
>
> Tested-by: Steven Rostedt <rostedt@goodmis.org>
> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Fixes: 746c9e9f92dd ("of/base: Fix PowerPC address parsing hack")
Which went into 3.18-rc6, and was CC'ed to stable. So this should probably also
go to stable no?
cheers
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: drivers/of: Add empty ranges quirk for PA-Semi
2015-03-23 3:50 ` Michael Ellerman
@ 2015-03-23 4:06 ` Benjamin Herrenschmidt
2015-03-25 16:15 ` Grant Likely
0 siblings, 1 reply; 4+ messages in thread
From: Benjamin Herrenschmidt @ 2015-03-23 4:06 UTC (permalink / raw)
To: Michael Ellerman
Cc: Olof Johansson, devicetree, Rob Herring, linuxppc dev list,
Steven Rostedt
On Mon, 2015-03-23 at 14:50 +1100, Michael Ellerman wrote:
> On Mon, 2015-23-03 at 03:16:38 UTC, Benjamin Herrenschmidt wrote:
> > The "sdc" node is missing the ranges property, it needs to be treated
> > as having an empty one otherwise translation fails for its children.
> >
> > Tested-by: Steven Rostedt <rostedt@goodmis.org>
> > Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
>
> Fixes: 746c9e9f92dd ("of/base: Fix PowerPC address parsing hack")
>
> Which went into 3.18-rc6, and was CC'ed to stable. So this should probably also
> go to stable no?
Sure, go for it.
Cheers,
Ben.
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: drivers/of: Add empty ranges quirk for PA-Semi
2015-03-23 4:06 ` Benjamin Herrenschmidt
@ 2015-03-25 16:15 ` Grant Likely
0 siblings, 0 replies; 4+ messages in thread
From: Grant Likely @ 2015-03-25 16:15 UTC (permalink / raw)
To: Benjamin Herrenschmidt, Michael Ellerman
Cc: Olof Johansson, devicetree, Rob Herring, linuxppc dev list,
Steven Rostedt
On Mon, 23 Mar 2015 15:06:35 +1100
, Benjamin Herrenschmidt <benh@kernel.crashing.org>
wrote:
> On Mon, 2015-03-23 at 14:50 +1100, Michael Ellerman wrote:
> > On Mon, 2015-23-03 at 03:16:38 UTC, Benjamin Herrenschmidt wrote:
> > > The "sdc" node is missing the ranges property, it needs to be treated
> > > as having an empty one otherwise translation fails for its children.
> > >
> > > Tested-by: Steven Rostedt <rostedt@goodmis.org>
> > > Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> >
> > Fixes: 746c9e9f92dd ("of/base: Fix PowerPC address parsing hack")
> >
> > Which went into 3.18-rc6, and was CC'ed to stable. So this should probably also
> > go to stable no?
>
> Sure, go for it.
Applied, thanks.
g.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-03-25 16:15 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-23 3:16 [PATCH] drivers/of: Add empty ranges quirk for PA-Semi Benjamin Herrenschmidt
2015-03-23 3:50 ` Michael Ellerman
2015-03-23 4:06 ` Benjamin Herrenschmidt
2015-03-25 16:15 ` Grant Likely
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).