GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-20 22:21:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clean up usage of icache_disable/dcache_disable

Browse source 
There is no point in disabling the icache on 7xx/74xx/86xx parts and not
also flushing the icache.  All callers of invalidate_l1_instruction_cache()
call icache_disable() right after.  Make it so icache_disable() calls
invalidate_l1_instruction_cache() for us.

Also, dcache_disable() already calls dcache_flush() so there is no point
in the explicit calls of dcache_flush().

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
Kumar Gala 2008-08-15 08:24:32 -05:00 • committed by Wolfgang Denk
parent a15b07104c
commit fcd69a1a57
8 changed files with 8 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
board/Marvell/db64360/db64360.c
View file

@ -51,9 +51,6 @@
#define DP(x) #define DP(x)
#endif #endif
extern void flush_data_cache (void);
extern void invalidate_l1_instruction_cache (void);
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
/* this is the current GT register space location */ /* this is the current GT register space location */
@ -930,7 +927,5 @@ void board_prebootm_init ()
my_remap_gt_regs_bootm (CFG_GT_REGS, BRIDGE_REG_BASE_BOOTM); my_remap_gt_regs_bootm (CFG_GT_REGS, BRIDGE_REG_BASE_BOOTM);
icache_disable (); icache_disable ();
invalidate_l1_instruction_cache ();
flush_data_cache ();
dcache_disable (); dcache_disable ();
} }

5
board/Marvell/db64460/db64460.c
View file

@ -51,9 +51,6 @@
#define DP(x) #define DP(x)
#endif #endif
extern void flush_data_cache (void);
extern void invalidate_l1_instruction_cache (void);
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
/* this is the current GT register space location */ /* this is the current GT register space location */
@ -930,7 +927,5 @@ void board_prebootm_init ()
my_remap_gt_regs_bootm (CFG_GT_REGS, BRIDGE_REG_BASE_BOOTM); my_remap_gt_regs_bootm (CFG_GT_REGS, BRIDGE_REG_BASE_BOOTM);
icache_disable (); icache_disable ();
invalidate_l1_instruction_cache ();
flush_data_cache ();
dcache_disable (); dcache_disable ();
} }

4
board/esd/cpci750/cpci750.c
View file

@ -120,8 +120,6 @@ static char show_config_tab[][15] = {{"PCI0DLL_2 "}, /* 31 */
{"DRAMPLL_NDiv_1"}, /* 01 */ {"DRAMPLL_NDiv_1"}, /* 01 */
{"DRAMPLL_NDiv_0"}}; /* 00 */ {"DRAMPLL_NDiv_0"}}; /* 00 */
extern void flush_data_cache (void);
extern void invalidate_l1_instruction_cache (void);
extern flash_info_t flash_info[]; extern flash_info_t flash_info[];
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
@ -961,8 +959,6 @@ void board_prebootm_init ()
my_remap_gt_regs_bootm (CFG_GT_REGS, CFG_DFL_GT_REGS); my_remap_gt_regs_bootm (CFG_GT_REGS, CFG_DFL_GT_REGS);
icache_disable (); icache_disable ();
invalidate_l1_instruction_cache ();
flush_data_cache ();
dcache_disable (); dcache_disable ();
} }

2
board/freescale/mpc7448hpc2/mpc7448hpc2.c
View file

@ -37,8 +37,6 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
extern void flush_data_cache (void);
extern void invalidate_l1_instruction_cache (void);
extern void tsi108_init_f (void); extern void tsi108_init_f (void);
int display_mem_map (void); int display_mem_map (void);

2
board/prodrive/p3mx/p3mx.c
View file

@ -62,8 +62,6 @@ DECLARE_GLOBAL_DATA_PTR;
#define DP(x) #define DP(x)
#endif #endif
extern void flush_data_cache (void);
extern void invalidate_l1_instruction_cache (void);
extern flash_info_t flash_info[]; extern flash_info_t flash_info[];
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */

2
common/cmd_bootm.c
View file

@ -236,8 +236,6 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
* bios emulation, so turn them off again * bios emulation, so turn them off again
*/ */
icache_disable(); icache_disable();
invalidate_l1_instruction_cache();
flush_data_cache();
dcache_disable(); dcache_disable();
#endif #endif

4
cpu/74xx_7xx/cache.S
View file

@ -245,6 +245,10 @@ _GLOBAL(icache_enable)
* Disable L1 Instruction cache * Disable L1 Instruction cache
*/ */
_GLOBAL(icache_disable) _GLOBAL(icache_disable)
mflr r4
bl invalidate_l1_instruction_cache /* uses r3 */
sync
mtlr r4
mfspr r3, HID0 mfspr r3, HID0
li r5, 0 li r5, 0
ori r5, r5, HID0_ICE ori r5, r5, HID0_ICE

4
cpu/mpc86xx/cache.S
View file

@ -232,6 +232,10 @@ _GLOBAL(icache_enable)
* Disable L1 Instruction cache * Disable L1 Instruction cache
*/ */
_GLOBAL(icache_disable) _GLOBAL(icache_disable)
mflr r4
bl invalidate_l1_instruction_cache /* uses r3 */
sync
mtlr r4
mfspr r3, HID0 mfspr r3, HID0
li r5, 0 li r5, 0
ori r5, r5, HID0_ICE ori r5, r5, HID0_ICE