mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
To: Qing Wang <wangqing@vivo.com>,
	Gustavo Pimentel <gustavo.pimentel@synopsys.com>,
	Vinod Koul <vkoul@kernel.org>,
	dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org,
	Kernel Janitors <kernel-janitors@vger.kernel.org>
Subject: Re: [PATCH V2] dma: dw-edma-pcie: switch from 'pci_' to 'dma_' API
Date: Tue, 2 Nov 2021 20:05:53 +0100	[thread overview]
Message-ID: <e30467d0-55e0-156c-4eba-2838c22fe030@wanadoo.fr> (raw)
In-Reply-To: <1632800660-108761-1-git-send-email-wangqing@vivo.com>

Hi,


Le 28/09/2021 à 05:44, Qing Wang a écrit :
> From: Wang Qing <wangqing@vivo.com>
> 
> The wrappers in include/linux/pci-dma-compat.h should go away.
> 
> The patch has been generated with the coccinelle script below.
> expression e1, e2;
> @@
> -    pci_set_dma_mask(e1, e2)
> +    dma_set_mask(&e1->dev, e2)
> 
> @@
> expression e1, e2;
> @@
> -    pci_set_consistent_dma_mask(e1, e2)
> +    dma_set_coherent_mask(&e1->dev, e2)
> 
> While at it, some 'dma_set_mask()/dma_set_coherent_mask()' have been
> updated to a much less verbose 'dma_set_mask_and_coherent()'.
> 
> Signed-off-by: Wang Qing <wangqing@vivo.com>
> ---
>   drivers/dma/dw-edma/dw-edma-pcie.c | 17 ++++-------------
>   1 file changed, 4 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/dma/dw-edma/dw-edma-pcie.c b/drivers/dma/dw-edma/dw-edma-pcie.c
> index 44f6e09..198f6cd
> --- a/drivers/dma/dw-edma/dw-edma-pcie.c
> +++ b/drivers/dma/dw-edma/dw-edma-pcie.c
> @@ -186,27 +186,18 @@ static int dw_edma_pcie_probe(struct pci_dev *pdev,
>   	pci_set_master(pdev);
>   
>   	/* DMA configuration */
> -	err = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));
> +	err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
>   	if (!err) {
if err = 0, so if no error...

> -		err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
> -		if (err) {
> -			pci_err(pdev, "consistent DMA mask 64 set failed\n");
> -			return err;
> -		}
> +		pci_err(pdev, "DMA mask 64 set failed\n");
> +		return err;
... we log an error, return success but don't perform the last steps of 
the probe.

>   	} else {
>   		pci_err(pdev, "DMA mask 64 set failed\n");
>   
> -		err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
> +		err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
>   		if (err) {
>   			pci_err(pdev, "DMA mask 32 set failed\n");
>   			return err;
>   		}
> -
> -		err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
> -		if (err) {
> -			pci_err(pdev, "consistent DMA mask 32 set failed\n");
> -			return err;
> -		}
>   	}
>   
>   	/* Data structure allocation */
> 

This patch is broken and should be reworked.

It has been applied in ecb8c88bd31c.

CJ

  reply	other threads:[~2021-11-02 19:06 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-28  3:44 Qing Wang
2021-11-02 19:05 ` Christophe JAILLET [this message]
2021-11-09 13:21   ` Dan Carpenter
2021-11-09 13:26     ` Dan Carpenter
2021-11-09 21:11     ` Christophe JAILLET

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=e30467d0-55e0-156c-4eba-2838c22fe030@wanadoo.fr \
    --to=christophe.jaillet@wanadoo.fr \
    --cc=dmaengine@vger.kernel.org \
    --cc=gustavo.pimentel@synopsys.com \
    --cc=kernel-janitors@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=vkoul@kernel.org \
    --cc=wangqing@vivo.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®