FAILED: patch "[PATCH] drivers/of: Add empty ranges quirk for PA-Semi" failed to apply to 4.0-stable tree

PATCH [email protected] 1 participant 1 message May 2, 2015

Subsystems (2)

Stable branch Device tree

lore

Share & tools

lore

[email protected]

author maintainer

2015-05-02 16:50 UTC #0 lore raw

The patch below does not apply to the 4.0-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From a5ed1ad07b3a75894311e12fdd401bf64d0667fe Mon Sep 17 00:00:00 2001

From: Benjamin Herrenschmidt <[email protected]>
Date: Mon, 23 Mar 2015 14:16:38 +1100
Subject: [PATCH] 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.

Fixes 746c9e9f92dd, "of/base: Fix PowerPC address parsing hack"

Tested-by Steven Rostedt <[email protected]>

Signed-off-by Benjamin Herrenschmidt <[email protected]>

Signed-off-by Grant Likely <[email protected]>

Cc Stable <[email protected]> # v3.18+

drivers/of/address.c +8 -3

index ad2906919d45..78a7dcbec7d8 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;
 	}