From patchwork Thu Apr 2 19:43:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 6151471 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B5094BF4A6 for ; Thu, 2 Apr 2015 19:47:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C766C203B6 for ; Thu, 2 Apr 2015 19:47:56 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 92E762039C for ; Thu, 2 Apr 2015 19:47:55 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ydl2K-00015D-MH; Thu, 02 Apr 2015 19:44:20 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ydl2E-0000wS-9u for linux-arm-kernel@lists.infradead.org; Thu, 02 Apr 2015 19:44:15 +0000 Received: from smtp.codeaurora.org (localhost [127.0.0.1]) by smtp.codeaurora.org (Postfix) with ESMTP id 72EE314158E; Thu, 2 Apr 2015 19:43:52 +0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 486) id 636061415BB; Thu, 2 Apr 2015 19:43:52 +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=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from [10.134.64.202] (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 E47AA14158E; Thu, 2 Apr 2015 19:43:50 +0000 (UTC) Message-ID: <551D9BF6.2070502@codeaurora.org> Date: Thu, 02 Apr 2015 12:43:50 -0700 From: Stephen Boyd User-Agent: Mozilla/5.0 (X11; Linux i686 on x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: Kumar Gala , Nicolas Dechesne Subject: Re: [GIT PULL] qcom SoC changes for v4.1 References: <42F2C5A0-5231-4D4B-95EE-7BC173A14768@codeaurora.org> In-Reply-To: <42F2C5A0-5231-4D4B-95EE-7BC173A14768@codeaurora.org> X-Virus-Scanned: ClamAV using ClamSMTP X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150402_124414_418254_F4AAB7D3 X-CRM114-Status: GOOD ( 20.34 ) X-Spam-Score: -0.0 (/) Cc: Arnd Bergmann , linux-arm-msm , Tyler Baker , linux-kernel@vger.kernel.org, arm@kernel.org, Lina Iyer , Andy Gross , Olof Johansson , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 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-Virus-Scanned: ClamAV using ClamSMTP On 04/02/15 12:25, Kumar Gala wrote: > On Apr 2, 2015, at 3:37 AM, Nicolas Dechesne wrote: > >> Andy, Kumar, >> >> On Mon, Mar 16, 2015 at 10:03 PM, Kumar Gala wrote: >>> Andy Gross (1): >>> soc: qcom: gsbi: Add support for ADM CRCI muxing >> this commit seems to break the boot on IFC6410, it was initially >> reported on kernelci.org, see report and bootlog [1]. >> >> running git bisect led me to: >> >> e5fdad68d47ed344832b7ca4e18b2e9708d8141e is the first bad commit >> commit e5fdad68d47ed344832b7ca4e18b2e9708d8141e >> Author: Andy Gross >> Date: Mon Feb 9 16:01:06 2015 -0600 >> >> soc: qcom: gsbi: Add support for ADM CRCI muxing >> >> This patch adds automatic configuration for the ADM CRCI muxing required to >> support DMA operations for GSBI clients. The GSBI mode and >> instance determine >> the correct TCSR ADM CRCI MUX value that must be programmed so that the DMA >> works properly. >> >> Signed-off-by: Andy Gross >> Signed-off-by: Kumar Gala >> >> >> [1] http://kernelci.org/boot/all/job/arm-soc/kernel/v4.0-rc4-354-ga0690e6586df/ > I think we need to associated DT updates. > > What about this patch squashed on top? Just guessing but I suspect we don't care about cell-index if we're not doing the tcsr stuff. Also, I imagine we could get rid of cell-index entirely if we matched against the address of the gsbi instead. Signed-off-by: Stephen Boyd ----8<----- diff --git a/drivers/soc/qcom/qcom_gsbi.c b/drivers/soc/qcom/qcom_gsbi.c index 09c669e70d63..ac7d71b6527d 100644 --- a/drivers/soc/qcom/qcom_gsbi.c +++ b/drivers/soc/qcom/qcom_gsbi.c @@ -139,7 +139,7 @@ static int gsbi_probe(struct platform_device *pdev) void __iomem *base; struct gsbi_info *gsbi; int i; - u32 mask, gsbi_num; + u32 mask, gsbi_num = 0; const struct crci_config *config = NULL; gsbi = devm_kzalloc(&pdev->dev, sizeof(*gsbi), GFP_KERNEL); @@ -166,16 +166,19 @@ static int gsbi_probe(struct platform_device *pdev) of_node_put(tcsr_node); } - } - if (of_property_read_u32(node, "cell-index", &gsbi_num)) { - dev_err(&pdev->dev, "missing cell-index\n"); - return -EINVAL; - } + if (config) { + if (of_property_read_u32(node, "cell-index", &gsbi_num)) { + dev_err(&pdev->dev, "missing cell-index\n"); + return -EINVAL; + } + + if (gsbi_num < 1 || gsbi_num > MAX_GSBI) { + dev_err(&pdev->dev, "invalid cell-index\n"); + return -EINVAL; + } + } - if (gsbi_num < 1 || gsbi_num > MAX_GSBI) { - dev_err(&pdev->dev, "invalid cell-index\n"); - return -EINVAL; } if (of_property_read_u32(node, "qcom,mode", &gsbi->mode)) {