From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ozlabs.org (ozlabs.org [103.22.144.67]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 038331A0201 for ; Wed, 12 Nov 2014 16:51:36 +1100 (AEDT) Received: from gate.crashing.org (gate.crashing.org [63.228.1.57]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 50E98140170 for ; Wed, 12 Nov 2014 16:51:34 +1100 (AEDT) Message-ID: <1415771461.5124.33.camel@kernel.crashing.org> Subject: [PATCH] of/base: Fix PowerPC address parsing hack From: Benjamin Herrenschmidt To: Rob Herring , Grant Likely Date: Wed, 12 Nov 2014 16:51:01 +1100 Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Cc: Olof Johansson , "devicetree@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Arnd Bergmann , linuxppc-dev@ozlabs.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 CC: --- 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 #include +#ifdef CONFIG_PPC +#include +#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) { - 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);