diff mbox

[v2] ARM: l2c: Add support for the "arm,shared-override" property

Message ID 1430990831-23825-1-git-send-email-geert+renesas@glider.be (mailing list archive)
State Accepted
Delegated to: Geert Uytterhoeven
Headers show

Commit Message

Geert Uytterhoeven May 7, 2015, 9:27 a.m. UTC
"CoreLink Level 2 Cache Controller L2C-310", p. 2-15, section 2.3.2
Shareable attribute" states:

    "The default behavior of the cache controller with respect to the
     shareable attribute is to transform Normal Memory Non-cacheable
     transactions into:
        - cacheable no allocate for reads
        - write through no write allocate for writes."

Depending on the system architecture, this may cause memory corruption
in the presence of bus mastering devices (e.g. OHCI). To avoid such
corruption, the default behavior can be disabled by setting the Shared
Override bit in the Auxiliary Control register.

Currently the Shared Override bit can be set only using C code:
  - by calling l2x0_init() directly, which is deprecated,
  - by setting/clearing the bit in the machine_desc.l2c_aux_val/mask
    fields, but using values differing from 0/~0 is also deprecated.

Hence add support for an "arm,shared-override" device tree property for
the l2c device node. By specifying this property, affected systems can
indicate that non-cacheable transactions must not be transformed.
Then, it's up to the OS to decide. The current behavior is to set the
"shared attribute override enable" bit, as there may exist kernel linear
mappings and cacheable aliases for the DMA buffers, even if CMA is
enabled.

See also commit 1a8e41cd672f894b ("ARM: 6395/1: VExpress: Set bit 22 in
the PL310 (cache controller) AuxCtlr register"):

    "Clearing bit 22 in the PL310 Auxiliary Control register (shared
     attribute override enable) has the side effect of transforming
     Normal Shared Non-cacheable reads into Cacheable no-allocate reads.

     Coherent DMA buffers in Linux always have a Cacheable alias via the
     kernel linear mapping and the processor can speculatively load
     cache lines into the PL310 controller. With bit 22 cleared,
     Non-cacheable reads would unexpectedly hit such cache lines leading
     to buffer corruption."

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v2:
  - Set the "shared attribute override enable" bit, irrespective of CMA
    being used or not,
  - Drop reference to "r2p0" from the binding doc, as it was not
    correct,
  - Extract from series "[PATCH v3 0/6] ARM: l2c / shmobile: r8a7740 :
    Shared Override".
---
 Documentation/devicetree/bindings/arm/l2cc.txt | 6 ++++++
 arch/arm/mm/cache-l2x0.c                       | 5 +++++
 2 files changed, 11 insertions(+)

Comments

Catalin Marinas May 7, 2015, 4:02 p.m. UTC | #1
On Thu, May 07, 2015 at 11:27:11AM +0200, Geert Uytterhoeven wrote:
> diff --git a/Documentation/devicetree/bindings/arm/l2cc.txt b/Documentation/devicetree/bindings/arm/l2cc.txt
> index 0dbabe9a6b0abb91..2484aed78c86546d 100644
> --- a/Documentation/devicetree/bindings/arm/l2cc.txt
> +++ b/Documentation/devicetree/bindings/arm/l2cc.txt
> @@ -67,6 +67,12 @@ Optional properties:
>    disable if zero.
>  - arm,prefetch-offset : Override prefetch offset value. Valid values are
>    0-7, 15, 23, and 31.
> +- arm,shared-override : The default behavior of the pl310 cache controller with
> +  respect to the shareable attribute is to transform "normal memory
> +  non-cacheable transactions" into "cacheable no allocate" (for reads) or
> +  "write through no write allocate" (for writes).
> +  On systems where this may cause DMA buffer corruption, this property must be
> +  specified to indicate that such transforms are precluded.
>  
>  Example:
>  
> diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
> index e309c8f35af5af61..86d0e7461e5b0b18 100644
> --- a/arch/arm/mm/cache-l2x0.c
> +++ b/arch/arm/mm/cache-l2x0.c
> @@ -1149,6 +1149,11 @@ static void __init l2c310_of_parse(const struct device_node *np,
>  		}
>  	}
>  
> +	if (of_property_read_bool(np, "arm,shared-override")) {
> +		*aux_val |= L2C_AUX_CTRL_SHARED_OVERRIDE;
> +		*aux_mask &= ~L2C_AUX_CTRL_SHARED_OVERRIDE;
> +	}
> +
>  	prefetch = l2x0_saved_regs.prefetch_ctrl;
>  
>  	ret = of_property_read_u32(np, "arm,double-linefill", &val);

