phone-side
/
uboot-mt623x
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

85xx: Improve flash remapping on MPC8572DS & MPC8536DS 

Changing the flash from cacheable to cache-inhibited was taking a significant
amount of time due to the fact that we were iterating over the full 256M of
flash.  Instead we can just flush the L1 d-cache and invalidate the i-cache.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
Kumar Gala 2008-09-22 14:11:11 -05:00 committed by Wolfgang Denk
parent 54e091d3b6
commit 7c0d4a7508
4 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
board/freescale/mpc8536ds/mpc8536ds.c
View File

@ -25,6 +25,7 @@
#include <pci.h>
#include <asm/processor.h>
#include <asm/mmu.h>
#include <asm/cache.h>
#include <asm/immap_85xx.h>
#include <asm/immap_fsl_pci.h>
#include <asm/fsl_ddr_sdram.h>
@ -441,7 +442,6 @@ pci_init_board(void)
int board_early_init_r(void)
{
unsigned int i;
const unsigned int flashbase = CONFIG_SYS_FLASH_BASE;
const u8 flash_esel = 1;
@ -450,11 +450,9 @@ int board_early_init_r(void)
* so that flash can be erased properly.
*/
/* Invalidate any remaining lines of the flash from caches. */
for (i = 0; i < 256*1024*1024; i+=32) {
asm volatile ("dcbi %0,%1": : "b" (flashbase), "r" (i));
asm volatile ("icbi %0,%1": : "b" (flashbase), "r" (i));
}
/* Flush d-cache and invalidate i-cache of any FLASH data */
flush_dcache();
invalidate_icache();
/* invalidate existing TLB entry for flash + promjet */
disable_tlb(flash_esel);

2
board/freescale/mpc8536ds/tlb.c
View File

@ -54,7 +54,7 @@ struct fsl_e_tlb_entry tlb_table[] = {
/* W**G* - Flash/promjet, localbus */
/* This will be changed to *I*G* after relocation to RAM. */
SET_TLB_ENTRY(1, CONFIG_SYS_FLASH_BASE, CONFIG_SYS_FLASH_BASE,
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_W|MAS2_G,
MAS3_SX|MAS3_SR, MAS2_W|MAS2_G,
0, 1, BOOKE_PAGESZ_256M, 1),
/* *I*G* - PCI */

10
board/freescale/mpc8572ds/mpc8572ds.c
View File

@ -25,6 +25,7 @@
#include <pci.h>
#include <asm/processor.h>
#include <asm/mmu.h>
#include <asm/cache.h>
#include <asm/immap_85xx.h>
#include <asm/immap_fsl_pci.h>
#include <asm/fsl_ddr_sdram.h>
@ -359,7 +360,6 @@ void pci_init_board(void)
int board_early_init_r(void)
{
unsigned int i;
const unsigned int flashbase = CONFIG_SYS_FLASH_BASE;
const u8 flash_esel = 2;
@ -368,11 +368,9 @@ int board_early_init_r(void)
* so that flash can be erased properly.
*/
/* Invalidate any remaining lines of the flash from caches. */
for (i = 0; i < 256*1024*1024; i+=32) {
asm volatile ("dcbi %0,%1": : "b" (flashbase), "r" (i));
asm volatile ("icbi %0,%1": : "b" (flashbase), "r" (i));
}
/* Flush d-cache and invalidate i-cache of any FLASH data */
flush_dcache();
invalidate_icache();
/* invalidate existing TLB entry for flash + promjet */
disable_tlb(flash_esel);

2
board/freescale/mpc8572ds/tlb.c
View File

@ -59,7 +59,7 @@ struct fsl_e_tlb_entry tlb_table[] = {
/* W**G* - Flash/promjet, localbus */
/* This will be changed to *I*G* after relocation to RAM. */
SET_TLB_ENTRY(1, CONFIG_SYS_FLASH_BASE, CONFIG_SYS_FLASH_BASE,
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_W|MAS2_G,
MAS3_SX|MAS3_SR, MAS2_W|MAS2_G,
0, 2, BOOKE_PAGESZ_256M, 1),
/* *I*G* - PCI */