Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-25 06:00:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

8xxx: Rename dma_xfer() to dmacpy()

Browse source 
Also update dmacpy()'s argument order to match memcpy's and use
phys_addr_t/phy_size_t for address/size arguments

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
Peter Tyser 2009-06-30 17:15:45 -05:00 committed by Kumar Gala
parent 484919cf33
commit 7892f619d4
6 changed files with 53 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
board/mpc8540eval/mpc8540eval.c
View file

@ -148,29 +148,28 @@ phys_size_t initdram (int board_type)
} }
/* 8K */ /* 8K */
dma_xfer((uint *)0x2000,0x2000,(uint *)0); dmacpy(0x2000, 0, 0x2000);
/* 16K */ /* 16K */
dma_xfer((uint *)0x4000,0x4000,(uint *)0); dmacpy(0x4000, 0, 0x4000);
/* 32K */ /* 32K */
dma_xfer((uint *)0x8000,0x8000,(uint *)0); dmacpy(0x8000, 0, 0x8000);
/* 64K */ /* 64K */
dma_xfer((uint *)0x10000,0x10000,(uint *)0); dmacpy(0x10000, 0, 0x10000);
/* 128k */ /* 128k */
dma_xfer((uint *)0x20000,0x20000,(uint *)0); dmacpy(0x20000, 0, 0x20000);
/* 256k */ /* 256k */
dma_xfer((uint *)0x40000,0x40000,(uint *)0); dmacpy(0x40000, 0, 0x40000);
/* 512k */ /* 512k */
dma_xfer((uint *)0x80000,0x80000,(uint *)0); dmacpy(0x80000, 0, 0x80000);
/* 1M */ /* 1M */
dma_xfer((uint *)0x100000,0x100000,(uint *)0); dmacpy(0x100000, 0, 0x100000);
/* 2M */ /* 2M */
dma_xfer((uint *)0x200000,0x200000,(uint *)0); dmacpy(0x200000, 0, 0x200000);
/* 4M */ /* 4M */
dma_xfer((uint *)0x400000,0x400000,(uint *)0); dmacpy(0x400000, 0, 0x400000);
for (i = 1; i < dram_size / 0x800000; i++) { for (i = 1; i < dram_size / 0x800000; i++)
dma_xfer((uint *)(0x800000*i),0x800000,(uint *)0); dmacpy(0x800000 * i, 0, 0x800000);
}
/* Enable errors for ECC */ /* Enable errors for ECC */
ddr->err_disable = 0x00000000; ddr->err_disable = 0x00000000;

25
board/sbc8560/sbc8560.c
View file

@ -349,29 +349,28 @@ phys_size_t initdram (int board_type)
} }
/* 8K */ /* 8K */
dma_xfer((uint *)0x2000,0x2000,(uint *)0); dmacpy(0x2000, 0, 0x2000);
/* 16K */ /* 16K */
dma_xfer((uint *)0x4000,0x4000,(uint *)0); dmacpy(0x4000, 0, 0x4000);
/* 32K */ /* 32K */
dma_xfer((uint *)0x8000,0x8000,(uint *)0); dmacpy(0x8000, 0, 0x8000);
/* 64K */ /* 64K */
dma_xfer((uint *)0x10000,0x10000,(uint *)0); dmacpy(0x10000, 0, 0x10000);
/* 128k */ /* 128k */
dma_xfer((uint *)0x20000,0x20000,(uint *)0); dmacpy(0x20000, 0, 0x20000);
/* 256k */ /* 256k */
dma_xfer((uint *)0x40000,0x40000,(uint *)0); dmacpy(0x40000, 0, 0x40000);
/* 512k */ /* 512k */
dma_xfer((uint *)0x80000,0x80000,(uint *)0); dmacpy(0x80000, 0, 0x80000);
/* 1M */ /* 1M */
dma_xfer((uint *)0x100000,0x100000,(uint *)0); dmacpy(0x100000, 0, 0x100000);
/* 2M */ /* 2M */
dma_xfer((uint *)0x200000,0x200000,(uint *)0); dmacpy(0x200000, 0, 0x200000);
/* 4M */ /* 4M */
dma_xfer((uint *)0x400000,0x400000,(uint *)0); dmacpy(0x400000, 0, 0x400000);
for (i = 1; i < dram_size / 0x800000; i++) { for (i = 1; i < dram_size / 0x800000; i++)
dma_xfer((uint *)(0x800000*i),0x800000,(uint *)0); dmacpy(0x800000 * i, 0, 0x800000);
}
/* Enable errors for ECC */ /* Enable errors for ECC */
ddr->err_disable = 0x00000000; ddr->err_disable = 0x00000000;

