From patchwork Mon Nov 10 19:42:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 5268881 Return-Path: X-Original-To: patchwork-linux-arm-msm@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 84700C11AC for ; Mon, 10 Nov 2014 19:42:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B21A820166 for ; Mon, 10 Nov 2014 19:42:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C473F2010E for ; Mon, 10 Nov 2014 19:42:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752078AbaKJTmI (ORCPT ); Mon, 10 Nov 2014 14:42:08 -0500 Received: from smtp.codeaurora.org ([198.145.11.231]:35269 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751385AbaKJTmG (ORCPT ); Mon, 10 Nov 2014 14:42:06 -0500 Received: from smtp.codeaurora.org (localhost [127.0.0.1]) by smtp.codeaurora.org (Postfix) with ESMTP id EBC8D141293; Mon, 10 Nov 2014 19:42:04 +0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 486) id C91C3141294; Mon, 10 Nov 2014 19:42:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from [10.46.167.8] (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: sboyd@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id D9075141295; Mon, 10 Nov 2014 19:42:03 +0000 (UTC) Message-ID: <5461150B.2010907@codeaurora.org> Date: Mon, 10 Nov 2014 11:42:03 -0800 From: Stephen Boyd User-Agent: Mozilla/5.0 (X11; Linux i686 on x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 To: Kevin Hilman CC: Greg Kroah-Hartman , lkml , linux-arm-msm , "linux-arm-kernel@lists.infradead.org" , linux-serial@vger.kernel.org, Olof Johansson , Arnd Bergmann , Tyler Baker , Frank Rowand Subject: Re: [PATCH] tty: serial: msm_serial: Use DT aliases References: <1414024381-12204-1-git-send-email-sboyd@codeaurora.org> In-Reply-To: X-Virus-Scanned: ClamAV using ClamSMTP Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On 11/10/2014 10:54 AM, Kevin Hilman wrote: > On Wed, Oct 22, 2014 at 5:33 PM, Stephen Boyd wrote: >> We rely on probe order of this driver to determine the line number for >> the uart port. This makes it impossible to know the line number >> when these devices are populated via DT. Use the DT alias >> mechanism to assign the line based on the aliases node. >> >> Signed-off-by: Stephen Boyd > FYI... this patch hit linux-next and caused multiple boot failures on > qcom platforms[1] as of next-20141110. I'm assuming this is because > the corresponding DTS changes have not hit linux-next yet. > > Kevin > > [1] http://status.armcloud.us/boot/?qcom Hmm the intention was to make it optional so that dts changes aren't necessary unless you want deterministic numbering. I screwed that up badly :/ Thanks for finding this. Greg, can you also apply this patch or squash it into the bad one? ----8<----- From: Stephen Boyd Subject: [PATCH] tty: serial: msm_serial: Don't required DT aliases If there isn't a DT alias then of_alias_get_id() will return -ENODEV. This will cause the msm_serial driver to fail probe, when we want to keep the previous behavior where we generated a dynamic line number at probe time. Restore this behavior by generating a dynamic id if the line number is still negative after checking for an alias or (in the non-DT case) looking at the .id field of the platform device. Reported-by: Kevin Hilman Signed-off-by: Stephen Boyd Tested-by: Kevin Hilman --- drivers/tty/serial/msm_serial.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c index 09364dd8cf3a..d1bc6b6cbc70 100644 --- a/drivers/tty/serial/msm_serial.c +++ b/drivers/tty/serial/msm_serial.c @@ -1046,14 +1046,14 @@ static int msm_serial_probe(struct platform_device *pdev) const struct of_device_id *id; int irq, line; - if (pdev->id == -1) - pdev->id = atomic_inc_return(&msm_uart_next_id) - 1; - if (pdev->dev.of_node) line = of_alias_get_id(pdev->dev.of_node, "serial"); else line = pdev->id; + if (line < 0) + line = atomic_inc_return(&msm_uart_next_id) - 1; + if (unlikely(line < 0 || line >= UART_NR)) return -ENXIO;