|
@@ -450,6 +450,21 @@ static struct of_bus *of_match_bus(struct device_node *np)
|
|
return NULL;
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+static int of_empty_ranges_quirk(void)
|
|
|
|
+{
|
|
|
|
+ if (IS_ENABLED(CONFIG_PPC)) {
|
|
|
|
+ /* To save cycles, we cache the result */
|
|
|
|
+ static int quirk_state = -1;
|
|
|
|
+
|
|
|
|
+ if (quirk_state < 0)
|
|
|
|
+ quirk_state =
|
|
|
|
+ of_machine_is_compatible("Power Macintosh") ||
|
|
|
|
+ of_machine_is_compatible("MacRISC");
|
|
|
|
+ return quirk_state;
|
|
|
|
+ }
|
|
|
|
+ return false;
|
|
|
|
+}
|
|
|
|
+
|
|
static int of_translate_one(struct device_node *parent, struct of_bus *bus,
|
|
static int of_translate_one(struct device_node *parent, struct of_bus *bus,
|
|
struct of_bus *pbus, __be32 *addr,
|
|
struct of_bus *pbus, __be32 *addr,
|
|
int na, int ns, int pna, const char *rprop)
|
|
int na, int ns, int pna, const char *rprop)
|
|
@@ -475,12 +490,10 @@ 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 !defined(CONFIG_PPC)
|
|
|
|
- if (ranges == NULL) {
|
|
|
|
|
|
+ if (ranges == NULL && !of_empty_ranges_quirk()) {
|
|
pr_err("OF: no ranges; cannot translate\n");
|
|
pr_err("OF: no ranges; cannot translate\n");
|
|
return 1;
|
|
return 1;
|
|
}
|
|
}
|
|
-#endif /* !defined(CONFIG_PPC) */
|
|
|
|
if (ranges == NULL || rlen == 0) {
|
|
if (ranges == NULL || rlen == 0) {
|
|
offset = of_read_number(addr, na);
|
|
offset = of_read_number(addr, na);
|
|
memset(addr, 0, pna * 4);
|
|
memset(addr, 0, pna * 4);
|