Re: [PATCH] of/base: Fix PowerPC address parsing hack
flat view
From: Stephen Rothwell <hidden>
Date: 2014-11-12 22:10:45
Also in:
linux-devicetree, lkml
Hi Ben, Urk! :-) How about: On Wed, 12 Nov 2014 16:51:01 +1100 Benjamin Herrenschmidt [off-list ref] wrote:
quoted hunk ↗ jump to hunk
diff --git a/drivers/of/address.c b/drivers/of/address.c index e371825..e37f017 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c@@ -7,6 +7,10 @@ #include <linux/pci_regs.h> #include <linux/string.h> +#ifdef CONFIG_PPC +#include <asm/machdep.h>
#define IS_PMAC machine_is(pmac) #else #define IS_PMAC (0)
quoted hunk ↗ jump to hunk
+#endif + /* Max address size we deal with */ #define OF_MAX_ADDR_CELLS 4 #define OF_CHECK_ADDR_COUNT(na) ((na) > 0 && (na) <= OF_MAX_ADDR_CELLS)@@ -428,12 +432,13 @@ 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 !defined(CONFIG_PPC) +#if defined(CONFIG_PPC) + if (!machine_is(powermac)) +#endif /* defined(CONFIG_PPC) */ if (ranges == NULL) {
if ((!IS_PMAC) && (ranges == NULL)) {
quoted hunk ↗ jump to hunk
- pr_err("OF: no ranges; cannot translate\n"); + pr_debug("OF: no ranges; cannot translate\n"); return 1; } -#endif /* !defined(CONFIG_PPC) */ if (ranges == NULL || rlen == 0) { offset = of_read_number(addr, na); memset(addr, 0, pna * 4);
There might be a better identifier than IS_PMAC ... -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
Attachments
- (unnamed) [application/pgp-signature] 819 bytes