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=-17.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 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 A099BC432BE for ; Tue, 17 Aug 2021 11:11:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 87D9560ED5 for ; Tue, 17 Aug 2021 11:11:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236655AbhHQLMU (ORCPT ); Tue, 17 Aug 2021 07:12:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39296 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236640AbhHQLMP (ORCPT ); Tue, 17 Aug 2021 07:12:15 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 84BDAC0613CF for ; Tue, 17 Aug 2021 04:11:42 -0700 (PDT) Received: from gallifrey.ext.pengutronix.de ([2001:67c:670:201:5054:ff:fe8d:eefb] helo=[IPv6:::1]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1mFx0L-00021W-6E; Tue, 17 Aug 2021 13:11:37 +0200 Subject: Re: [PATCH] brcmfmac: pcie: fix oops on failure to resume and reprobe To: Andy Shevchenko Cc: Arend van Spriel , Franky Lin , Hante Meuleman , Chi-hsien Lin , Wright Feng , Chung-hsien Hsu , "kernel@pengutronix.de" , "SHA-cyfmac-dev-list@infineon.com" , "brcm80211-dev-list.pdl@broadcom.com" , "netdev@vger.kernel.org" , "linux-wireless@vger.kernel.org" , Kalle Valo , Jakub Kicinski , "David S. Miller" , "linux-kernel@vger.kernel.org" References: <20210817063521.22450-1-a.fatoum@pengutronix.de> From: Ahmad Fatoum Message-ID: <3a9a3789-5a13-7e72-b909-8f0826b8ab86@pengutronix.de> Date: Tue, 17 Aug 2021 13:11:31 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 2001:67c:670:201:5054:ff:fe8d:eefb X-SA-Exim-Mail-From: a.fatoum@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-wireless@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org On 17.08.21 13:02, Andy Shevchenko wrote: > On Tuesday, August 17, 2021, Ahmad Fatoum wrote: > >> When resuming from suspend, brcmf_pcie_pm_leave_D3 will first attempt a >> hot resume and then fall back to removing the PCI device and then >> reprobing. If this probe fails, the kernel will oops, because brcmf_err, >> which is called to report the failure will dereference the stale bus >> pointer. Open code and use the default bus-less brcmf_err to avoid this. >> >> Signed-off-by: Ahmad Fatoum >> --- >> To: Arend van Spriel >> To: Franky Lin >> To: Hante Meuleman >> To: Chi-hsien Lin >> To: Wright Feng >> To: Chung-hsien Hsu >> Cc: SHA-cyfmac-dev-list@infineon.com >> Cc: brcm80211-dev-list.pdl@broadcom.com >> Cc: netdev@vger.kernel.org >> Cc: linux-wireless@vger.kernel.org >> Cc: Kalle Valo >> Cc: Jakub Kicinski >> Cc: "David S. Miller" >> Cc: linux-kernel@vger.kernel.org >> --- >> drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c >> b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c >> index 9ef94d7a7ca7..d824bea4b79d 100644 >> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c >> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c >> @@ -2209,7 +2209,7 @@ static int brcmf_pcie_pm_leave_D3(struct device *dev) >> >> err = brcmf_pcie_probe(pdev, NULL); >> if (err) >> - brcmf_err(bus, "probe after resume failed, err=%d\n", err); >> + __brcmf_err(NULL, __func__, "probe after resume failed, >> err=%d\n", > > > This is weird looking line now. Why can’t you simply use dev_err() / > netdev_err()? That's what brcmf_err normally expands to, but in this file the macro is overridden to add the extra first argument. The brcmf_ logging function write to brcmf trace buffers. This is not done with netdev_err/dev_err (and replacing the existing logging is out of scope for a regression fix anyway). Cheers, Ahmad > > >> >> return err; >> } >> -- >> 2.30.2 >> >> > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |