From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7A504C43387 for ; Thu, 27 Dec 2018 07:04:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 47EF3214C6 for ; Thu, 27 Dec 2018 07:04:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727940AbeL0HEY (ORCPT ); Thu, 27 Dec 2018 02:04:24 -0500 Received: from mga06.intel.com ([134.134.136.31]:38922 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727225AbeL0HEY (ORCPT ); Thu, 27 Dec 2018 02:04:24 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Dec 2018 23:04:23 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,404,1539673200"; d="scan'208";a="110230585" Received: from ahunter-desktop.fi.intel.com (HELO [10.237.72.56]) ([10.237.72.56]) by fmsmga007.fm.intel.com with ESMTP; 26 Dec 2018 23:04:20 -0800 Subject: Re: [PATCH 1/2] mmc: sdhci-iproc: handle mmc_of_parse() errors during probe To: Stefan Wahren , Al Cooper , Ulf Hansson Cc: Brian Norris , Gregory Fong , Florian Fainelli , Ray Jui , Scott Branden , Eric Anholt , bcm-kernel-feedback-list@broadcom.com, linux-mmc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, stable@vger.kernel.org References: <1545598758-4502-1-git-send-email-stefan.wahren@i2se.com> From: Adrian Hunter Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Message-ID: Date: Thu, 27 Dec 2018 09:02:49 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 In-Reply-To: <1545598758-4502-1-git-send-email-stefan.wahren@i2se.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On 23/12/18 10:59 PM, Stefan Wahren wrote: > We need to handle mmc_of_parse() errors during probe. > > This finally fixes the wifi regression on Raspberry Pi 3 series. > In error case the wifi chip was permanently in reset because of > the power sequence depending on the deferred probe of the GPIO expander. > > Fixes: b580c52d58d9 ("mmc: sdhci-iproc: add IPROC SDHCI driver") > Cc: stable@vger.kernel.org > Signed-off-by: Stefan Wahren Acked-by: Adrian Hunter > --- > drivers/mmc/host/sdhci-iproc.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/mmc/host/sdhci-iproc.c b/drivers/mmc/host/sdhci-iproc.c > index 0db9905..9d12c06 100644 > --- a/drivers/mmc/host/sdhci-iproc.c > +++ b/drivers/mmc/host/sdhci-iproc.c > @@ -296,7 +296,10 @@ static int sdhci_iproc_probe(struct platform_device *pdev) > > iproc_host->data = iproc_data; > > - mmc_of_parse(host->mmc); > + ret = mmc_of_parse(host->mmc); > + if (ret) > + goto err; > + > sdhci_get_property(pdev); > > host->mmc->caps |= iproc_host->data->mmc_caps; > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8DB9BC43387 for ; Thu, 27 Dec 2018 07:04:57 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5770C214C6 for ; Thu, 27 Dec 2018 07:04:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="YaNad1JO" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5770C214C6 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date: Message-ID:From:References:To:Subject:Reply-To:Content-ID:Content-Description :Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=nc0cE8SJMsg4F6fWCD92rFzRvcM0iWvzYOqmAyqnYH0=; b=YaNad1JO0nJuk0 Pp07KPX4bGTcWaYT064zIm6TdZeM4G5A4wXcd8otBA8UxBuQKNaY65oFBV07E96TE+qUvpdoo76OV StlQe7N1WwQ/j0Q2JxrG4z6rs8y/2JnPUzeTkCWwooIikQ7u7HKn8iBFLx7pJtAkEmpHVfMK0psn/ 70f31N+2i8HUGG5JXfiVeI+9R1H92y7nCX8yXRYJpt0F68jUhLD71j2padwSmw1Ct9fr0HNm1toWR 6vsMnHvyKoab1m2NAZi/kr4KxrBpS7jgNiWDQlHeqSIu2q/A7iuZR3I6S5aX+echBd7mslHACc2iq zA8YSoAkGsc6ts1pwAiw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gcPil-00076X-5b; Thu, 27 Dec 2018 07:04:43 +0000 Received: from mga06.intel.com ([134.134.136.31]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gcPif-00075Y-6F for linux-arm-kernel@lists.infradead.org; Thu, 27 Dec 2018 07:04:41 +0000 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Dec 2018 23:04:23 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,404,1539673200"; d="scan'208";a="110230585" Received: from ahunter-desktop.fi.intel.com (HELO [10.237.72.56]) ([10.237.72.56]) by fmsmga007.fm.intel.com with ESMTP; 26 Dec 2018 23:04:20 -0800 Subject: Re: [PATCH 1/2] mmc: sdhci-iproc: handle mmc_of_parse() errors during probe To: Stefan Wahren , Al Cooper , Ulf Hansson References: <1545598758-4502-1-git-send-email-stefan.wahren@i2se.com> From: Adrian Hunter Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Message-ID: Date: Thu, 27 Dec 2018 09:02:49 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 In-Reply-To: <1545598758-4502-1-git-send-email-stefan.wahren@i2se.com> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181226_230437_279913_6A71C515 X-CRM114-Status: GOOD ( 21.45 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Florian Fainelli , Scott Branden , Ray Jui , linux-mmc@vger.kernel.org, stable@vger.kernel.org, Eric Anholt , bcm-kernel-feedback-list@broadcom.com, Gregory Fong , Brian Norris , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 23/12/18 10:59 PM, Stefan Wahren wrote: > We need to handle mmc_of_parse() errors during probe. > > This finally fixes the wifi regression on Raspberry Pi 3 series. > In error case the wifi chip was permanently in reset because of > the power sequence depending on the deferred probe of the GPIO expander. > > Fixes: b580c52d58d9 ("mmc: sdhci-iproc: add IPROC SDHCI driver") > Cc: stable@vger.kernel.org > Signed-off-by: Stefan Wahren Acked-by: Adrian Hunter > --- > drivers/mmc/host/sdhci-iproc.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/mmc/host/sdhci-iproc.c b/drivers/mmc/host/sdhci-iproc.c > index 0db9905..9d12c06 100644 > --- a/drivers/mmc/host/sdhci-iproc.c > +++ b/drivers/mmc/host/sdhci-iproc.c > @@ -296,7 +296,10 @@ static int sdhci_iproc_probe(struct platform_device *pdev) > > iproc_host->data = iproc_data; > > - mmc_of_parse(host->mmc); > + ret = mmc_of_parse(host->mmc); > + if (ret) > + goto err; > + > sdhci_get_property(pdev); > > host->mmc->caps |= iproc_host->data->mmc_caps; > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel