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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C7927C04A95 for ; Sat, 24 Sep 2022 02:55:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233044AbiIXCzG (ORCPT ); Fri, 23 Sep 2022 22:55:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39456 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233093AbiIXCzC (ORCPT ); Fri, 23 Sep 2022 22:55:02 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0408B2EF1C; Fri, 23 Sep 2022 19:55:00 -0700 (PDT) Received: from kwepemi500008.china.huawei.com (unknown [172.30.72.53]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4MZD6J3FVRz1P6ln; Sat, 24 Sep 2022 10:50:48 +0800 (CST) Received: from [10.67.109.254] (10.67.109.254) by kwepemi500008.china.huawei.com (7.221.188.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 24 Sep 2022 10:54:58 +0800 Message-ID: Date: Sat, 24 Sep 2022 10:54:57 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.2.0 Subject: Re: [PATCH -next] wifi: brcmfmac: pcie: add missing pci_disable_device() in brcmf_pcie_get_resource() Content-Language: en-US To: Franky Lin CC: , , , , , , , , , , , , , , , References: <20220923093806.3108119-1-ruanjinjie@huawei.com> From: Ruan Jinjie In-Reply-To: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.67.109.254] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To kwepemi500008.china.huawei.com (7.221.188.139) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2022/9/24 0:50, Franky Lin wrote: > On Fri, Sep 23, 2022 at 2:42 AM ruanjinjie wrote: >> >> Add missing pci_disable_device() if brcmf_pcie_get_resource() fails. > > Did you encounter any issue because of the absensent > pci_disable_device? A bit more context will be very helpful. > >> >> Signed-off-by: ruanjinjie >> --- >> drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 9 +++++++-- >> 1 file changed, 7 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c >> index f98641bb1528..25fa69793d86 100644 >> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c >> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c >> @@ -1725,7 +1725,8 @@ static int brcmf_pcie_get_resource(struct brcmf_pciedev_info *devinfo) >> if ((bar1_size == 0) || (bar1_addr == 0)) { >> brcmf_err(bus, "BAR1 Not enabled, device size=%ld, addr=%#016llx\n", >> bar1_size, (unsigned long long)bar1_addr); >> - return -EINVAL; >> + err = -EINVAL; >> + goto err_disable; >> } >> >> devinfo->regs = ioremap(bar0_addr, BRCMF_PCIE_REG_MAP_SIZE); >> @@ -1734,7 +1735,8 @@ static int brcmf_pcie_get_resource(struct brcmf_pciedev_info *devinfo) >> if (!devinfo->regs || !devinfo->tcm) { >> brcmf_err(bus, "ioremap() failed (%p,%p)\n", devinfo->regs, >> devinfo->tcm); >> - return -EINVAL; >> + err = -EINVAL; >> + goto err_disable; >> } >> brcmf_dbg(PCIE, "Phys addr : reg space = %p base addr %#016llx\n", >> devinfo->regs, (unsigned long long)bar0_addr); >> @@ -1743,6 +1745,9 @@ static int brcmf_pcie_get_resource(struct brcmf_pciedev_info *devinfo) >> (unsigned int)bar1_size); >> >> return 0; >> +err_disable: >> + pci_disable_device(pdev); > > Isn't brcmf_pcie_release_resource() a better choice which also unmap > the io if any was mapped? > That is a better choice to call pci_disable_device() in brcmf_pcie_release_resource()! > Regards, > - Franky > >> + return err; >> } >> >> >> -- >> 2.25.1 >>