Received: by 2002:a05:6358:11c7:b0:104:8066:f915 with SMTP id i7csp695431rwl; Fri, 24 Mar 2023 00:12:46 -0700 (PDT) X-Google-Smtp-Source: AKy350Z6gAUl+8brY/8uU/dParGY2xviZGa/LtPB8yWWE6+X9Ez0T1W93JlvuEoXJrARyIPKhkeS X-Received: by 2002:a17:902:db06:b0:1a2:1a5b:cc6a with SMTP id m6-20020a170902db0600b001a21a5bcc6amr967373plx.40.1679641966556; Fri, 24 Mar 2023 00:12:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679641966; cv=none; d=google.com; s=arc-20160816; b=wqkmlJ2EClhl/PYB0zAzDAoxNTme0Gc1fccwL3P5D30xkyu+LW1LMJrzyb1wnuZ0B/ 47dkMKRL2w5pXT5SA6qQokdoUhGlemAntWIjPEIJE7CS9H8kEquFJZCY6f7aaRGCKU2O 746GxcnWCdmLiHc6XxHVE3+5imSdf24Rzx6Zo86wHnXJ5NQz0A1Bfoi8JK53fTr4GXVC Q+klROBDMWjPpPnqx2UDmCGdF44xyEg1jwq1BAJL7RIJRUmfw+kNc0fI9AzPyyFi+O7k ySC+jO9xZIHPXasrCfPaeluXNn6DEVpqU1VWAwSCA1huuLRKUJBYvdllzprxSfHjTnew +TdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:user-agent:message-id:in-reply-to :date:references:subject:cc:to:from:dkim-signature; bh=PMyA6ksihCAhEJptBVXg68dZqaAJylbJy36Vq3XEhXc=; b=UK/+7OcI2mWHg6au5/Lvg7hMKGijVGOvYtXhneyYyOujuG1BRmW6oVlvtX1iKpIs2O 0FkPgDl7XduIYUHjvP1nqeYN2Pmih+tIXJpewzHv5OQVpfsGvfvNPGLoravUcqv2jVXJ DyULa1RoOtzOMjFQHmRcwAinYtrp19KAgDSEpZPR5lX1JmovS/ILid0P8/Fo+N2BITc3 tduaHUesbizGL679gHIxW96TJgpo0sU5b7KAkJSjJ5FXzJ6zLQqCkAasbg/mgQp2QQSA cdLLQ77ov+gk7UXF6kabZJ7Vy12AuG8oi1DE5I7QwVmfP/2HyhWcd0nZFwmy9O0T4gK1 pXfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=mMstbuZk; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id le13-20020a170902fb0d00b001a198a4871fsi19135206plb.577.2023.03.24.00.12.36; Fri, 24 Mar 2023 00:12:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=mMstbuZk; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230132AbjCXHLz (ORCPT + 59 others); Fri, 24 Mar 2023 03:11:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57108 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231350AbjCXHLu (ORCPT ); Fri, 24 Mar 2023 03:11:50 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A259725E35 for ; Fri, 24 Mar 2023 00:11:47 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 437D3B822B5 for ; Fri, 24 Mar 2023 07:11:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0155DC433EF; Fri, 24 Mar 2023 07:11:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1679641904; bh=kUN5xrlpoJluSYXeA6jQhKXtezB/+/6iMOE659UMlfA=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=mMstbuZko8JvIzDRK+C6tGM/msKR6gj14b/TOQRxOsYiWRuF/ZJ/J90AYaU/+oKZw i+/wNwylQ9MRh4ui0VQmDuZF4z8WQZyHb0gh2HZpWB1gUZVqSGnzWNM5cLQXYZQNe/ 4bbtDODZA1mv2JJezJ0Gwb5K/4aKNd9/vCcHHtkyf085XbUM1HwSbKPLcE+dD32JnC OsbKGdBbeNGeaWlXGwh6cU+ge8yrUiu4jBT5+Z+jKEhx1yzE5Bp2HFJmED8wjOydtI PZQXAaKPAxKkTbk0u/Q69wNgQI8YoDq6eIf+McSaevZtNJkiKLzo0XBH1DXYDZqnCP WnAgpFQDThLag== From: Kalle Valo To: Ulf Hansson Cc: Hans de Goede , Arend van Spriel , Franky Lin , Hante Meuleman , linux-wireless@vger.kernel.org, brcm80211-dev-list.pdl@broadcom.com, SHA-cyfmac-dev-list@infineon.com, Yann Gautier , Christophe ROULLIER-SCND-02 Subject: Re: [PATCH v2] wifi: brcmfmac: Fix SDIO suspend/resume regression References: <20230320122252.240070-1-hdegoede@redhat.com> Date: Fri, 24 Mar 2023 09:11:38 +0200 In-Reply-To: (Ulf Hansson's message of "Thu, 23 Mar 2023 15:33:44 +0100") Message-ID: <874jqavd1x.fsf@kernel.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Status: No, score=-2.5 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Ulf Hansson writes: > + Yann, Christophe > > On Mon, 20 Mar 2023 at 13:22, Hans de Goede wrote: >> >> After commit 92cadedd9d5f ("brcmfmac: Avoid keeping power to SDIO card >> unless WOWL is used"), the wifi adapter by default is turned off on suspend >> and then re-probed on resume. >> >> In at least 2 model x86/acpi tablets with brcmfmac43430a1 wifi adapters, >> the newly added re-probe on resume fails like this: >> >> brcmfmac: brcmf_sdio_bus_rxctl: resumed on timeout >> ieee80211 phy1: brcmf_bus_started: failed: -110 >> ieee80211 phy1: brcmf_attach: dongle is not responding: err=-110 >> brcmfmac: brcmf_sdio_firmware_callback: brcmf_attach failed >> >> It seems this specific brcmfmac model does not like being reprobed without >> it actually being turned off first. >> >> And the adapter is not being turned off during suspend because of >> commit f0992ace680c ("brcmfmac: prohibit ACPI power management for brcmfmac >> driver"). >> >> Now that the driver is being reprobed on resume, the disabling of ACPI >> pm is no longer necessary, except when WOWL is used (in which case there >> is no-reprobe). >> >> Move the dis-/en-abling of ACPI pm to brcmf_sdio_wowl_config(), this fixes >> the brcmfmac43430a1 suspend/resume regression and should help save some >> power when suspended. >> >> This change means that the code now also may re-enable ACPI pm when WOWL >> gets disabled. ACPI pm should only be re-enabled if it was enabled by >> the ACPI core originally. Add a brcmf_sdiod_acpi_save_power_manageable() >> to save the original state for this. >> >> This has been tested on the following devices: >> >> Asus T100TA brcmfmac43241b4-sdio >> Acer Iconia One 7 B1-750 brcmfmac43340-sdio >> Chuwi Hi8 brcmfmac43430a0-sdio >> Chuwi Hi8 brcmfmac43430a1-sdio >> >> (the Asus T100TA is the device for which the prohibiting of ACPI pm >> was originally added) >> >> Fixes: 92cadedd9d5f ("brcmfmac: Avoid keeping power to SDIO card unless WOWL is used") >> Cc: Ulf Hansson >> Signed-off-by: Hans de Goede > > Seems reasonable to me, thanks for fixing this! Feel free to add: > > Reviewed-by: Ulf Hansson As this is an older regression from v5.19 should I take this to wireless-next to get more testing time? -- https://patchwork.kernel.org/project/linux-wireless/list/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches