From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753549AbaKLWKp (ORCPT ); Wed, 12 Nov 2014 17:10:45 -0500 Received: from ozlabs.org ([103.22.144.67]:35491 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753529AbaKLWKo (ORCPT ); Wed, 12 Nov 2014 17:10:44 -0500 Date: Thu, 13 Nov 2014 09:10:36 +1100 From: Stephen Rothwell To: Benjamin Herrenschmidt Cc: Rob Herring , Grant Likely , Olof Johansson , "devicetree@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Arnd Bergmann , linuxppc-dev@ozlabs.org Subject: Re: [PATCH] of/base: Fix PowerPC address parsing hack Message-ID: <20141113091036.4e9ec43d@canb.auug.org.au> In-Reply-To: <1415771461.5124.33.camel@kernel.crashing.org> References: <1415771461.5124.33.camel@kernel.crashing.org> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.25; i586-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/YVBg/yUUqmVzB6hR1OqPj5B"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/YVBg/yUUqmVzB6hR1OqPj5B Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Ben, Urk! :-) How about: On Wed, 12 Nov 2014 16:51:01 +1100 Benjamin Herrenschmidt 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 > #include > =20 > +#ifdef CONFIG_PPC > +#include #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) <=3D OF_MAX_ADDR_CELLS) > @@ -428,12 +432,13 @@ static int of_translate_one(struct device_node *par= ent, struct of_bus *bus, > * This code is only enabled on powerpc. --gcl > */ > ranges =3D of_get_property(parent, rprop, &rlen); > -#if !defined(CONFIG_PPC) > +#if defined(CONFIG_PPC) > + if (!machine_is(powermac)) > +#endif /* defined(CONFIG_PPC) */ > if (ranges =3D=3D NULL) { if ((!IS_PMAC) && (ranges =3D=3D 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 =3D=3D NULL || rlen =3D=3D 0) { > offset =3D of_read_number(addr, na); > memset(addr, 0, pna * 4); There might be a better identifier than IS_PMAC ... --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au --Sig_/YVBg/yUUqmVzB6hR1OqPj5B Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJUY9rhAAoJEMDTa8Ir7ZwVyfsP/1M0ZtuUeLMWMgKhzS6/A3If pye7dEoEUIRdBDpXuYg5UZZ3D2yFDHaIOH/zXvgl3c22kwAOJjQXlly4TnukC8uu aBrv0cZe4D0yLLfKVEUjKbfpOqm8A8Upw+C//WmC8HkPT2P8AlfvaKD46uCwSsLR qplNmMfiQMJnUMjeTJu0T4Gq4O12VoWhR9UVgMBjqDJDblhHh0P2iB6iQnVghZVd Y6Ch0ilsvAgcPWC6Or7lvOqNQkTtFSnOfT3E/cLWE6t20Su1mEXCAmDZQ5pBa9/E HIYbnuCnFOnIu9Jn3IFkT+H9Kfpr6+2cnAdiGLPAbFkMziJsNcARaiLtXZH9i4ue h/Hsg4ieHE7vor9MAVOLbNV0hYmjwzq6ahJ6nzF+5cRL3VOZnVDMzIURrU2K7t0j pze6Lu0JWjeLVJmXEyaJC1ylON9S19hMsg0Ki6AR+tvO+4S/SFKot7l/SdkBIIep +G0KBZHWF3M5ZlxsTBJ0XvKtdwgq0h/KKGbyaL2ByG31L6XIDFI2yM5lZ56kzdGL ivqpd1zVH5mcx/38twxQe/rwNVK8p7j0X4/YEqYED1WeqGbWowrY4ga9sm5XXS3T 1CwZELExTkUowzexEnkYbXZQ8B3KbD09ePBIHnczDHHijXh/y9ZZkS7InqaLU0lL kmSWYQ6iLYdZGpYMZaoA =UoQz -----END PGP SIGNATURE----- --Sig_/YVBg/yUUqmVzB6hR1OqPj5B--