It looks fine to me.

Acked-by: Catalin Marinas <catalin.marinas@arm.com>

(even better if a subsequent patch adds this property to all the dts
files containing "arm,pl310" ;))
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Russell King - ARM Linux May 15, 2015, 10:10 a.m. UTC | #2
On Thu, May 07, 2015 at 05:02:57PM +0100, Catalin Marinas wrote:
> On Thu, May 07, 2015 at 11:27:11AM +0200, Geert Uytterhoeven wrote:
> > diff --git a/Documentation/devicetree/bindings/arm/l2cc.txt b/Documentation/devicetree/bindings/arm/l2cc.txt
> > index 0dbabe9a6b0abb91..2484aed78c86546d 100644
> > --- a/Documentation/devicetree/bindings/arm/l2cc.txt
> > +++ b/Documentation/devicetree/bindings/arm/l2cc.txt
> > @@ -67,6 +67,12 @@ Optional properties:
> >    disable if zero.
> >  - arm,prefetch-offset : Override prefetch offset value. Valid values are
> >    0-7, 15, 23, and 31.
> > +- arm,shared-override : The default behavior of the pl310 cache controller with
> > +  respect to the shareable attribute is to transform "normal memory
> > +  non-cacheable transactions" into "cacheable no allocate" (for reads) or
> > +  "write through no write allocate" (for writes).
> > +  On systems where this may cause DMA buffer corruption, this property must be
> > +  specified to indicate that such transforms are precluded.
> >  
> >  Example:
> >  
> > diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
> > index e309c8f35af5af61..86d0e7461e5b0b18 100644
> > --- a/arch/arm/mm/cache-l2x0.c
> > +++ b/arch/arm/mm/cache-l2x0.c
> > @@ -1149,6 +1149,11 @@ static void __init l2c310_of_parse(const struct device_node *np,
> >  		}
> >  	}
> >  
> > +	if (of_property_read_bool(np, "arm,shared-override")) {
> > +		*aux_val |= L2C_AUX_CTRL_SHARED_OVERRIDE;
> > +		*aux_mask &= ~L2C_AUX_CTRL_SHARED_OVERRIDE;
> > +	}
> > +
> >  	prefetch = l2x0_saved_regs.prefetch_ctrl;
> >  
> >  	ret = of_property_read_u32(np, "arm,double-linefill", &val);
> 
> It looks fine to me.
> 
> Acked-by: Catalin Marinas <catalin.marinas@arm.com>
> 
> (even better if a subsequent patch adds this property to all the dts
> files containing "arm,pl310" ;))

Even better would be for the boot loader/firmware to set the bit.
Catalin Marinas May 15, 2015, 1:55 p.m. UTC | #3
On Fri, May 15, 2015 at 11:10:28AM +0100, Russell King - ARM Linux wrote:
> On Thu, May 07, 2015 at 05:02:57PM +0100, Catalin Marinas wrote:
> > On Thu, May 07, 2015 at 11:27:11AM +0200, Geert Uytterhoeven wrote:
> > > diff --git a/Documentation/devicetree/bindings/arm/l2cc.txt b/Documentation/devicetree/bindings/arm/l2cc.txt
> > > index 0dbabe9a6b0abb91..2484aed78c86546d 100644
> > > --- a/Documentation/devicetree/bindings/arm/l2cc.txt
> > > +++ b/Documentation/devicetree/bindings/arm/l2cc.txt
> > > @@ -67,6 +67,12 @@ Optional properties:
> > >    disable if zero.
> > >  - arm,prefetch-offset : Override prefetch offset value. Valid values are
> > >    0-7, 15, 23, and 31.
> > > +- arm,shared-override : The default behavior of the pl310 cache controller with
> > > +  respect to the shareable attribute is to transform "normal memory
> > > +  non-cacheable transactions" into "cacheable no allocate" (for reads) or
> > > +  "write through no write allocate" (for writes).
> > > +  On systems where this may cause DMA buffer corruption, this property must be
> > > +  specified to indicate that such transforms are precluded.
> > >  
> > >  Example:
> > >  
> > > diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
> > > index e309c8f35af5af61..86d0e7461e5b0b18 100644
> > > --- a/arch/arm/mm/cache-l2x0.c
> > > +++ b/arch/arm/mm/cache-l2x0.c
> > > @@ -1149,6 +1149,11 @@ static void __init l2c310_of_parse(const struct device_node *np,
> > >  		}
> > >  	}
> > >  
> > > +	if (of_property_read_bool(np, "arm,shared-override")) {
> > > +		*aux_val |= L2C_AUX_CTRL_SHARED_OVERRIDE;
> > > +		*aux_mask &= ~L2C_AUX_CTRL_SHARED_OVERRIDE;
> > > +	}
> > > +
> > >  	prefetch = l2x0_saved_regs.prefetch_ctrl;
> > >  
> > >  	ret = of_property_read_u32(np, "arm,double-linefill", &val);
> > 
> > It looks fine to me.
> > 
> > Acked-by: Catalin Marinas <catalin.marinas@arm.com>
> > 
> > (even better if a subsequent patch adds this property to all the dts
> > files containing "arm,pl310" ;))
> 
> Even better would be for the boot loader/firmware to set the bit.

