From patchwork Sat Jun 29 23:25:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olof Johansson X-Patchwork-Id: 2804111 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 DD688BF4A1 for ; Sat, 29 Jun 2013 23:26:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 13AA020107 for ; Sat, 29 Jun 2013 23:26:07 +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 D8F7920105 for ; Sat, 29 Jun 2013 23:26:05 +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 1Ut4Wn-00056X-0u; Sat, 29 Jun 2013 23:26:01 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ut4Wk-0006Tn-JR; Sat, 29 Jun 2013 23:25:58 +0000 Received: from mail-pa0-f44.google.com ([209.85.220.44]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ut4Wi-0006TH-9G for linux-arm-kernel@lists.infradead.org; Sat, 29 Jun 2013 23:25:57 +0000 Received: by mail-pa0-f44.google.com with SMTP id lj1so3725774pab.17 for ; Sat, 29 Jun 2013 16:25:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=ShFdRm5AQpnyUbY9dmqclFJloRyYZbnQeBId3uzwcfY=; b=e547CPDV25X017XWuPVllpQhCYA9e+jvnjBI0PGdNkGA++y8QPWFl0LL/L3gLBSARl 2mPO47sFuv5wUqXjS3soMWsZCClUBZVywn6jT5hEOFn246prGvy2QC2UNkLQ1uKbPoBP hLoBhRQrEqKcgprk9PEPZEpn/evE1ozXJsB4uMS/KsHjUF0Zbcu6tQ5Vus/jJ6txO0o/ aE5PwVazKoGct2qTxxyHIe5SwNSO+QVKVG+q0lUAm9fVx+BO50bSG+zOWf0y9JkYnqp2 ZO4A0Rb1khpQJoiqgpZ+CDVxkJxXFVouugM20OyzL4c5oOMB8Tgo6nd1hWDZ76M9qe/a Pv9A== X-Received: by 10.66.219.38 with SMTP id pl6mr17775542pac.59.1372548334519; Sat, 29 Jun 2013 16:25:34 -0700 (PDT) Received: from quad.lixom.net (173-13-129-225-sfba.hfc.comcastbusiness.net. [173.13.129.225]) by mx.google.com with ESMTPSA id dg3sm14657771pbc.24.2013.06.29.16.25.32 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 29 Jun 2013 16:25:33 -0700 (PDT) From: Olof Johansson To: torvalds@linux-foundation.org Subject: [PATCH] ARM: dt: Only print warning, not WARN() on bad cpu map in device tree Date: Sat, 29 Jun 2013 16:25:14 -0700 Message-Id: <1372548314-12785-1-git-send-email-olof@lixom.net> X-Mailer: git-send-email 1.8.1.192.gc4361b8 X-Gm-Message-State: ALoCoQlyCVCUm/UdBYB+7F6htnP3hSTVmtNsuQAimWAlXohotT3qL55CIgnLkRt+NGWb99Ezt/te X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130629_192556_433017_A0AD29FF X-CRM114-Status: GOOD ( 10.98 ) X-Spam-Score: -2.6 (--) Cc: Lorenzo Pieralisi , linux@arm.linux.org.uk, arnd@arndb.de, Emilio Lopez , linux-kernel@vger.kernel.org, Olof Johansson , Maxime Ripard , 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: , MIME-Version: 1.0 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 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. Acked-by: Russell King Signed-off-by: Olof Johansson --- Linus, please apply directly for 3.10 if there is still time. Thanks! -Olof arch/arm/kernel/devtree.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c index 0905502..5859c8b 100644 --- a/arch/arm/kernel/devtree.c +++ b/arch/arm/kernel/devtree.c @@ -152,9 +152,10 @@ 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