[v1] intel_th: Fix dma_map_sg error check

[PATCH] intel_th: Fix dma_map_sg error check

Posted by Jack Wang 3 years, 7 months ago

dma_map_sg return 0 on error.

Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: linux-kernel@vger.kernel.org
Fixes: 4e0eaf239fb3 ("intel_th: msu: Fix single mode with IOMMU")
Signed-off-by: Jack Wang <jinpu.wang@ionos.com>
---
 drivers/hwtracing/intel_th/msu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/hwtracing/intel_th/msu.c b/drivers/hwtracing/intel_th/msu.c
index 6c8215a47a60..b49237d56a60 100644
--- a/drivers/hwtracing/intel_th/msu.c
+++ b/drivers/hwtracing/intel_th/msu.c
@@ -931,7 +931,7 @@ static int msc_buffer_contig_alloc(struct msc *msc, unsigned long size)
 
 	ret = dma_map_sg(msc_dev(msc)->parent->parent, msc->single_sgt.sgl, 1,
 			 DMA_FROM_DEVICE);
-	if (ret < 0)
+	if (!ret)
 		goto err_free_pages;
 
 	msc->nr_pages = nr_pages;
-- 
2.34.1

Re: [PATCH] intel_th: Fix dma_map_sg error check

Posted by Christophe JAILLET 3 years, 7 months ago

Le 26/08/2022 à 12:15, Jack Wang a écrit :
> dma_map_sg return 0 on error.
> 
> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
> Cc: linux-kernel@vger.kernel.org
> Fixes: 4e0eaf239fb3 ("intel_th: msu: Fix single mode with IOMMU")
> Signed-off-by: Jack Wang <jinpu.wang@ionos.com>
> ---
>   drivers/hwtracing/intel_th/msu.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/hwtracing/intel_th/msu.c b/drivers/hwtracing/intel_th/msu.c
> index 6c8215a47a60..b49237d56a60 100644
> --- a/drivers/hwtracing/intel_th/msu.c
> +++ b/drivers/hwtracing/intel_th/msu.c
> @@ -931,7 +931,7 @@ static int msc_buffer_contig_alloc(struct msc *msc, unsigned long size)
>   
>   	ret = dma_map_sg(msc_dev(msc)->parent->parent, msc->single_sgt.sgl, 1,
>   			 DMA_FROM_DEVICE);
> -	if (ret < 0)
> +	if (!ret)

Missing ret = -EIO?
like in other patches?

CJ

>   		goto err_free_pages;
>   
>   	msc->nr_pages = nr_pages;

Re: [PATCH] intel_th: Fix dma_map_sg error check

Posted by Jinpu Wang 3 years, 7 months ago

On Fri, Aug 26, 2022 at 12:31 PM Christophe JAILLET
<christophe.jaillet@wanadoo.fr> wrote:
>
> Le 26/08/2022 à 12:15, Jack Wang a écrit :
> > dma_map_sg return 0 on error.
> >
> > Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
> > Cc: linux-kernel@vger.kernel.org
> > Fixes: 4e0eaf239fb3 ("intel_th: msu: Fix single mode with IOMMU")
> > Signed-off-by: Jack Wang <jinpu.wang@ionos.com>
> > ---
> >   drivers/hwtracing/intel_th/msu.c | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/hwtracing/intel_th/msu.c b/drivers/hwtracing/intel_th/msu.c
> > index 6c8215a47a60..b49237d56a60 100644
> > --- a/drivers/hwtracing/intel_th/msu.c
> > +++ b/drivers/hwtracing/intel_th/msu.c
> > @@ -931,7 +931,7 @@ static int msc_buffer_contig_alloc(struct msc *msc, unsigned long size)
> >
> >       ret = dma_map_sg(msc_dev(msc)->parent->parent, msc->single_sgt.sgl, 1,
> >                        DMA_FROM_DEVICE);
> > -     if (ret < 0)
> > +     if (!ret)
>
> Missing ret = -EIO?
> like in other patches?
oh, right, thx for catching it.
sent v2 patch.
>
> CJ
>
> >               goto err_free_pages;
> >
> >       msc->nr_pages = nr_pages;
>