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.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 3E73AC43387 for ; Thu, 17 Jan 2019 09:55:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0F09E20657 for ; Thu, 17 Jan 2019 09:55:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=linaro.org header.i=@linaro.org header.b="jUppjekq" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726920AbfAQJzK (ORCPT ); Thu, 17 Jan 2019 04:55:10 -0500 Received: from mail-vs1-f67.google.com ([209.85.217.67]:35815 "EHLO mail-vs1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725997AbfAQJzK (ORCPT ); Thu, 17 Jan 2019 04:55:10 -0500 Received: by mail-vs1-f67.google.com with SMTP id e7so5861524vsc.2 for ; Thu, 17 Jan 2019 01:55:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=NTvgrK18nJp4k4myt9gradc1DReDsWdvoCIOcsKdrW8=; b=jUppjekqSB+5CifvaUCUplJNrZYp6K9fM8s/qxS3X0uHCgab6OK4pG1IL4fDnF6Sii aImt28R1slp3Q6By63sSy020V1U/+wXZOYwQT4XoylKKeJ2qR9Wm2hKBTqYSrDnTl8Rg Cg3GAh1JadWGinstIb5qt5KU7Y+oujesu86W0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=NTvgrK18nJp4k4myt9gradc1DReDsWdvoCIOcsKdrW8=; b=OGu+IpDOGzQWqQexKph3SKdFt9S8qQNUm1KIUJoGXXA1Wv2D6e+8A6u8cbxekeJbkR +omyQTBbR52I+hhJgcIYqi5NAOaGhVWUxk9cnlUdc3x13mU0N/7hxbk/pP617ULsWPmn /Dmrq1+aOacbnWkam0Pl2c/7g8PI0oEIC7FCVOlTJaXqELOzL0N4KGDU4+2C7MnIaegS PRSr7b9/XB4jHHLsCer01Hpc3KVArIj1xymuZZa5LlElrvV8bRlqg0DXLH3y+AYT12R+ 4qh63bYqyjamckscKnGEAh8U68mVa5GEIQ4cM9R5UVaR1CW5yoCllRfONxdFuLpWgNEs mdrA== X-Gm-Message-State: AJcUukdGJOrO3BcCSFCdo0VBr1myIHrBjokWETg6PGdHJQ5xaeLjpg82 i9fqb0BfUG5kxZ5cksDRmk0wrPILexwTLHWe/MmSRA== X-Google-Smtp-Source: ALg8bN7ubUANcy3Ur1KQIxKxpvreBSzhrxE3NZnjCYly/YiS+NzHlOYRS58kxR55s7ORgpJSDEVDa7Am65/WojwsIVE= X-Received: by 2002:a67:b245:: with SMTP id s5mr5388726vsh.200.1547718909305; Thu, 17 Jan 2019 01:55:09 -0800 (PST) MIME-Version: 1.0 References: <20190116113723.15668-1-ulf.hansson@linaro.org> <258ecb6b-c2b2-c8b8-9804-4df69002d9f5@web.de> In-Reply-To: <258ecb6b-c2b2-c8b8-9804-4df69002d9f5@web.de> From: Ulf Hansson Date: Thu, 17 Jan 2019 10:54:32 +0100 Message-ID: Subject: Re: [PATCH V2] wlcore: sdio: Fixup power on/off sequence To: Jan Kiszka Cc: Kalle Valo , Tony Lindgren , Eyal Reizer , linux-wireless@vger.kernel.org, Ricardo Salveti , Kishon Vijay Abraham I , Anders Roxell , John Stultz , Linux Kernel Mailing List , linux-omap Content-Type: text/plain; charset="UTF-8" Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org On Wed, 16 Jan 2019 at 21:26, Jan Kiszka wrote: > > On 16.01.19 12:37, Ulf Hansson wrote: > > During "wlan-up", we are programming the FW into the WiFi-chip. However, > > re-programming the FW doesn't work, unless a power cycle of the WiFi-chip > > is made in-between the programmings. > > > > To conform to this requirement and to fix the regression in a simple way, > > let's start by allowing that the SDIO card (WiFi-chip) may stay powered on > > (runtime resumed) when wl12xx_sdio_power_off() returns. The intent with the > > current code is to treat this scenario as an error, but unfortunate this > > doesn't work as expected, so let's fix this. > > > > The other part is to guarantee that a power cycle of the SDIO card has been > > completed when wl12xx_sdio_power_on() returns, as to allow the FW > > programming to succeed. However, relying solely on runtime PM to deal with > > this isn't sufficient. For example, userspace may prevent runtime suspend > > via sysfs for the device that represents the SDIO card, leading to that the > > mmc core also keeps it powered on. For this reason, let's instead do a > > brute force power cycle in wl12xx_sdio_power_on(). > > > > Fixes: 728a9dc61f13 ("wlcore: sdio: Fix flakey SDIO runtime PM handling") > > Signed-off-by: Ulf Hansson > > --- > > > > Changes in v2: > > - Keep the SDIO host claimed when calling mmc_hw_reset(). > > - Add a fixes tag. > > --- > > drivers/net/wireless/ti/wlcore/sdio.c | 15 +++++++-------- > > 1 file changed, 7 insertions(+), 8 deletions(-) > > > > diff --git a/drivers/net/wireless/ti/wlcore/sdio.c b/drivers/net/wireless/ti/wlcore/sdio.c > > index bd10165d7eec..4d4b07701149 100644 > > --- a/drivers/net/wireless/ti/wlcore/sdio.c > > +++ b/drivers/net/wireless/ti/wlcore/sdio.c > > @@ -164,6 +164,12 @@ static int wl12xx_sdio_power_on(struct wl12xx_sdio_glue *glue) > > } > > > > sdio_claim_host(func); > > + /* > > + * To guarantee that the SDIO card is power cycled, as required to make > > + * the FW programming to succeed, let's do a brute force HW reset. > > + */ > > + mmc_hw_reset(card->host); > > + > > sdio_enable_func(func); > > sdio_release_host(func); > > > > @@ -174,20 +180,13 @@ static int wl12xx_sdio_power_off(struct wl12xx_sdio_glue *glue) > > { > > struct sdio_func *func = dev_to_sdio_func(glue->dev); > > struct mmc_card *card = func->card; > > - int error; > > > > sdio_claim_host(func); > > sdio_disable_func(func); > > sdio_release_host(func); > > > > /* Let runtime PM know the card is powered off */ > > - error = pm_runtime_put(&card->dev); > > - if (error < 0 && error != -EBUSY) { > > - dev_err(&card->dev, "%s failed: %i\n", __func__, error); > > - > > - return error; > > - } > > - > > + pm_runtime_put(&card->dev); > > return 0; > > } > > > > > > Just tested on both HiKey (620) and Ultra96 but it fails to fix the issue on > both. I'm getting > > wl1271_sdio: probe of mmc2:0001:1 failed with error -16 > > during boot again, and the interface is not available. Okay, sounds like this may be a different problem then. Can you share the complete log and the kernel config? I can prepare a debug patch as well, if you are willing to re-run the test? Adding a post-power-on-delay-ms of 1 ms as you suggested [1], doesn't sounds like the correct solution to me, unless I am overlooking some things. The point is, since the mmc core succeeds to detect and initialize the SDIO card, the power sequence seems to be correct. Kind regards Uffe [1] https://patchwork.kernel.org/patch/10745075/