From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Rob Herring <robherring2@gmail.com>,
Grant Likely <grant.likely@linaro.org>,
Olof Johansson <olof@lixom.net>,
"devicetree@vger.kernel.org" <devicetree@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Arnd Bergmann <arnd@arndb.de>,
linuxppc-dev@ozlabs.org
Subject: Re: [PATCH] of/base: Fix PowerPC address parsing hack
Date: Thu, 13 Nov 2014 09:10:36 +1100 [thread overview]
Message-ID: <20141113091036.4e9ec43d@canb.auug.org.au> (raw)
In-Reply-To: <1415771461.5124.33.camel@kernel.crashing.org>
[-- Attachment #1: Type: text/plain, Size: 1473 bytes --]
Hi Ben,
Urk! :-)
How about:
On Wed, 12 Nov 2014 16:51:01 +1100 Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote:
>
> 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)
> +#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)) {
> - 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2014-11-12 22:10 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-12 5:51 [PATCH] of/base: Fix PowerPC address parsing hack Benjamin Herrenschmidt
2014-11-12 14:39 ` Rob Herring
2014-11-12 17:02 ` Grant Likely
2014-11-12 19:55 ` Benjamin Herrenschmidt
2014-11-12 22:10 ` Stephen Rothwell [this message]
2014-11-12 23:08 ` Benjamin Herrenschmidt
2014-11-13 0:45 ` Benjamin Herrenschmidt
2014-11-13 1:02 ` Stephen Rothwell
2014-11-13 12:44 ` Grant Likely
2014-11-13 12:53 ` Benjamin Herrenschmidt
2014-11-14 6:55 ` [PATCH v3] " Benjamin Herrenschmidt
2014-11-18 16:52 ` Grant Likely
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141113091036.4e9ec43d@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=benh@kernel.crashing.org \
--cc=devicetree@vger.kernel.org \
--cc=grant.likely@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=olof@lixom.net \
--cc=robherring2@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).