4
cpu/mpc83xx/cpu.c
View file

@ -327,7 +327,7 @@ uint dma_check(void)
return status; return status;
} }
int dma_xfer(void *dest, u32 count, void *src) int dmacpy(phys_addr_t dest, phys_addr_t src, phys_size_t count)
{ {
volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR; volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR;
volatile dma83xx_t *dma = &immap->dma; volatile dma83xx_t *dma = &immap->dma;
@ -336,7 +336,7 @@ int dma_xfer(void *dest, u32 count, void *src)
/* initialize DMASARn, DMADAR and DMAABCRn */ /* initialize DMASARn, DMADAR and DMAABCRn */
dma->dmadar0 = swab32((u32)dest); dma->dmadar0 = swab32((u32)dest);
dma->dmasar0 = swab32((u32)src); dma->dmasar0 = swab32((u32)src);
dma->dmabcr0 = swab32(count); dma->dmabcr0 = swab32((u32)count);
__asm__ __volatile__ ("sync"); __asm__ __volatile__ ("sync");
__asm__ __volatile__ ("isync"); __asm__ __volatile__ ("isync");

27
cpu/mpc83xx/spd_sdram.c
View file

@ -68,7 +68,7 @@ void board_add_ram_info(int use_default)
#if defined(CONFIG_DDR_ECC) && !defined(CONFIG_ECC_INIT_VIA_DDRC) #if defined(CONFIG_DDR_ECC) && !defined(CONFIG_ECC_INIT_VIA_DDRC)
extern void dma_init(void); extern void dma_init(void);
extern uint dma_check(void); extern uint dma_check(void);
extern int dma_xfer(void *dest, uint count, void *src); extern int dmacpy(phys_addr_t dest, phys_addr_t src, phys_size_t n);
#endif #endif
#ifndef CONFIG_SYS_READ_SPD #ifndef CONFIG_SYS_READ_SPD
@ -898,20 +898,19 @@ void ddr_enable_ecc(unsigned int dram_size)
/* Initialise DMA for direct transfer */ /* Initialise DMA for direct transfer */
dma_init(); dma_init();
/* Start DMA to transfer */ /* Start DMA to transfer */
dma_xfer((uint *)0x2000, 0x2000, (uint *)0); /* 8K */ dmacpy(0x2000, 0, 0x2000); /* 8K */
dma_xfer((uint *)0x4000, 0x4000, (uint *)0); /* 16K */ dmacpy(0x4000, 0, 0x4000); /* 16K */
dma_xfer((uint *)0x8000, 0x8000, (uint *)0); /* 32K */ dmacpy(0x8000, 0, 0x8000); /* 32K */
dma_xfer((uint *)0x10000, 0x10000, (uint *)0); /* 64K */ dmacpy(0x10000, 0, 0x10000); /* 64K */
dma_xfer((uint *)0x20000, 0x20000, (uint *)0); /* 128K */ dmacpy(0x20000, 0, 0x20000); /* 128K */
dma_xfer((uint *)0x40000, 0x40000, (uint *)0); /* 256K */ dmacpy(0x40000, 0, 0x40000); /* 256K */
dma_xfer((uint *)0x80000, 0x80000, (uint *)0); /* 512K */ dmacpy(0x80000, 0, 0x80000); /* 512K */
dma_xfer((uint *)0x100000, 0x100000, (uint *)0); /* 1M */ dmacpy(0x100000, 0, 0x100000); /* 1M */
dma_xfer((uint *)0x200000, 0x200000, (uint *)0); /* 2M */ dmacpy(0x200000, 0, 0x200000); /* 2M */
dma_xfer((uint *)0x400000, 0x400000, (uint *)0); /* 4M */ dmacpy(0x400000, 0, 0x400000); /* 4M */
for (i = 1; i < dram_size / 0x800000; i++) { for (i = 1; i < dram_size / 0x800000; i++)
dma_xfer((uint *)(0x800000*i), 0x800000, (uint *)0); dmacpy(0x800000 * i, 0, 0x800000);
}
#endif #endif
t_end = get_tbms(); t_end = get_tbms();

27
cpu/mpc85xx/ddr-gen1.c
View file

@ -68,7 +68,7 @@ void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs,
#if defined(CONFIG_DDR_ECC) && !defined(CONFIG_ECC_INIT_VIA_DDRCONTROLLER) #if defined(CONFIG_DDR_ECC) && !defined(CONFIG_ECC_INIT_VIA_DDRCONTROLLER)
extern void dma_init(void); extern void dma_init(void);
extern uint dma_check(void); extern uint dma_check(void);
extern int dma_xfer(void *dest, uint count, void *src); extern int dmacpy(phys_addr_t dest, phys_addr_t src, phys_size_t n);
/* /*
* Initialize all of memory for ECC, then enable errors. * Initialize all of memory for ECC, then enable errors.
@ -93,20 +93,19 @@ ddr_enable_ecc(unsigned int dram_size)
} }
} }
dma_xfer((uint *)0x002000, 0x002000, (uint *)0); /* 8K */ dmacpy(0x002000, 0, 0x2000); /* 8K */
dma_xfer((uint *)0x004000, 0x004000, (uint *)0); /* 16K */ dmacpy(0x004000, 0, 0x4000); /* 16K */
dma_xfer((uint *)0x008000, 0x008000, (uint *)0); /* 32K */ dmacpy(0x008000, 0, 0x8000); /* 32K */
dma_xfer((uint *)0x010000, 0x010000, (uint *)0); /* 64K */ dmacpy(0x010000, 0, 0x10000); /* 64K */
dma_xfer((uint *)0x020000, 0x020000, (uint *)0); /* 128k */ dmacpy(0x020000, 0, 0x20000); /* 128K */
dma_xfer((uint *)0x040000, 0x040000, (uint *)0); /* 256k */ dmacpy(0x040000, 0, 0x40000); /* 256K */
dma_xfer((uint *)0x080000, 0x080000, (uint *)0); /* 512k */ dmacpy(0x080000, 0, 0x80000); /* 512K */
dma_xfer((uint *)0x100000, 0x100000, (uint *)0); /* 1M */ dmacpy(0x100000, 0, 0x100000); /* 1M */
dma_xfer((uint *)0x200000, 0x200000, (uint *)0); /* 2M */ dmacpy(0x200000, 0, 0x200000); /* 2M */
dma_xfer((uint *)0x400000, 0x400000, (uint *)0); /* 4M */ dmacpy(0x400000, 0, 0x400000); /* 4M */
for (i = 1; i < dram_size / 0x800000; i++) { for (i = 1; i < dram_size / 0x800000; i++)
dma_xfer((uint *)(0x800000*i), 0x800000, (uint *)0); dmacpy(0x800000 *i, 0, 0x800000);
}
/* /*
* Enable errors for ECC. * Enable errors for ECC.

2
drivers/dma/fsl_dma.c
View file

@ -78,7 +78,7 @@ void dma_init(void) {
dma_sync(); dma_sync();
} }
int dma_xfer(void *dest, uint count, void *src) { int dmacpy(phys_addr_t dest, phys_addr_t src, phys_size_t count) {
volatile fsl_dma_t *dma = &dma_base->dma[0]; volatile fsl_dma_t *dma = &dma_base->dma[0];
uint xfer_size; uint xfer_size;