LKML Archive on lore.kernel.org
 help / color / Atom feed
From: Robin Gong <yibin.gong@nxp.com>
To: Daniel Baluta <daniel.baluta@nxp.com>,
	"vkoul@kernel.org" <vkoul@kernel.org>,
	"dmaengine@vger.kernel.org" <dmaengine@vger.kernel.org>
Cc: dl-linux-imx <linux-imx@nxp.com>,
	"kernel@pengutronix.de" <kernel@pengutronix.de>,
	"dan.j.williams@intel.com" <dan.j.williams@intel.com>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	"S.j. Wang" <shengjiu.wang@nxp.com>,
	Andy Duan <fugang.duan@nxp.com>
Subject: RE: [PATCH] dma: imx-sdma: pass ->dev to dma_alloc_coherent() API
Date: Fri, 18 Jan 2019 07:41:49 +0000
Message-ID: <VI1PR04MB45432C704ED13C4A3004EE9E899C0@VI1PR04MB4543.eurprd04.prod.outlook.com> (raw)
In-Reply-To: <20190111142930.21193-1-daniel.baluta@nxp.com>

Reviewed-by: Robin Gong <yibin.gong@nxp.com>
> -----Original Message-----
> From: Daniel Baluta
> Sent: 2019Äê1ÔÂ11ÈÕ 22:30
> To: vkoul@kernel.org; dmaengine@vger.kernel.org
> Cc: dl-linux-imx <linux-imx@nxp.com>; kernel@pengutronix.de;
> dan.j.williams@intel.com; linux-kernel@vger.kernel.org; S.j. Wang
> <shengjiu.wang@nxp.com>; Andy Duan <fugang.duan@nxp.com>; Robin Gong
> <yibin.gong@nxp.com>; Daniel Baluta <daniel.baluta@nxp.com>
> Subject: [PATCH] dma: imx-sdma: pass ->dev to dma_alloc_coherent() API
> 
> From: Andy Duan <fugang.duan@nxp.com>
> 
> Pass ->dev to dma_alloc_coherent() API. We need this becase
> dma_alloc_coherent() makes use of dev parameter and receiving NULL will
> result in a crash.
> 
> Signed-off-by: Andy Duan <fugang.duan@nxp.com>
> Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
> ---
>  drivers/dma/imx-sdma.c | 15 ++++++++-------
>  1 file changed, 8 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index
> a2b0a0e71168..26133b78ced8 100644
> --- a/drivers/dma/imx-sdma.c
> +++ b/drivers/dma/imx-sdma.c
> @@ -677,7 +677,7 @@ static int sdma_load_script(struct sdma_engine
> *sdma, void *buf, int size,
>  	int ret;
>  	unsigned long flags;
> 
> -	buf_virt = dma_alloc_coherent(NULL, size, &buf_phys, GFP_KERNEL);
> +	buf_virt = dma_alloc_coherent(sdma->dev, size, &buf_phys,
> GFP_KERNEL);
>  	if (!buf_virt) {
>  		return -ENOMEM;
>  	}
> @@ -696,7 +696,7 @@ static int sdma_load_script(struct sdma_engine
> *sdma, void *buf, int size,
> 
>  	spin_unlock_irqrestore(&sdma->channel_0_lock, flags);
> 
> -	dma_free_coherent(NULL, size, buf_virt, buf_phys);
> +	dma_free_coherent(sdma->dev, size, buf_virt, buf_phys);
> 
>  	return ret;
>  }
> @@ -1182,7 +1182,7 @@ static int sdma_request_channel0(struct
> sdma_engine *sdma)  {
>  	int ret = -EBUSY;
> 
> -	sdma->bd0 = dma_zalloc_coherent(NULL, PAGE_SIZE, &sdma->bd0_phys,
> +	sdma->bd0 = dma_zalloc_coherent(sdma->dev, PAGE_SIZE,
> &sdma->bd0_phys,
>  					GFP_NOWAIT);
>  	if (!sdma->bd0) {
>  		ret = -ENOMEM;
> @@ -1205,8 +1205,8 @@ static int sdma_alloc_bd(struct sdma_desc *desc)
>  	u32 bd_size = desc->num_bd * sizeof(struct sdma_buffer_descriptor);
>  	int ret = 0;
> 
> -	desc->bd = dma_zalloc_coherent(NULL, bd_size, &desc->bd_phys,
> -					GFP_NOWAIT);
> +	desc->bd = dma_zalloc_coherent(desc->sdmac->sdma->dev, bd_size,
> +				       &desc->bd_phys, GFP_NOWAIT);
>  	if (!desc->bd) {
>  		ret = -ENOMEM;
>  		goto out;
> @@ -1219,7 +1219,8 @@ static void sdma_free_bd(struct sdma_desc *desc)
> {
>  	u32 bd_size = desc->num_bd * sizeof(struct sdma_buffer_descriptor);
> 
> -	dma_free_coherent(NULL, bd_size, desc->bd, desc->bd_phys);
> +	dma_free_coherent(desc->sdmac->sdma->dev, bd_size, desc->bd,
> +			  desc->bd_phys);
>  }
> 
>  static void sdma_desc_free(struct virt_dma_desc *vd) @@ -1842,7 +1843,7
> @@ static int sdma_init(struct sdma_engine *sdma)
>  	/* Be sure SDMA has not started yet */
>  	writel_relaxed(0, sdma->regs + SDMA_H_C0PTR);
> 
> -	sdma->channel_control = dma_alloc_coherent(NULL,
> +	sdma->channel_control = dma_alloc_coherent(sdma->dev,
>  			MAX_DMA_CHANNELS * sizeof (struct sdma_channel_control) +
>  			sizeof(struct sdma_context_data),
>  			&ccb_phys, GFP_KERNEL);
> --
> 2.17.1


  reply index

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-11 14:29 Daniel Baluta
2019-01-18  7:41 ` Robin Gong [this message]
2019-01-20 10:56 ` Vinod Koul

Reply instructions:

You may reply publically 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=VI1PR04MB45432C704ED13C4A3004EE9E899C0@VI1PR04MB4543.eurprd04.prod.outlook.com \
    --to=yibin.gong@nxp.com \
    --cc=dan.j.williams@intel.com \
    --cc=daniel.baluta@nxp.com \
    --cc=dmaengine@vger.kernel.org \
    --cc=fugang.duan@nxp.com \
    --cc=kernel@pengutronix.de \
    --cc=linux-imx@nxp.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=shengjiu.wang@nxp.com \
    --cc=vkoul@kernel.org \
    /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

LKML Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/lkml/0 lkml/git/0.git
	git clone --mirror https://lore.kernel.org/lkml/1 lkml/git/1.git
	git clone --mirror https://lore.kernel.org/lkml/2 lkml/git/2.git
	git clone --mirror https://lore.kernel.org/lkml/3 lkml/git/3.git
	git clone --mirror https://lore.kernel.org/lkml/4 lkml/git/4.git
	git clone --mirror https://lore.kernel.org/lkml/5 lkml/git/5.git
	git clone --mirror https://lore.kernel.org/lkml/6 lkml/git/6.git
	git clone --mirror https://lore.kernel.org/lkml/7 lkml/git/7.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 lkml lkml/ https://lore.kernel.org/lkml \
		linux-kernel@vger.kernel.org linux-kernel@archiver.kernel.org
	public-inbox-index lkml


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-kernel


AGPL code for this site: git clone https://public-inbox.org/ public-inbox