[PATCH v2] ARM: l2c: Add support for the "arm, shared-override" property
From: hauke@hauke-m.de (Hauke Mehrtens)
Date: 2015-06-25 21:19:36
Also in:
linux-devicetree, linux-sh
-----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:quoted
On Fri, May 15, 2015 at 11:10:28AM +0100, Russell King - ARM Linux wrote:quoted
On Thu, May 07, 2015 at 05:02:57PM +0100, Catalin Marinas wrote:quoted
On Thu, May 07, 2015 at 11:27:11AM +0200, Geert Uytterhoeven wrote:quoted
diff --git a/Documentation/devicetree/bindings/arm/l2cc.txtb/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.cb/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 __initl2c310_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-----