ARM: 8310/1: l2c: Fix prefetch settings dt parsing

Allow prefetch settings overriding by device tree, in case
l2x0_cache_size_of_parse() returns value, prefetch tuning
properties are silently ignored. E.g. arm,double-linefill* and
arm,prefetch*.
This happens for example, when "cache-size" or "cache-sets"
properties haven't been filled in l2c dt node.

Comments from Fabrice Gasnier:

 Allow device tree to override the L2C prefetch settings, even when
 l2x0_cache_size_of_parse() fails to parse the cache geometry due to (eg)
 missing "cache-size" or "cache-sets" properties.

Signed-off-by: Fabrice Gasnier <fabrice.gasnier@st.com>
Reviewed-by: Tomasz Figa <tomasz.figa@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 16 insertions, 17 deletions

diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
index c6c7696b8db9..8f15f70622a6 100644
--- a/arch/arm/mm/cache-l2x0.c
+++ b/arch/arm/mm/cache-l2x0.c
@@ -1131,23 +1131,22 @@ static void __init l2c310_of_parse(const struct device_node *np,
         }
 
         ret = l2x0_cache_size_of_parse(np, aux_val, aux_mask, &assoc, SZ_512K);
-        if (ret)
-                return;
-
-        switch (assoc) {
-        case 16:
-                *aux_val &= ~L2X0_AUX_CTRL_ASSOC_MASK;
-                *aux_val |= L310_AUX_CTRL_ASSOCIATIVITY_16;
-                *aux_mask &= ~L2X0_AUX_CTRL_ASSOC_MASK;
-                break;
-        case 8:
-                *aux_val &= ~L2X0_AUX_CTRL_ASSOC_MASK;
-                *aux_mask &= ~L2X0_AUX_CTRL_ASSOC_MASK;
-                break;
-        default:
-                pr_err("L2C-310 OF cache associativity %d invalid, only 8 or 16 permitted\n",
-                       assoc);
-                break;
+        if (!ret) {
+                switch (assoc) {
+                case 16:
+                        *aux_val &= ~L2X0_AUX_CTRL_ASSOC_MASK;
+                        *aux_val |= L310_AUX_CTRL_ASSOCIATIVITY_16;
+                        *aux_mask &= ~L2X0_AUX_CTRL_ASSOC_MASK;
+                        break;
+                case 8:
+                        *aux_val &= ~L2X0_AUX_CTRL_ASSOC_MASK;
+                        *aux_mask &= ~L2X0_AUX_CTRL_ASSOC_MASK;
+                        break;
+                default:
+                        pr_err("L2C-310 OF cache associativity %d invalid, only 8 or 16 permitted\n",
+                               assoc);
+                        break;
+                }
         }
 
         prefetch = l2x0_saved_regs.prefetch_ctrl;