Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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 746c9e9f92, "of/base: Fix PowerPC address parsing hack"

Tested-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Grant Likely <grant.likely@linaro.org>
Cc: Stable <stable@vger.kernel.org> # v3.18+
This commit is contained in:
Benjamin Herrenschmidt 2015-03-23 14:16:38 +11:00 committed by Grant Likely
parent bc465aa9d0
commit 41d9489319
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/of/address.c
View file

@ -450,12 +450,17 @@ static struct of_bus *of_match_bus(struct device_node *np)
return NULL; return NULL;
} }
static int of_empty_ranges_quirk(void) static int of_empty_ranges_quirk(struct device_node *np)
{ {
if (IS_ENABLED(CONFIG_PPC)) { 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; 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) if (quirk_state < 0)
quirk_state = quirk_state =
of_machine_is_compatible("Power Macintosh") || 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 * This code is only enabled on powerpc. --gcl
*/ */
ranges = of_get_property(parent, rprop, &rlen); 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"); pr_debug("OF: no ranges; cannot translate\n");
return 1; return 1;
} }