Skip to contentSkip to conversation

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

PATCH Applied Benjamin Herrenschmidt 3 participants 4 messages Mar 23, 2015 – Mar 25, 2015 3 messages not in the archive Device tree

lore
Share & tools
lore
#0 lore raw

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

The "sdc" node is missing the ranges property, it needs to be treated as having an empty one otherwise translation fails for its children.

---
 drivers/of/address.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/of/address.c +8 -3
index ad29069..78a7dcb 100644
@@ -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;
 	}

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

#2 lore raw
In reply to a message not in the archive
Quoted 5 lines · Benjamin Herrenschmidt

The "sdc" node is missing the ranges property, it needs to be treated as having an empty one otherwise translation fails for its children.

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
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

#4 lore raw
In reply to a message not in the archive
Quoted 11 lines · Michael Ellerman
Quoted 5 lines · Benjamin Herrenschmidt

The "sdc" node is missing the ranges property, it needs to be treated as having an empty one otherwise translation fails for its children.

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.

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

Applied
#6 lore raw
In reply to a message not in the archive
Quoted 8 lines · Benjamin Herrenschmidt
Quoted 7 lines · Michael Ellerman
Quoted 5 lines · Benjamin Herrenschmidt

The "sdc" node is missing the ranges property, it needs to be treated as having an empty one otherwise translation fails for its children.

Quoted 6 lines
Quoted 4 lines
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.

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html