In an ideal world, I agree. But, arguably, we already set other bits in
the PL310 AUXCTRL register (and related cache controllers, just look at
the l2cc.txt bindings).

If you want to rely on firmware, can we at least check this bit and
print a warning? Or go a step further and refuse to enable PL310 when
this bit is clear? Otherwise coherent (non-cacheable) DMA operations are
not safe.
Michal Simek June 2, 2015, 7:20 a.m. UTC | #4
On 05/15/2015 03:55 PM, Catalin Marinas wrote:
> On Fri, May 15, 2015 at 11:10:28AM +0100, Russell King - ARM Linux wrote:
>> On Thu, May 07, 2015 at 05:02:57PM +0100, Catalin Marinas wrote:
>>> On Thu, May 07, 2015 at 11:27:11AM +0200, Geert Uytterhoeven wrote:
>>>> diff --git a/Documentation/devicetree/bindings/arm/l2cc.txt b/Documentation/devicetree/bindings/arm/l2cc.txt
>>>> index 0dbabe9a6b0abb91..2484aed78c86546d 100644
>>>> --- a/Documentation/devicetree/bindings/arm/l2cc.txt
>>>> +++ b/Documentation/devicetree/bindings/arm/l2cc.txt
>>>> @@ -67,6 +67,12 @@ Optional properties:
>>>>    disable if zero.
>>>>  - arm,prefetch-offset : Override prefetch offset value. Valid values are
>>>>    0-7, 15, 23, and 31.
>>>> +- arm,shared-override : The default behavior of the pl310 cache controller with
>>>> +  respect to the shareable attribute is to transform "normal memory
>>>> +  non-cacheable transactions" into "cacheable no allocate" (for reads) or
>>>> +  "write through no write allocate" (for writes).
>>>> +  On systems where this may cause DMA buffer corruption, this property must be
>>>> +  specified to indicate that such transforms are precluded.
>>>>  
>>>>  Example:
>>>>  
>>>> diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
>>>> index e309c8f35af5af61..86d0e7461e5b0b18 100644
>>>> --- a/arch/arm/mm/cache-l2x0.c
>>>> +++ b/arch/arm/mm/cache-l2x0.c
>>>> @@ -1149,6 +1149,11 @@ static void __init l2c310_of_parse(const struct device_node *np,
>>>>  		}
>>>>  	}
>>>>  
>>>> +	if (of_property_read_bool(np, "arm,shared-override")) {
>>>> +		*aux_val |= L2C_AUX_CTRL_SHARED_OVERRIDE;
>>>> +		*aux_mask &= ~L2C_AUX_CTRL_SHARED_OVERRIDE;
>>>> +	}
>>>> +
>>>>  	prefetch = l2x0_saved_regs.prefetch_ctrl;
>>>>  
>>>>  	ret = of_property_read_u32(np, "arm,double-linefill", &val);
>>>
>>> It looks fine to me.
>>>
>>> Acked-by: Catalin Marinas <catalin.marinas@arm.com>
>>>
>>> (even better if a subsequent patch adds this property to all the dts
>>> files containing "arm,pl310" ;))
>>
>> Even better would be for the boot loader/firmware to set the bit.
> 
> In an ideal world, I agree. But, arguably, we already set other bits in
> the PL310 AUXCTRL register (and related cache controllers, just look at
> the l2cc.txt bindings).
> 
> If you want to rely on firmware, can we at least check this bit and
> print a warning? Or go a step further and refuse to enable PL310 when
> this bit is clear? Otherwise coherent (non-cacheable) DMA operations are
> not safe.
> 

