From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: Grant Likely <grant.likely@linaro.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Arnd Bergmann <arnd@arndb.de>,
"devicetree@vger.kernel.org" <devicetree@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
linuxppc-dev <linuxppc-dev@ozlabs.org>,
Rob Herring <robherring2@gmail.com>,
Olof Johansson <olof@lixom.net>
Subject: [PATCH v3] of/base: Fix PowerPC address parsing hack
Date: Fri, 14 Nov 2014 17:55:03 +1100 [thread overview]
Message-ID: <1415948103.666.47.camel@kernel.crashing.org> (raw)
In-Reply-To: <1415883227.666.6.camel@kernel.crashing.org>
We have a historical hack that treats missing ranges properties as the
equivalent of an empty one. This is needed for ancient PowerMac "bad"
device-trees, and shouldn't be enabled for any other PowerPC platform,
otherwise we get some nasty layout of devices in sysfs or even
duplication when a set of otherwise identically named devices is
created multiple times under a different parent node with no ranges
property.
This fix is needed for the PowerNV i2c busses to be exposed properly
and will fix a number of other embedded cases.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
CC: <stable@vger.kernel.org>
---
V2: Make it less horrendously ugly
V3: use IS_ENABLED()
drivers/of/address.c | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/drivers/of/address.c b/drivers/of/address.c
index e371825..42e416a 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -403,6 +403,21 @@ static struct of_bus *of_match_bus(struct device_node *np)
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,
struct of_bus *pbus, __be32 *addr,
int na, int ns, int pna, const char *rprop)
@@ -428,12 +443,10 @@ 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 (ranges == NULL) {
+ if (ranges == NULL && !of_empty_ranges_quirk()) {
pr_err("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);
WARNING: multiple messages have this Message-ID (diff)
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: Grant Likely <grant.likely@linaro.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Rob Herring <robherring2@gmail.com>,
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 <linuxppc-dev@ozlabs.org>
Subject: [PATCH v3] of/base: Fix PowerPC address parsing hack
Date: Fri, 14 Nov 2014 17:55:03 +1100 [thread overview]
Message-ID: <1415948103.666.47.camel@kernel.crashing.org> (raw)
In-Reply-To: <1415883227.666.6.camel@kernel.crashing.org>
We have a historical hack that treats missing ranges properties as the
equivalent of an empty one. This is needed for ancient PowerMac "bad"
device-trees, and shouldn't be enabled for any other PowerPC platform,
otherwise we get some nasty layout of devices in sysfs or even
duplication when a set of otherwise identically named devices is
created multiple times under a different parent node with no ranges
property.
This fix is needed for the PowerNV i2c busses to be exposed properly
and will fix a number of other embedded cases.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
CC: <stable@vger.kernel.org>
---
V2: Make it less horrendously ugly
V3: use IS_ENABLED()
drivers/of/address.c | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/drivers/of/address.c b/drivers/of/address.c
index e371825..42e416a 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -403,6 +403,21 @@ static struct of_bus *of_match_bus(struct device_node *np)
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,
struct of_bus *pbus, __be32 *addr,
int na, int ns, int pna, const char *rprop)
@@ -428,12 +443,10 @@ 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 (ranges == NULL) {
+ if (ranges == NULL && !of_empty_ranges_quirk()) {
pr_err("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);
next prev parent reply other threads:[~2014-11-14 6:55 UTC|newest]
Thread overview: 34+ 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 5:51 ` Benjamin Herrenschmidt
2014-11-12 5:51 ` Benjamin Herrenschmidt
2014-11-12 14:39 ` Rob Herring
2014-11-12 14:39 ` Rob Herring
2014-11-12 14:39 ` Rob Herring
2014-11-12 17:02 ` Grant Likely
2014-11-12 17:02 ` Grant Likely
2014-11-12 17:02 ` Grant Likely
2014-11-12 19:55 ` Benjamin Herrenschmidt
2014-11-12 19:55 ` Benjamin Herrenschmidt
2014-11-12 19:55 ` Benjamin Herrenschmidt
2014-11-12 22:10 ` Stephen Rothwell
2014-11-12 22:10 ` Stephen Rothwell
2014-11-12 22:10 ` Stephen Rothwell
2014-11-12 23:08 ` Benjamin Herrenschmidt
2014-11-12 23:08 ` Benjamin Herrenschmidt
2014-11-12 23:08 ` Benjamin Herrenschmidt
2014-11-13 0:45 ` Benjamin Herrenschmidt
2014-11-13 0:45 ` Benjamin Herrenschmidt
2014-11-13 0:45 ` Benjamin Herrenschmidt
2014-11-13 1:02 ` Stephen Rothwell
2014-11-13 1:02 ` Stephen Rothwell
2014-11-13 1:02 ` Stephen Rothwell
2014-11-13 12:44 ` Grant Likely
2014-11-13 12:44 ` Grant Likely
2014-11-13 12:44 ` Grant Likely
2014-11-13 12:53 ` Benjamin Herrenschmidt
2014-11-13 12:53 ` Benjamin Herrenschmidt
2014-11-14 6:55 ` Benjamin Herrenschmidt [this message]
2014-11-14 6:55 ` [PATCH v3] " Benjamin Herrenschmidt
2014-11-18 16:52 ` Grant Likely
2014-11-18 16:52 ` Grant Likely
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=1415948103.666.47.camel@kernel.crashing.org \
--to=benh@kernel.crashing.org \
--cc=arnd@arndb.de \
--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 \
--cc=sfr@canb.auug.org.au \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.