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 D7F6CC38A2D for ; Tue, 25 Oct 2022 10:29:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229730AbiJYK33 (ORCPT ); Tue, 25 Oct 2022 06:29:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52014 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232120AbiJYK2c (ORCPT ); Tue, 25 Oct 2022 06:28:32 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2C73312AAE for ; Tue, 25 Oct 2022 03:27:12 -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 C9781B80B54 for ; Tue, 25 Oct 2022 10:27:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CAC19C433C1; Tue, 25 Oct 2022 10:27:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1666693629; bh=a/6ss59CYdPzUoIIgWjpCJ1zmHf0oEIg85TzUYr1X28=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=jggcNUfJ2F3jhvoVoCtdKQxXwFXsNFwJVU9u+yJx26RUvt9rAx6V0P/fCP4ygIFUx ueEDPEVEGadNIUi8bsPA0+uVsrxsc7dWJoWjNvaRA3YaPemcjzFOsh8ezxlioOS9GI aYmEtmUbrK+60x09Mg8+TfrZcMraDYSmzX82aHIpP50JQq1B9XTmdG1Zpl5R1weIsL IBUbEx1VriUkKdrBKbmYBrO9uKW/ydrrwO100MaDm3l6DQhsEJODXvx5GjonTXlD2d mLQHjeL/rs5QOkNV5XCBAboWfXLTBCGXhQdgNcQIWleKyReW7q8abYkqunhMM65otJ K1lHq27JbcnPw== Date: Tue, 25 Oct 2022 13:27:05 +0300 From: Leon Romanovsky To: Yang Yingliang Cc: netdev@vger.kernel.org, davem@davemloft.net, kuba@kernel.org Subject: Re: [PATCH net] net: fealnx: fix missing pci_disable_device() Message-ID: References: <20221024135728.2894863-1-yangyingliang@huawei.com> <1adbffd3-6503-938e-b0b8-9525b72f00b3@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1adbffd3-6503-938e-b0b8-9525b72f00b3@huawei.com> Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Tue, Oct 25, 2022 at 05:01:58PM +0800, Yang Yingliang wrote: > > On 2022/10/25 15:47, Leon Romanovsky wrote: > > On Mon, Oct 24, 2022 at 09:57:28PM +0800, Yang Yingliang wrote: > > > pci_disable_device() need be called while module exiting, switch > > > to use pcim_enable(), pci_disable_device() and pci_release_regions() > > > will be called in pcim_release() while unbinding device. > > I didn't understand the description at all, maybe people in CC will. > > Most likely, you wanted something like this: > After using pcim_enable_device(), pcim_release() will be called while > unbinding > device, pcim_release() calls both pci_release_regions() and > pci_disable_device(). I'm not sure that you can mix managed with unmanaged PCI APIs. Thanks > > Thanks, > Yang > > > > diff --git a/drivers/net/ethernet/fealnx.c b/drivers/net/ethernet/fealnx.c > > index ed18450fd2cc..78107dd4aa57 100644 > > --- a/drivers/net/ethernet/fealnx.c > > +++ b/drivers/net/ethernet/fealnx.c > > @@ -690,6 +690,7 @@ static void fealnx_remove_one(struct pci_dev *pdev) > > pci_iounmap(pdev, np->mem); > > free_netdev(dev); > > pci_release_regions(pdev); > > + pci_disable_device(pdev); > > } else > > printk(KERN_ERR "fealnx: remove for unknown device\n"); > > > > > > > Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") > > > Signed-off-by: Yang Yingliang > > > --- > > > drivers/net/ethernet/fealnx.c | 4 +--- > > > 1 file changed, 1 insertion(+), 3 deletions(-) > > > > > > diff --git a/drivers/net/ethernet/fealnx.c b/drivers/net/ethernet/fealnx.c > > > index ed18450fd2cc..fb139f295b67 100644 > > > --- a/drivers/net/ethernet/fealnx.c > > > +++ b/drivers/net/ethernet/fealnx.c > > > @@ -494,7 +494,7 @@ static int fealnx_init_one(struct pci_dev *pdev, > > > option = card_idx < MAX_UNITS ? options[card_idx] : 0; > > > - i = pci_enable_device(pdev); > > > + i = pcim_enable_device(pdev); > > > if (i) return i; > > > pci_set_master(pdev); > > > @@ -670,7 +670,6 @@ static int fealnx_init_one(struct pci_dev *pdev, > > > err_out_unmap: > > > pci_iounmap(pdev, ioaddr); > > > err_out_res: > > > - pci_release_regions(pdev); > > > return err; > > > } > > > @@ -689,7 +688,6 @@ static void fealnx_remove_one(struct pci_dev *pdev) > > > unregister_netdev(dev); > > > pci_iounmap(pdev, np->mem); > > > free_netdev(dev); > > > - pci_release_regions(pdev); > > > } else > > > printk(KERN_ERR "fealnx: remove for unknown device\n"); > > > } > > > -- > > > 2.25.1 > > > > > .