Any update on this one? I have the patch for Zynq pending and I want to
have any resolution on this in this generic way or simply by enabling it
via aux_mask as is here.
https://lkml.org/lkml/2015/5/12/51
This patch can be reverted when this generic solution reach mainline.

Thanks,
Michal
Hauke Mehrtens June 25, 2015, 9:19 p.m. UTC | #5
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 06/02/2015 09:20 AM, Michal Simek wrote:
> On 05/15/2015 03:55 PM, Catalin Marinas wrote:
>> On Fri, May 15, 2015 at 11:10:28AM +0100, Russell King - ARM
>> Linux wrote:
>>> On Thu, May 07, 2015 at 05:02:57PM +0100, Catalin Marinas
>>> wrote:
>>>> On Thu, May 07, 2015 at 11:27:11AM +0200, Geert Uytterhoeven
>>>> wrote:
>>>>> diff --git a/Documentation/devicetree/bindings/arm/l2cc.txt
>>>>> b/Documentation/devicetree/bindings/arm/l2cc.txt index
>>>>> 0dbabe9a6b0abb91..2484aed78c86546d 100644 ---
>>>>> a/Documentation/devicetree/bindings/arm/l2cc.txt +++
>>>>> b/Documentation/devicetree/bindings/arm/l2cc.txt @@ -67,6
>>>>> +67,12 @@ Optional properties: disable if zero. -
>>>>> arm,prefetch-offset : Override prefetch offset value. Valid
>>>>> values are 0-7, 15, 23, and 31. +- arm,shared-override :
>>>>> The default behavior of the pl310 cache controller with +
>>>>> respect to the shareable attribute is to transform "normal
>>>>> memory +  non-cacheable transactions" into "cacheable no
>>>>> allocate" (for reads) or +  "write through no write
>>>>> allocate" (for writes). +  On systems where this may cause
>>>>> DMA buffer corruption, this property must be +  specified
>>>>> to indicate that such transforms are precluded.
>>>>> 
>>>>> Example:
>>>>> 
>>>>> diff --git a/arch/arm/mm/cache-l2x0.c
>>>>> b/arch/arm/mm/cache-l2x0.c index
>>>>> e309c8f35af5af61..86d0e7461e5b0b18 100644 ---
>>>>> a/arch/arm/mm/cache-l2x0.c +++ b/arch/arm/mm/cache-l2x0.c 
>>>>> @@ -1149,6 +1149,11 @@ static void __init
>>>>> l2c310_of_parse(const struct device_node *np, } }
>>>>> 
>>>>> +	if (of_property_read_bool(np, "arm,shared-override")) { +
>>>>> *aux_val |= L2C_AUX_CTRL_SHARED_OVERRIDE; +		*aux_mask &=
>>>>> ~L2C_AUX_CTRL_SHARED_OVERRIDE; +	} + prefetch =
>>>>> l2x0_saved_regs.prefetch_ctrl;
>>>>> 
>>>>> ret = of_property_read_u32(np, "arm,double-linefill",
>>>>> &val);
>>>> 
>>>> It looks fine to me.
>>>> 
>>>> Acked-by: Catalin Marinas <catalin.marinas@arm.com>
>>>> 
>>>> (even better if a subsequent patch adds this property to all
>>>> the dts files containing "arm,pl310" ;))
>>> 
>>> Even better would be for the boot loader/firmware to set the
>>> bit.
>> 
>> In an ideal world, I agree. But, arguably, we already set other
>> bits in the PL310 AUXCTRL register (and related cache
>> controllers, just look at the l2cc.txt bindings).
>> 
>> If you want to rely on firmware, can we at least check this bit
>> and print a warning? Or go a step further and refuse to enable
>> PL310 when this bit is clear? Otherwise coherent (non-cacheable)
>> DMA operations are not safe.
>> 
> 
> Any update on this one? I have the patch for Zynq pending and I
> want to have any resolution on this in this generic way or simply
> by enabling it via aux_mask as is here. 
> https://lkml.org/lkml/2015/5/12/51 This patch can be reverted when
> this generic solution reach mainline.
> 
> Thanks, Michal

