Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ARM: 9007/1: l2c: fix prefetch bits init in L2X0_AUX_CTRL using DT values

Browse source 
[ Upstream commit 8e007b367a59bcdf484c81f6df9bd5a4cc179ca6 ]

The L310_PREFETCH_CTRL register bits 28 and 29 to enable data and
instruction prefetch respectively can also be accessed via the
L2X0_AUX_CTRL register.  They appear to be actually wired together in
hardware between the registers.  Changing them in the prefetch
register only will get undone when restoring the aux control register
later on.  For this reason, set these bits in both registers during
initialisation according to the devicetree property values.

Link: https://lore.kernel.org/lkml/76f2f3ad5e77e356e0a5b99ceee1e774a2842c25.1597061474.git.guillaume.tucker@collabora.com/

Fixes: ec3bd0e68a ("ARM: 8391/1: l2c: add options to overwrite prefetching behavior")
Signed-off-by: Guillaume Tucker <guillaume.tucker@collabora.com>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Guillaume Tucker 2020-09-01 16:58:06 +01:00 committed by Greg Kroah-Hartman
parent 593a1aa514
commit 15d0788754
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
arch/arm/mm/cache-l2x0.c
View file

@ -1261,20 +1261,28 @@ static void __init l2c310_of_parse(const struct device_node *np,
ret = of_property_read_u32(np, "prefetch-data", &val); ret = of_property_read_u32(np, "prefetch-data", &val);
if (ret == 0) { if (ret == 0) {
if (val) if (val) {
prefetch |= L310_PREFETCH_CTRL_DATA_PREFETCH; prefetch |= L310_PREFETCH_CTRL_DATA_PREFETCH;
else *aux_val |= L310_PREFETCH_CTRL_DATA_PREFETCH;
} else {
prefetch &= ~L310_PREFETCH_CTRL_DATA_PREFETCH; prefetch &= ~L310_PREFETCH_CTRL_DATA_PREFETCH;
*aux_val &= ~L310_PREFETCH_CTRL_DATA_PREFETCH;
}
*aux_mask &= ~L310_PREFETCH_CTRL_DATA_PREFETCH;
} else if (ret != -EINVAL) { } else if (ret != -EINVAL) {
pr_err("L2C-310 OF prefetch-data property value is missing\n"); pr_err("L2C-310 OF prefetch-data property value is missing\n");
} }
ret = of_property_read_u32(np, "prefetch-instr", &val); ret = of_property_read_u32(np, "prefetch-instr", &val);
if (ret == 0) { if (ret == 0) {
if (val) if (val) {
prefetch |= L310_PREFETCH_CTRL_INSTR_PREFETCH; prefetch |= L310_PREFETCH_CTRL_INSTR_PREFETCH;
else *aux_val |= L310_PREFETCH_CTRL_INSTR_PREFETCH;
} else {
prefetch &= ~L310_PREFETCH_CTRL_INSTR_PREFETCH; prefetch &= ~L310_PREFETCH_CTRL_INSTR_PREFETCH;
*aux_val &= ~L310_PREFETCH_CTRL_INSTR_PREFETCH;
}
*aux_mask &= ~L310_PREFETCH_CTRL_INSTR_PREFETCH;
} else if (ret != -EINVAL) { } else if (ret != -EINVAL) {
pr_err("L2C-310 OF prefetch-instr property value is missing\n"); pr_err("L2C-310 OF prefetch-instr property value is missing\n");
} }