Add support for debug_dma_mapping_error() call to avoid warning from
debug_dma_unmap() interface when it checks for mapping error checked
status. Without this patch, device driver failed to check map error
warning is generated.
Signed-off-by: Shuah Khan <[email protected]>
---
arch/alpha/include/asm/dma-mapping.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/alpha/include/asm/dma-mapping.h b/arch/alpha/include/asm/dma-mapping.h
index dfa32f0..b4d483b 100644
--- a/arch/alpha/include/asm/dma-mapping.h
+++ b/arch/alpha/include/asm/dma-mapping.h
@@ -32,6 +32,7 @@ static inline void dma_free_attrs(struct device *dev, size_t size,
static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
{
+ debug_dma_mapping_error(dev, dma_addr);
return get_dma_ops(dev)->mapping_error(dev, dma_addr);
}
--
1.7.9.5
On Fri, 2012-10-26 at 10:32 -0600, Shuah Khan wrote:
> Add support for debug_dma_mapping_error() call to avoid warning from
> debug_dma_unmap() interface when it checks for mapping error checked
> status. Without this patch, device driver failed to check map error
> warning is generated.
>
> Signed-off-by: Shuah Khan <[email protected]>
> ---
> arch/alpha/include/asm/dma-mapping.h | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/alpha/include/asm/dma-mapping.h b/arch/alpha/include/asm/dma-mapping.h
> index dfa32f0..b4d483b 100644
> --- a/arch/alpha/include/asm/dma-mapping.h
> +++ b/arch/alpha/include/asm/dma-mapping.h
> @@ -32,6 +32,7 @@ static inline void dma_free_attrs(struct device *dev, size_t size,
>
> static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
> {
> + debug_dma_mapping_error(dev, dma_addr);
> return get_dma_ops(dev)->mapping_error(dev, dma_addr);
> }
>
Marek,
This is for alpha to go through your tree.
-- Shuah
On Thu, Nov 15, 2012 at 10:49:28AM -0700, Shuah Khan wrote:
> On Fri, 2012-10-26 at 10:32 -0600, Shuah Khan wrote:
> > Add support for debug_dma_mapping_error() call to avoid warning from
> > debug_dma_unmap() interface when it checks for mapping error checked
> > status. Without this patch, device driver failed to check map error
> > warning is generated.
> >
> > Signed-off-by: Shuah Khan <[email protected]>
> > ---
> > arch/alpha/include/asm/dma-mapping.h | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/arch/alpha/include/asm/dma-mapping.h b/arch/alpha/include/asm/dma-mapping.h
> > index dfa32f0..b4d483b 100644
> > --- a/arch/alpha/include/asm/dma-mapping.h
> > +++ b/arch/alpha/include/asm/dma-mapping.h
> > @@ -32,6 +32,7 @@ static inline void dma_free_attrs(struct device *dev, size_t size,
> >
> > static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
> > {
> > + debug_dma_mapping_error(dev, dma_addr);
> > return get_dma_ops(dev)->mapping_error(dev, dma_addr);
> > }
> >
>
> Marek,
>
> This is for alpha to go through your tree.
Given that this does not appear to be upstream yet I'll take it through
the Alpha tree.
Cheers
Michael.
Hello,
On 3/27/2013 7:59 AM, Michael Cree wrote:
> On Thu, Nov 15, 2012 at 10:49:28AM -0700, Shuah Khan wrote:
> > On Fri, 2012-10-26 at 10:32 -0600, Shuah Khan wrote:
> > > Add support for debug_dma_mapping_error() call to avoid warning from
> > > debug_dma_unmap() interface when it checks for mapping error checked
> > > status. Without this patch, device driver failed to check map error
> > > warning is generated.
> > >
> > > Signed-off-by: Shuah Khan <[email protected]>
> > > ---
> > > arch/alpha/include/asm/dma-mapping.h | 1 +
> > > 1 file changed, 1 insertion(+)
> > >
> > > diff --git a/arch/alpha/include/asm/dma-mapping.h b/arch/alpha/include/asm/dma-mapping.h
> > > index dfa32f0..b4d483b 100644
> > > --- a/arch/alpha/include/asm/dma-mapping.h
> > > +++ b/arch/alpha/include/asm/dma-mapping.h
> > > @@ -32,6 +32,7 @@ static inline void dma_free_attrs(struct device *dev, size_t size,
> > >
> > > static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
> > > {
> > > + debug_dma_mapping_error(dev, dma_addr);
> > > return get_dma_ops(dev)->mapping_error(dev, dma_addr);
> > > }
> > >
> >
> > Marek,
> >
> > This is for alpha to go through your tree.
>
> Given that this does not appear to be upstream yet I'll take it through
> the Alpha tree.
Those patches in the end went via IOMMU tree. I looks that the patch for
Alpha has
been missed. It looks that this patch should be merged to v3.9-rcX asap
to fix the
broken dma-mapping api calls.
Best regards
--
Marek Szyprowski
Samsung Poland R&D Center
On Wed, 2013-03-27 at 16:45 +0100, Marek Szyprowski wrote:
> Hello,
>
> On 3/27/2013 7:59 AM, Michael Cree wrote:
> > On Thu, Nov 15, 2012 at 10:49:28AM -0700, Shuah Khan wrote:
> > > On Fri, 2012-10-26 at 10:32 -0600, Shuah Khan wrote:
> > > > Add support for debug_dma_mapping_error() call to avoid warning from
> > > > debug_dma_unmap() interface when it checks for mapping error checked
> > > > status. Without this patch, device driver failed to check map error
> > > > warning is generated.
> > > >
> > > > Signed-off-by: Shuah Khan <[email protected]>
> > > > ---
> > > > arch/alpha/include/asm/dma-mapping.h | 1 +
> > > > 1 file changed, 1 insertion(+)
> > > >
> > > > diff --git a/arch/alpha/include/asm/dma-mapping.h b/arch/alpha/include/asm/dma-mapping.h
> > > > index dfa32f0..b4d483b 100644
> > > > --- a/arch/alpha/include/asm/dma-mapping.h
> > > > +++ b/arch/alpha/include/asm/dma-mapping.h
> > > > @@ -32,6 +32,7 @@ static inline void dma_free_attrs(struct device *dev, size_t size,
> > > >
> > > > static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
> > > > {
> > > > + debug_dma_mapping_error(dev, dma_addr);
> > > > return get_dma_ops(dev)->mapping_error(dev, dma_addr);
> > > > }
> > > >
> > >
> > > Marek,
> > >
> > > This is for alpha to go through your tree.
> >
> > Given that this does not appear to be upstream yet I'll take it through
> > the Alpha tree.
>
> Those patches in the end went via IOMMU tree. I looks that the patch for
> Alpha has
> been missed. It looks that this patch should be merged to v3.9-rcX asap
> to fix the
> broken dma-mapping api calls.
>
The reason it didn't get pulled into iommu tree was that alpha Kconfig
doesn't support HAVE_DMA_API_DEBUG and DMA_API_DEBUG. I don't see it in
arch/alpha/Kconfig. That said, this patch is needed on alpha, if these
two config options get enabled. I will leave it up to the alpha
maintainers to decide if this patch is needed or not.
thanks,
-- Shuah