I do not see this in linux-next, and would like to use this.

Geert have you submitted this through this patch submission page?
http://www.arm.linux.org.uk/developer/patches/

Hauke

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQIcBAEBAgAGBQJVjHBkAAoJEIZ0px9YPRMytVQP/0fLG5J1BFE8abKDoGFoilfA
n86Q7+OEA+Yfs/W3dQtzTiS0ntUKM7iiDvBHGRRIkFfZVaHoFu989rVP1573mspJ
/qr5pdqZNSKbhu57sCjHEf1XhvdxwfCiv/yslDRIEB2Qw0qtU/G4p+BhCAWS8UDb
7Yf1nyRguW+jjZUEVBNczmLOjPoNlzkfoRt0Jw6xFFzTqtfqXdIttEakcAWkDJb4
McT0j7f5hjhsrfgO8zHJlJBnsljTtr9Reg52mkAcCm/mDyPQhgtXXGh+Pvr8GyVf
UnmySVOjMHa2JUNy5eWea9w0dZeCV1SjO7oe87rZ0gc/ayGbnkY4hkh/WqS8uXfw
XL4lQjOzzqBbaB88IzWAQ3KVBlC1W3nso70sypIdwKzY1bbXzJsZx3/84vbdrmFG
MnS5IM8ccEXPjYwOtIO2OGGvjB0uDygN5n1ecVEzC2M3DRxe89vQMB6eSt7zxuWV
H27nhINbmi1/YpXdDJA+HlQB8oH1KRptIpwaYnOQSto3AHLbKEl649PVGGkk44YI
cJEZgR1wK7dFm/xwwa0FxWne+7HECCrp/nyADsZ+s1TJNyTXlOfJlKSH9dkq8d5h
6585vOMWAXibGUiWbAI8ln5Uhe6wJ7nSP1mfm6GQ+xCUlmmCQvzUeN5ymI2VhiIZ
n6mgIetWkTSWOLFBkPsJ
=MuR/
-----END PGP SIGNATURE-----
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Geert Uytterhoeven June 26, 2015, 7:15 a.m. UTC | #6
Hi Hauke,

On Thu, Jun 25, 2015 at 11:19 PM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
> On 06/02/2015 09:20 AM, Michal Simek wrote:
>> On 05/15/2015 03:55 PM, Catalin Marinas wrote:
>>> On Fri, May 15, 2015 at 11:10:28AM +0100, Russell King - ARM
>>> Linux wrote:
>>>> On Thu, May 07, 2015 at 05:02:57PM +0100, Catalin Marinas
>>>> wrote:
>>>>> On Thu, May 07, 2015 at 11:27:11AM +0200, Geert Uytterhoeven
>>>>> wrote:
>>>>>> diff --git a/Documentation/devicetree/bindings/arm/l2cc.txt
>>>>>> b/Documentation/devicetree/bindings/arm/l2cc.txt index
>>>>>> 0dbabe9a6b0abb91..2484aed78c86546d 100644 ---
>>>>>> a/Documentation/devicetree/bindings/arm/l2cc.txt +++
>>>>>> b/Documentation/devicetree/bindings/arm/l2cc.txt @@ -67,6
>>>>>> +67,12 @@ Optional properties: disable if zero. -
>>>>>> arm,prefetch-offset : Override prefetch offset value. Valid
>>>>>> values are 0-7, 15, 23, and 31. +- arm,shared-override :
>>>>>> The default behavior of the pl310 cache controller with +
>>>>>> respect to the shareable attribute is to transform "normal
>>>>>> memory +  non-cacheable transactions" into "cacheable no
>>>>>> allocate" (for reads) or +  "write through no write
>>>>>> allocate" (for writes). +  On systems where this may cause
>>>>>> DMA buffer corruption, this property must be +  specified
>>>>>> to indicate that such transforms are precluded.

>>>>> Acked-by: Catalin Marinas <catalin.marinas@arm.com>

