linux-kernel - Re: [PATCH] x86/PCI: sta2x11: switch from 'pci_' to 'dma

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] [day] [month] [year] [list]

Message-ID: <20210902164011.GA340793@bjorn-Precision-5520>
Date:   Thu, 2 Sep 2021 11:40:11 -0500
From:   Bjorn Helgaas <helgaas@...nel.org>
To:     Christophe JAILLET <christophe.jaillet@...adoo.fr>
Cc:     bhelgaas@...gle.com, tglx@...utronix.de, mingo@...hat.com,
        bp@...en8.de, x86@...nel.org, hpa@...or.com,
        linux-pci@...r.kernel.org, linux-kernel@...r.kernel.org,
        kernel-janitors@...r.kernel.org, Christoph Hellwig <hch@....de>
Subject: Re: [PATCH] x86/PCI: sta2x11: switch from 'pci_' to 'dma_' API

[+cc Christoph]

On Sun, Aug 22, 2021 at 08:49:20PM +0200, Christophe JAILLET wrote:
> The wrappers in include/linux/pci-dma-compat.h should go away.
> ...

> Signed-off-by: Christophe JAILLET <christophe.jaillet@...adoo.fr>

Applied to pci/misc for v5.15, thanks!

> ---
> If needed, see post from Christoph Hellwig on the kernel-janitors ML:
>    https://marc.info/?l=kernel-janitors&m=158745678307186&w=4
> ---
>  arch/x86/pci/sta2x11-fixup.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/arch/x86/pci/sta2x11-fixup.c b/arch/x86/pci/sta2x11-fixup.c
> index 7d2525691854..101081ad64b6 100644
> --- a/arch/x86/pci/sta2x11-fixup.c
> +++ b/arch/x86/pci/sta2x11-fixup.c
> @@ -146,8 +146,7 @@ static void sta2x11_map_ep(struct pci_dev *pdev)
>  		dev_err(dev, "sta2x11: could not set DMA offset\n");
>  
>  	dev->bus_dma_limit = max_amba_addr;
> -	pci_set_consistent_dma_mask(pdev, max_amba_addr);
> -	pci_set_dma_mask(pdev, max_amba_addr);
> +	dma_set_mask_and_coherent(&pdev->dev, max_amba_addr);
>  
>  	/* Configure AHB mapping */
>  	pci_write_config_dword(pdev, AHB_PEXLBASE(0), 0);
> -- 
> 2.30.2
>