2012-10-25 23:29:13

by Shuah Khan

[permalink] [raw]
Subject: [PATCH RFT] microblaze: dma-mapping: support debug_dma_mapping_error

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/microblaze/include/asm/dma-mapping.h | 1 +
1 file changed, 1 insertion(+)

diff --git a/arch/microblaze/include/asm/dma-mapping.h b/arch/microblaze/include/asm/dma-mapping.h
index 01d2282..4451c7a 100644
--- a/arch/microblaze/include/asm/dma-mapping.h
+++ b/arch/microblaze/include/asm/dma-mapping.h
@@ -114,6 +114,7 @@ static inline void __dma_sync(unsigned long paddr,
static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
{
struct dma_map_ops *ops = get_dma_ops(dev);
+ debug_dma_mapping_error(dev, dma_addr);
if (ops->mapping_error)
return ops->mapping_error(dev, dma_addr);

--
1.7.9.5



2012-10-26 08:29:15

by Michal Simek

[permalink] [raw]
Subject: Re: [PATCH RFT] microblaze: dma-mapping: support debug_dma_mapping_error

On 10/26/2012 01:29 AM, 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/microblaze/include/asm/dma-mapping.h | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/microblaze/include/asm/dma-mapping.h b/arch/microblaze/include/asm/dma-mapping.h
> index 01d2282..4451c7a 100644
> --- a/arch/microblaze/include/asm/dma-mapping.h
> +++ b/arch/microblaze/include/asm/dma-mapping.h
> @@ -114,6 +114,7 @@ static inline void __dma_sync(unsigned long paddr,
> static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
> {
> struct dma_map_ops *ops = get_dma_ops(dev);

here should be empty line.

> + debug_dma_mapping_error(dev, dma_addr);
> if (ops->mapping_error)
> return ops->mapping_error(dev, dma_addr);

Patch looks good to me. I was greping the latest mainline tree and I can't see
reference to debug_dma_mapping_error. Can you tell me where this function
is implemented.
I have also seen that you have sent several similar patches like this.

If you want to add it through any other tree here is my ACK:

Acked-by: Michal Simek <[email protected]>

I will definitely keep my eyes on it.

Thanks,
Michal

--
Michal Simek, Ing. (M.Eng)
w: http://www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
Microblaze U-BOOT custodian

2012-10-26 14:58:57

by Shuah Khan

[permalink] [raw]
Subject: Re: [PATCH RFT] microblaze: dma-mapping: support debug_dma_mapping_error

On Fri, 2012-10-26 at 10:29 +0200, Michal Simek wrote:
> On 10/26/2012 01:29 AM, 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/microblaze/include/asm/dma-mapping.h | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/arch/microblaze/include/asm/dma-mapping.h b/arch/microblaze/include/asm/dma-mapping.h
> > index 01d2282..4451c7a 100644
> > --- a/arch/microblaze/include/asm/dma-mapping.h
> > +++ b/arch/microblaze/include/asm/dma-mapping.h
> > @@ -114,6 +114,7 @@ static inline void __dma_sync(unsigned long paddr,
> > static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
> > {
> > struct dma_map_ops *ops = get_dma_ops(dev);
>
> here should be empty line.
>
> > + debug_dma_mapping_error(dev, dma_addr);
> > if (ops->mapping_error)
> > return ops->mapping_error(dev, dma_addr);
>
> Patch looks good to me. I was greping the latest mainline tree and I can't see
> reference to debug_dma_mapping_error. Can you tell me where this function
> is implemented.
> I have also seen that you have sent several similar patches like this.
>
> If you want to add it through any other tree here is my ACK:
>
> Acked-by: Michal Simek <[email protected]>
>
> I will definitely keep my eyes on it.

debug_dma_mapping_error() patch is in linux-next. I probably should send
all of these patches marked explicitly for linux-next.

Thanks,
-- Shuah

2012-10-26 15:53:40

by Shuah Khan

[permalink] [raw]
Subject: [PATCH v2 linux-next] microblaze: dma-mapping: support debug_dma_mapping_error

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]>
Acked-by: Michal Simek <[email protected]>
---
arch/microblaze/include/asm/dma-mapping.h | 2 ++
1 file changed, 2 insertions(+)

diff --git a/arch/microblaze/include/asm/dma-mapping.h b/arch/microblaze/include/asm/dma-mapping.h
index 01d2282..46460f1 100644
--- a/arch/microblaze/include/asm/dma-mapping.h
+++ b/arch/microblaze/include/asm/dma-mapping.h
@@ -114,6 +114,8 @@ static inline void __dma_sync(unsigned long paddr,
static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
{
struct dma_map_ops *ops = get_dma_ops(dev);
+
+ debug_dma_mapping_error(dev, dma_addr);
if (ops->mapping_error)
return ops->mapping_error(dev, dma_addr);

--
1.7.9.5


2012-10-26 15:57:33

by Michal Simek

[permalink] [raw]
Subject: Re: [PATCH RFT] microblaze: dma-mapping: support debug_dma_mapping_error

On 10/26/2012 04:58 PM, Shuah Khan wrote:
> On Fri, 2012-10-26 at 10:29 +0200, Michal Simek wrote:
>> On 10/26/2012 01:29 AM, 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/microblaze/include/asm/dma-mapping.h | 1 +
>>> 1 file changed, 1 insertion(+)
>>>
>>> diff --git a/arch/microblaze/include/asm/dma-mapping.h b/arch/microblaze/include/asm/dma-mapping.h
>>> index 01d2282..4451c7a 100644
>>> --- a/arch/microblaze/include/asm/dma-mapping.h
>>> +++ b/arch/microblaze/include/asm/dma-mapping.h
>>> @@ -114,6 +114,7 @@ static inline void __dma_sync(unsigned long paddr,
>>> static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
>>> {
>>> struct dma_map_ops *ops = get_dma_ops(dev);
>>
>> here should be empty line.
>>
>>> + debug_dma_mapping_error(dev, dma_addr);
>>> if (ops->mapping_error)
>>> return ops->mapping_error(dev, dma_addr);
>>
>> Patch looks good to me. I was greping the latest mainline tree and I can't see
>> reference to debug_dma_mapping_error. Can you tell me where this function
>> is implemented.
>> I have also seen that you have sent several similar patches like this.
>>
>> If you want to add it through any other tree here is my ACK:
>>
>> Acked-by: Michal Simek <[email protected]>
>>
>> I will definitely keep my eyes on it.
>
> debug_dma_mapping_error() patch is in linux-next. I probably should send
> all of these patches marked explicitly for linux-next.

Ok. It means that this patch should be added to the tree which contains this
patch. You can find it out through linux-next.

What it is interesting to me is that arm tree has it there but implementation
is missing in Linus tree.

[linux-2.6.x]$ grep -rn "debug_dma_mapping_erro" arch/
arch/arm/include/asm/dma-mapping.h:94: debug_dma_mapping_error(dev, dma_addr);

Thanks,
Michal


--
Michal Simek, Ing. (M.Eng)
w: http://www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
Microblaze U-BOOT custodian

2012-11-15 17:34:57

by Shuah Khan

[permalink] [raw]
Subject: Re: [PATCH v2 linux-next] microblaze: dma-mapping: support debug_dma_mapping_error

On Fri, 2012-10-26 at 09:53 -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]>
> Acked-by: Michal Simek <[email protected]>

Marek,

This is for microblaze to go through your tree.

Thanks,
-- Shuah
> ---
> arch/microblaze/include/asm/dma-mapping.h | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/arch/microblaze/include/asm/dma-mapping.h b/arch/microblaze/include/asm/dma-mapping.h
> index 01d2282..46460f1 100644
> --- a/arch/microblaze/include/asm/dma-mapping.h
> +++ b/arch/microblaze/include/asm/dma-mapping.h
> @@ -114,6 +114,8 @@ static inline void __dma_sync(unsigned long paddr,
> static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
> {
> struct dma_map_ops *ops = get_dma_ops(dev);
> +
> + debug_dma_mapping_error(dev, dma_addr);
> if (ops->mapping_error)
> return ops->mapping_error(dev, dma_addr);
>