> I do not see this in linux-next, and would like to use this.
>
> Geert have you submitted this through this patch submission page?
> http://www.arm.linux.org.uk/developer/patches/

Thanks for reminding me!

Submitted with Catalin's Acked-by.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Geert Uytterhoeven July 16, 2015, 7:59 a.m. UTC | #7
On Fri, Jun 26, 2015 at 9:15 AM, Geert Uytterhoeven
<geert@linux-m68k.org> wrote:
> On Thu, Jun 25, 2015 at 11:19 PM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
>> On 06/02/2015 09:20 AM, Michal Simek wrote:
>>> On 05/15/2015 03:55 PM, Catalin Marinas wrote:
>>>> On Fri, May 15, 2015 at 11:10:28AM +0100, Russell King - ARM
>>>> Linux wrote:
>>>>> On Thu, May 07, 2015 at 05:02:57PM +0100, Catalin Marinas
>>>>> wrote:
>>>>>> On Thu, May 07, 2015 at 11:27:11AM +0200, Geert Uytterhoeven
>>>>>> wrote:
>>>>>>> diff --git a/Documentation/devicetree/bindings/arm/l2cc.txt
>>>>>>> b/Documentation/devicetree/bindings/arm/l2cc.txt index
>>>>>>> 0dbabe9a6b0abb91..2484aed78c86546d 100644 ---
>>>>>>> a/Documentation/devicetree/bindings/arm/l2cc.txt +++
>>>>>>> b/Documentation/devicetree/bindings/arm/l2cc.txt @@ -67,6
>>>>>>> +67,12 @@ Optional properties: disable if zero. -
>>>>>>> arm,prefetch-offset : Override prefetch offset value. Valid
>>>>>>> values are 0-7, 15, 23, and 31. +- arm,shared-override :
>>>>>>> The default behavior of the pl310 cache controller with +
>>>>>>> respect to the shareable attribute is to transform "normal
>>>>>>> memory +  non-cacheable transactions" into "cacheable no
>>>>>>> allocate" (for reads) or +  "write through no write
>>>>>>> allocate" (for writes). +  On systems where this may cause
>>>>>>> DMA buffer corruption, this property must be +  specified
>>>>>>> to indicate that such transforms are precluded.
>
>>>>>> Acked-by: Catalin Marinas <catalin.marinas@arm.com>
>
>> I do not see this in linux-next, and would like to use this.
>>
>> Geert have you submitted this through this patch submission page?
>> http://www.arm.linux.org.uk/developer/patches/
>
> Thanks for reminding me!
>
> Submitted with Catalin's Acked-by.

Now included in today's arm/for-next. Thanks!

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/Documentation/devicetree/bindings/arm/l2cc.txt b/Documentation/devicetree/bindings/arm/l2cc.txt
index 0dbabe9a6b0abb91..2484aed78c86546d 100644
--- a/Documentation/devicetree/bindings/arm/l2cc.txt
+++ b/Documentation/devicetree/bindings/arm/l2cc.txt
@@ -67,6 +67,12 @@  Optional properties:
   disable if zero.
 - arm,prefetch-offset : Override prefetch offset value. Valid values are
   0-7, 15, 23, and 31.
+- arm,shared-override : The default behavior of the pl310 cache controller with
+  respect to the shareable attribute is to transform "normal memory
+  non-cacheable transactions" into "cacheable no allocate" (for reads) or
+  "write through no write allocate" (for writes).
+  On systems where this may cause DMA buffer corruption, this property must be
+  specified to indicate that such transforms are precluded.
 
 Example:
 
diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
index e309c8f35af5af61..86d0e7461e5b0b18 100644
--- a/arch/arm/mm/cache-l2x0.c
+++ b/arch/arm/mm/cache-l2x0.c
@@ -1149,6 +1149,11 @@  static void __init l2c310_of_parse(const struct device_node *np,
 		}
 	}
 
+	if (of_property_read_bool(np, "arm,shared-override")) {
+		*aux_val |= L2C_AUX_CTRL_SHARED_OVERRIDE;
+		*aux_mask &= ~L2C_AUX_CTRL_SHARED_OVERRIDE;
+	}
+
 	prefetch = l2x0_saved_regs.prefetch_ctrl;
 
 	ret = of_property_read_u32(np, "arm,double-linefill", &val);