Fix underlying problem with xscale icache and dcache commands

Fix problem with the xscale icache and dcache commands.  Both commands were
enabling or disabling the mmu, not the caches

I didn't look any further after my earlier patch fixed the trivial problem
with command argument parsing.  Turns out the underlying code was broken.

The resolution is straightforward when you look at the arguments to
xscale_enable_mmu_caches() and xscale_disable_mmu_caches().  I finally
took a deeper look after dumping the cp15 control register (XSCALE_CTRL)
and seeing that the cache bits weren't changing, but the mmu bit was
(which caused all manner of grief, as you can imagine).  This has been
tested and works OK now.

 src/target/xscale.c |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
This commit is contained in:
Mike Dunn 2010-03-18 21:34:13 -07:00 committed by David Brownell
parent fc9de56a25
commit 8d411d0d24
1 changed files with 11 additions and 6 deletions

View File

@ -3204,14 +3204,19 @@ COMMAND_HANDLER(xscale_handle_idcache_command)
{ {
bool enable; bool enable;
COMMAND_PARSE_ENABLE(CMD_ARGV[0], enable); COMMAND_PARSE_ENABLE(CMD_ARGV[0], enable);
if (enable) if (icache) {
xscale_enable_mmu_caches(target, 1, 0, 0);
else
xscale_disable_mmu_caches(target, 1, 0, 0);
if (icache)
xscale->armv4_5_mmu.armv4_5_cache.i_cache_enabled = enable; xscale->armv4_5_mmu.armv4_5_cache.i_cache_enabled = enable;
else if (enable)
xscale_enable_mmu_caches(target, 0, 0, 1);
else
xscale_disable_mmu_caches(target, 0, 0, 1);
} else {
xscale->armv4_5_mmu.armv4_5_cache.d_u_cache_enabled = enable; xscale->armv4_5_mmu.armv4_5_cache.d_u_cache_enabled = enable;
if (enable)
xscale_enable_mmu_caches(target, 0, 1, 0);
else
xscale_disable_mmu_caches(target, 0, 1, 0);
}
} }
bool enabled = icache ? bool enabled = icache ?