2022-08-26 10:39:13

by Jinpu Wang

Subject: [PATCH] intel_th: Fix dma_map_sg error check

dma_map_sg return 0 on error.

Cc: Alexander Shishkin <[email protected]>
Cc: [email protected]
Fixes: 4e0eaf239fb3 ("intel_th: msu: Fix single mode with IOMMU")
Signed-off-by: Jack Wang <[email protected]>
---
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

2022-08-26 10:48:20

by Christophe JAILLET

Subject: Re: [PATCH] intel_th: Fix dma_map_sg error check

Le 26/08/2022 à 12:15, Jack Wang a écrit :
> dma_map_sg return 0 on error.
>
> Cc: Alexander Shishkin <[email protected]>
> Cc: [email protected]
> Fixes: 4e0eaf239fb3 ("intel_th: msu: Fix single mode with IOMMU")
> Signed-off-by: Jack Wang <[email protected]>
> ---
> 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;

2022-08-26 11:01:27

by Jinpu Wang

Subject: Re: [PATCH] intel_th: Fix dma_map_sg error check

On Fri, Aug 26, 2022 at 12:31 PM Christophe JAILLET
<[email protected]> wrote:
>
> Le 26/08/2022 à 12:15, Jack Wang a écrit :
> > dma_map_sg return 0 on error.
> >
> > Cc: Alexander Shishkin <[email protected]>
> > Cc: [email protected]
> > Fixes: 4e0eaf239fb3 ("intel_th: msu: Fix single mode with IOMMU")
> > Signed-off-by: Jack Wang <[email protected]>
> > ---
> > 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;
>