diff mbox

drivers/of: Add empty ranges quirk for PA-Semi

Message ID 1427080598.4770.214.camel@kernel.crashing.org (mailing list archive)
State Awaiting Upstream, archived
Headers show

Commit Message

Benjamin Herrenschmidt March 23, 2015, 3:16 a.m. UTC 
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(-)

Comments

Michael Ellerman March 23, 2015, 3:50 a.m. UTC | #1 
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
Benjamin Herrenschmidt March 23, 2015, 4:06 a.m. UTC | #2 
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.
Grant Likely March 25, 2015, 4:15 p.m. UTC | #3 
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.
diff mbox

Patch

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;
 	}