From patchwork Sat Jun 29 22:54:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olof Johansson X-Patchwork-Id: 2804011 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 883E4BF4A1 for ; Sat, 29 Jun 2013 22:55:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 90E7320107 for ; Sat, 29 Jun 2013 22:55:02 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6725D20106 for ; Sat, 29 Jun 2013 22:55:01 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ut42j-0002D4-Ri; Sat, 29 Jun 2013 22:54:58 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ut42h-00067j-8T; Sat, 29 Jun 2013 22:54:55 +0000 Received: from mail-pa0-f49.google.com ([209.85.220.49]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ut42e-00067F-92 for linux-arm-kernel@lists.infradead.org; Sat, 29 Jun 2013 22:54:53 +0000 Received: by mail-pa0-f49.google.com with SMTP id ld11so3658382pab.36 for ; Sat, 29 Jun 2013 15:54:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent :x-gm-message-state; bh=uIVaPMKJHg3+8wAxh9DM/m/xDRvmEzVwKcfQveD6v3I=; b=elmmbzLrrEVpbeGIzkt/7snyW5cwnZIw97+2jlHlh6EFhjUGt1Xso09SY1k+ZioFVs 7E0LNviSxQQvUJ8QY2zBKVRBCf1NsQUyiO6CvYB5ssYVwH2WXchBf8L2Ud3010SWgT17 WjDDFpfRIerJZuRvqvzTmLkYs2c+dpA+FatDuGEDPS3zeAgwCCYfMv3XenNibGuyw7bI xmhGq+NOERLyJjSdq8l/xHZ81vJGiYpEWNMlg2+OL5OyishRxOjUiGdleHWwCVn2GBLp YcvAk3oKsoPMUNrIjx0kJ+n4mruLfa3Y5v3+aH6BEI2F3D1SiHRa94108ShOrXq25SoY GKsg== X-Received: by 10.68.14.170 with SMTP id q10mr17535852pbc.102.1372546469120; Sat, 29 Jun 2013 15:54:29 -0700 (PDT) Received: from localhost (173-13-129-225-sfba.hfc.comcastbusiness.net. [173.13.129.225]) by mx.google.com with ESMTPSA id xl3sm14590956pbb.17.2013.06.29.15.54.27 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sat, 29 Jun 2013 15:54:28 -0700 (PDT) Date: Sat, 29 Jun 2013 15:54:26 -0700 From: Olof Johansson To: Russell King - ARM Linux Subject: Re: [PATCH 0/2] ARM: sunxi: Convert DTSI to new CPU bindings Message-ID: <20130629225426.GA12221@quad.lixom.net> References: <1372437844-16325-1-git-send-email-maxime.ripard@free-electrons.com> <20130628171532.GD30603@e102568-lin.cambridge.arm.com> <20130628200333.GA2756@lukather> <20130629193819.GD3353@n2100.arm.linux.org.uk> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20130629193819.GD3353@n2100.arm.linux.org.uk> User-Agent: Mutt/1.5.21 (2010-09-15) X-Gm-Message-State: ALoCoQmocGe6xES8rDYQSjrXNkigbNh/YBAhpRH0j8st31qxpGq7BsmKboh7HEkwZJfScGYP7HDe X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130629_185452_382925_A275AE2E X-CRM114-Status: GOOD ( 28.22 ) X-Spam-Score: -2.6 (--) Cc: Lorenzo Pieralisi , Arnd Bergmann , Emilio Lopez , "linux-kernel@vger.kernel.org" , Maxime Ripard , torvalds@linux-foundation.org, "linux-arm-kernel@lists.infradead.org" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Sat, Jun 29, 2013 at 08:38:19PM +0100, Russell King - ARM Linux wrote: > On Fri, Jun 28, 2013 at 01:05:42PM -0700, Olof Johansson wrote: > > On Fri, Jun 28, 2013 at 1:03 PM, Maxime Ripard > > wrote: > > > On Fri, Jun 28, 2013 at 06:15:32PM +0100, Lorenzo Pieralisi wrote: > > >> The patch above should already be queued in next/dt right ? > > > > > > Indeed. > > > > > > Then why the latest patch of your patchset got in 3.10, while the > > > patches actually fixing the DT it would have impacted were delayed to > > > 3.11? > > > > > > (And why was it merged so late in the development cycle?) > > > > This. So now we have to scramble because some device trees will > > produce warnings at boot. > > > > Russell, the alternative is to revert Lorenzo's patch for 3.10 (and > > re-introduce it for 3.11). Do you have a preference? > > Sorry but I really don't understand what all the fuss in this thread > is about. > > This thread seems to be saying that two development patches were > merged, which were 7762/1 and 7763/1, and that 7764/1 is a fix? > Are you sure about that, because that's not how they're described, > and not how they look either. Most of this ruffle seems to be about the fact that booting a kernel with a device tree that doesn't conform to the brand spanking new, and never previously enforced, binding for the cpu nodes will produce a WARN_ON(). Lots of our in-tree device trees fall into this category. And while I think it was a bad idea for Lorenzo to ask for this to be merged as a fix this late (and most in particular for stable), as far as I can tell nothing (new) is broken by it -- just the alarming warning is being printed. I think it probably makes sense to downgrade the WARN to just a printk, and people will be a lot less worried. How about the below? If you're OK with it, Russell, can we get your ack so Linus can apply directly given the imminence of final 3.10? Or, if you prefer, you can of course apply and send it on instead. Thanks, -Olof ----- ARM: dt: Only print warning, not WARN() on bad cpu map in device tree Due to recent changes and expecations of proper cpu bindings, there are now cases for many of the in-tree devicetrees where a WARN() will hit on boot due to badly formatted /cpus nodes. Downgrade this to a pr_warn() to be less alarmist, since it's not a new problem. Tested on Arndale, Cubox, Seaboard and Panda ES. Panda hits the WARN without this, the others do not. Signed-off-by: Olof Johansson diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c index 0905502..707f99e 100644 --- a/arch/arm/kernel/devtree.c +++ b/arch/arm/kernel/devtree.c @@ -152,9 +152,11 @@ void __init arm_dt_init_cpu_maps(void) tmp_map[i] = hwid; } - if (WARN(!bootcpu_valid, "DT missing boot CPU MPIDR[23:0], " - "fall back to default cpu_logical_map\n")) + if (!bootcpu_valid) { + pr_warn("DT missing boot CPU MPIDR[23:0], fall back to " + "default cpu_logical_map\n"); return; + } /* * Since the boot CPU node contains proper data, and all nodes have