netdev - Re: [PATCH v4 5/7] ethernet: cavium: 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: <fb3d77e09dd10995616eed5a490ab9339b3350e4.camel@redhat.com>
Date: Wed, 28 Aug 2024 08:56:58 +0200
From: Philipp Stanner <pstanner@...hat.com>
To: ens Axboe <axboe@...nel.dk>, Wu Hao <hao.wu@...el.com>, Tom Rix
 <trix@...hat.com>, Moritz Fischer <mdf@...nel.org>, Xu Yilun
 <yilun.xu@...el.com>,  Andy Shevchenko <andy@...nel.org>, Linus Walleij
 <linus.walleij@...aro.org>, Bartosz Golaszewski <brgl@...ev.pl>, "David S.
 Miller" <davem@...emloft.net>, Eric Dumazet <edumazet@...gle.com>,  Jakub
 Kicinski <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>, Bjorn Helgaas
 <bhelgaas@...gle.com>, Alvaro Karsz <alvaro.karsz@...id-run.com>, "Michael
 S. Tsirkin" <mst@...hat.com>, Jason Wang <jasowang@...hat.com>, Xuan Zhuo
 <xuanzhuo@...ux.alibaba.com>,  Eugenio Pérez
 <eperezma@...hat.com>, Richard Cochran <richardcochran@...il.com>, Damien
 Le Moal <dlemoal@...nel.org>, Hannes Reinecke <hare@...e.de>, Keith Busch
 <kbusch@...nel.org>
Cc: linux-block@...r.kernel.org, linux-kernel@...r.kernel.org, 
 linux-fpga@...r.kernel.org, linux-gpio@...r.kernel.org,
 netdev@...r.kernel.org,  linux-pci@...r.kernel.org,
 virtualization@...ts.linux.dev
Subject: Re: [PATCH v4 5/7] ethernet: cavium: Replace deprecated PCI
 functions

On Tue, 2024-08-27 at 20:56 +0200, Philipp Stanner wrote:
> pcim_iomap_regions() and pcim_iomap_table() have been deprecated by
> the PCI subsystem in commit e354bb84a4c1 ("PCI: Deprecate
> pcim_iomap_table(), pcim_iomap_regions_request_all()").
> 
> Furthermore, the driver contains an unneeded call to
> pcim_iounmap_regions() in its probe() function's error unwind path.
> 
> Replace the deprecated PCI functions with pcim_iomap_region().
> 
> Remove the unnecessary call to pcim_iounmap_regions().
> 
> Signed-off-by: Philipp Stanner <pstanner@...hat.com>
> ---
>  drivers/net/ethernet/cavium/common/cavium_ptp.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/net/ethernet/cavium/common/cavium_ptp.c
> b/drivers/net/ethernet/cavium/common/cavium_ptp.c
> index 9fd717b9cf69..914ccc8eaf5e 100644
> --- a/drivers/net/ethernet/cavium/common/cavium_ptp.c
> +++ b/drivers/net/ethernet/cavium/common/cavium_ptp.c
> @@ -239,12 +239,11 @@ static int cavium_ptp_probe(struct pci_dev
> *pdev,
>  	if (err)
>  		goto error_free;
>  
> -	err = pcim_iomap_regions(pdev, 1 << PCI_PTP_BAR_NO,
> pci_name(pdev));
> +	clock->reg_base = pcim_iomap_region(pdev, PCI_PTP_BAR_NO,
> pci_name(pdev));
> +	err = PTR_ERR_OR_ZERO(clock->reg_base);
>  	if (err)
>  		goto error_free;
>  
> -	clock->reg_base = pcim_iomap_table(pdev)[PCI_PTP_BAR_NO];
> -
>  	spin_lock_init(&clock->spin_lock);
>  
>  	cc = &clock->cycle_counter;
> @@ -292,7 +291,6 @@ static int cavium_ptp_probe(struct pci_dev *pdev,
>  	clock_cfg = readq(clock->reg_base + PTP_CLOCK_CFG);
>  	clock_cfg &= ~PTP_CLOCK_CFG_PTP_EN;
>  	writeq(clock_cfg, clock->reg_base + PTP_CLOCK_CFG);
> -	pcim_iounmap_regions(pdev, 1 << PCI_PTP_BAR_NO);

I think I removed that by accident – thinking about it, we should not
remove it since the driver later returns 0 from its probe(). So we
should not keep blocking the region.

Has to be addressed in v5.

P.

>  
>  error_free:
>  	devm_kfree(dev, clock);