From patchwork Fri Apr 18 12:59:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 340306 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id A87B314195B for ; Fri, 18 Apr 2014 23:26:00 +1000 (EST) Received: from mail-wg0-f49.google.com (mail-wg0-f49.google.com [74.125.82.49]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id C3FFF140080 for ; Fri, 18 Apr 2014 22:56:04 +1000 (EST) Received: by mail-wg0-f49.google.com with SMTP id a1so481377wgh.8 for ; Fri, 18 Apr 2014 05:55:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-type:content-disposition:in-reply-to :user-agent; bh=+crQqvzIMCxHYhhG7MdRzKMYhdEgOXOFziwO971MD2M=; b=fq1cGLxEtOZpl6qLAx7o0qWe5cqxlFPnKhTzwsIPg5ruo6HgDCRHOGWJBH2lzemNxL xX+peaHXnGYgsrfS6FaR29hB57luSs1/ALPtBd3sKsuajxIvUoNuZU40yk8JxMklShpH jF9D65iJQQo+59gaAiVWHDuJl6PgrNwocfcVVY+DbRw5ru9deF3bLvZOM8pl3TXSthq1 wfxQiG4CzVHQE2RR1MpEsOhOcYVEuXG9kUenlQtUHFjwJ67FXnks55mP7mZ1i4HvPLuX tfk+/ngN/KqRwDrjnyhbk8gHdPhKuw/qm0Eb5W3bWpIZwyCW3Pa9tzoFxAIg6duU7hKN Q1JA== X-Gm-Message-State: ALoCoQlCyJWuRW2npAlaqyXxKnNcci4l026oI0HcoREaMtGWf+3Jmj7NaQwx8hUEJT6Y/arR07y4 X-Received: by 10.194.90.107 with SMTP id bv11mr16181243wjb.11.1397825759289; Fri, 18 Apr 2014 05:55:59 -0700 (PDT) Received: from bivouac.eciton.net ([2a00:1098:0:86:1000:23:0:2]) by mx.google.com with ESMTPSA id d6sm3186983wiz.4.2014.04.18.05.55.57 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 18 Apr 2014 05:55:58 -0700 (PDT) Date: Fri, 18 Apr 2014 13:59:24 +0100 From: Leif Lindholm To: Geert Uytterhoeven Subject: Re: [PATCH 3/3] of: Handle memory@0 node on PPC32 only Message-ID: <20140418125924.GF5904@bivouac.eciton.net> References: <1397756521-29387-1-git-send-email-leif.lindholm@linaro.org> <1397756521-29387-4-git-send-email-leif.lindholm@linaro.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) X-Mailman-Approved-At: Fri, 18 Apr 2014 23:18:40 +1000 Cc: Mark Rutland , "devicetree@vger.kernel.org" , patches@linaro.org, Lee Jones , "linux-kernel@vger.kernel.org" , Rob Herring , Grant Likely , "linuxppc-dev@lists.ozlabs.org" X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Hi Geert, On Fri, Apr 18, 2014 at 10:04:15AM +0200, Geert Uytterhoeven wrote: > On Thu, Apr 17, 2014 at 7:42 PM, Leif Lindholm wrote: > > In order to deal with an firmware bug on a specific ppc32 platform > > (longtrail), early_init_dt_scan_memory() looks for a node called > > memory@0 on all platforms. Restrict this quirk to ppc32 kernels only. > > This breaks backwards compatibilty with old DTSes (at least on ARM/MIPS, > where you added the missing property in patches 1 and 2 of the series)? As Rob said in response to 0/3, the MIPSs would likely not be affected, since they embed the DT. > For the Longtrail, I don't care much anymore, as mine died in 2004. > AFAIK, there have never been many users anyway. There are still a few mentions of it under arch/powerpc/, so I wouldn't want to be the one to kill it off... How about the below v2 3/3 to address the ARM platform? Regards, Leif From 6fa0b837ad71780334eb97d63c507165b6c57add Mon Sep 17 00:00:00 2001 From: Leif Lindholm Date: Thu, 17 Apr 2014 14:24:47 +0100 Subject: [PATCH] of: arm: powerpc: Restrict memory@0 node handling to affected platforms In order to deal with a firmware bug on a specific ppc32 platform (longtrail), early_init_dt_scan_memory() looks for a node called memory@0 on all platforms, for all nodes lacking a device_type. Restrict this quirk to ppc32 and the arm mach-ux500 platforms (one of which has depended on this special handling). Signed-off-by: Leif Lindholm Cc: Grant Likely Cc: Lee Jones Cc: Mark Rutland Cc: devicetree@vger.kernel.org --- arch/arm/mach-ux500/Kconfig | 1 + arch/powerpc/Kconfig | 1 + drivers/of/Kconfig | 3 +++ drivers/of/fdt.c | 10 +++++++++- 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig index b41a42d..e6b0c3b 100644 --- a/arch/arm/mach-ux500/Kconfig +++ b/arch/arm/mach-ux500/Kconfig @@ -13,6 +13,7 @@ config ARCH_U8500 select CLKSRC_NOMADIK_MTU select HAVE_ARM_SCU if SMP select HAVE_ARM_TWD if SMP + select OF_MEMORY_AT_0_QUIRK select PINCTRL select PINCTRL_ABX500 select PINCTRL_NOMADIK diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index e099899..d78452d 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -3,6 +3,7 @@ source "arch/powerpc/platforms/Kconfig.cputype" config PPC32 bool default y if !PPC64 + select OF_MEMORY_AT_0_QUIRK config 32BIT bool diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig index 889005f..230c747 100644 --- a/drivers/of/Kconfig +++ b/drivers/of/Kconfig @@ -77,4 +77,7 @@ config OF_RESERVED_MEM help Helpers to allow for reservation of memory regions +config OF_MEMORY_AT_0_QUIRK + def_bool n + endmenu # OF diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index fa16a91..1b80b94 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -887,14 +887,22 @@ int __init early_init_dt_scan_memory(unsigned long node, const char *uname, /* We are scanning "memory" nodes only */ if (type == NULL) { +#ifdef CONFIG_OF_MEMORY_AT_0_QUIRK /* * The longtrail doesn't have a device_type on the * /memory node, so look for the node called /memory@0. + * Converted to generic quirk to handle later platforms + * with inforrect DTs that work only because of this + * special handling. */ if (depth != 1 || strcmp(uname, "memory@0") != 0) return 0; - } else if (strcmp(type, "memory") != 0) +#else + return 0; +#endif + } else if (strcmp(type, "memory") != 0) { return 0; + } reg = of_get_flat_dt_prop(node, "linux,usable-memory", &l); if (reg == NULL)