linux-kernel - Re: [PATCH 06/10] wifi: iwlwifi: replace deprecated PCI functions

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <ea7b805a-6c8e-8060-1c6b-4d62c69f78ae@linux.intel.com>
Date: Fri, 25 Oct 2024 18:31:21 +0300 (EEST)
From: Ilpo Järvinen <ilpo.jarvinen@...ux.intel.com>
To: Philipp Stanner <pstanner@...hat.com>
cc: Jonathan Corbet <corbet@....net>, Damien Le Moal <dlemoal@...nel.org>, 
    Niklas Cassel <cassel@...nel.org>, 
    Giovanni Cabiddu <giovanni.cabiddu@...el.com>, 
    Herbert Xu <herbert@...dor.apana.org.au>, 
    "David S. Miller" <davem@...emloft.net>, 
    Boris Brezillon <bbrezillon@...nel.org>, 
    Arnaud Ebalard <arno@...isbad.org>, Srujana Challa <schalla@...vell.com>, 
    Alexander Shishkin <alexander.shishkin@...ux.intel.com>, 
    Miri Korenblit <miriam.rachel.korenblit@...el.com>, 
    Kalle Valo <kvalo@...nel.org>, Serge Semin <fancer.lancer@...il.com>, 
    Jon Mason <jdmason@...zu.us>, Dave Jiang <dave.jiang@...el.com>, 
    Allen Hubbe <allenbh@...il.com>, Bjorn Helgaas <bhelgaas@...gle.com>, 
    Kevin Cernekee <cernekee@...il.com>, 
    Greg Kroah-Hartman <gregkh@...uxfoundation.org>, 
    Jiri Slaby <jirislaby@...nel.org>, Jaroslav Kysela <perex@...ex.cz>, 
    Takashi Iwai <tiwai@...e.com>, Mark Brown <broonie@...nel.org>, 
    David Lechner <dlechner@...libre.com>, 
    Uwe Kleine-König <u.kleine-koenig@...gutronix.de>, 
    Jie Wang <jie.wang@...el.com>, Tero Kristo <tero.kristo@...ux.intel.com>, 
    Adam Guerin <adam.guerin@...el.com>, 
    Shashank Gupta <shashank.gupta@...el.com>, 
    Przemek Kitszel <przemyslaw.kitszel@...el.com>, 
    Bharat Bhushan <bbhushan2@...vell.com>, 
    Nithin Dabilpuram <ndabilpuram@...vell.com>, 
    Johannes Berg <johannes.berg@...el.com>, 
    Emmanuel Grumbach <emmanuel.grumbach@...el.com>, 
    Gregory Greenman <gregory.greenman@...el.com>, 
    Benjamin Berg <benjamin.berg@...el.com>, 
    Yedidya Benshimol <yedidya.ben.shimol@...el.com>, 
    Breno Leitao <leitao@...ian.org>, 
    Florian Fainelli <florian.fainelli@...adcom.com>, 
    linux-doc@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>, 
    linux-ide@...r.kernel.org, qat-linux@...el.com, 
    linux-crypto@...r.kernel.org, linux-wireless@...r.kernel.org, 
    ntb@...ts.linux.dev, linux-pci@...r.kernel.org, 
    linux-serial <linux-serial@...r.kernel.org>, linux-sound@...r.kernel.org
Subject: Re: [PATCH 06/10] wifi: iwlwifi: replace deprecated PCI functions

On Fri, 25 Oct 2024, Philipp Stanner wrote:

> pcim_iomap_table() and pcim_iomap_regions_request_all() have been
> deprecated by the PCI subsystem in commit e354bb84a4c1 ("PCI: Deprecate
> pcim_iomap_table(), pcim_iomap_regions_request_all()").
> 
> Replace these functions with their successors, pcim_iomap() and
> pcim_request_all_regions().
> 
> Signed-off-by: Philipp Stanner <pstanner@...hat.com>
> Acked-by: Kalle Valo <kvalo@...nel.org>
> ---
>  drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 16 ++++------------
>  1 file changed, 4 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
> index 3b9943eb6934..4b41613ad89d 100644
> --- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
> +++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
> @@ -3533,7 +3533,6 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
>  	struct iwl_trans_pcie *trans_pcie, **priv;
>  	struct iwl_trans *trans;
>  	int ret, addr_size;
> -	void __iomem * const *table;
>  	u32 bar0;
>  
>  	/* reassign our BAR 0 if invalid due to possible runtime PM races */
> @@ -3659,22 +3658,15 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
>  		}
>  	}
>  
> -	ret = pcim_iomap_regions_request_all(pdev, BIT(0), DRV_NAME);
> +	ret = pcim_request_all_regions(pdev, DRV_NAME);
>  	if (ret) {
> -		dev_err(&pdev->dev, "pcim_iomap_regions_request_all failed\n");
> +		dev_err(&pdev->dev, "pcim_request_all_regions failed\n");
>  		goto out_no_pci;
>  	}
>  
> -	table = pcim_iomap_table(pdev);
> -	if (!table) {
> -		dev_err(&pdev->dev, "pcim_iomap_table failed\n");
> -		ret = -ENOMEM;
> -		goto out_no_pci;
> -	}
> -
> -	trans_pcie->hw_base = table[0];
> +	trans_pcie->hw_base = pcim_iomap(pdev, 0, 0);
>  	if (!trans_pcie->hw_base) {
> -		dev_err(&pdev->dev, "couldn't find IO mem in first BAR\n");
> +		dev_err(&pdev->dev, "pcim_iomap failed\n");

This seems a step backwards as a human readable English error message was 
replaced with a reference to a function name.

-- 
 i.

>  		ret = -ENODEV;
>  		goto out_no_pci;
>  	}
>