From 6a67707b5ec3b2c649c401550bb7fdef2b7c8d07 Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Sat, 17 Dec 2011 07:27:24 +0000 Subject: Commit to certain names for cache coherency APIs and discard the aliases. Wouldn't surprise me a bit to get some non-green. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31339 a1c6a512-1295-4272-9138-f99709370657 --- firmware/target/arm/imx31/ata-imx31.c | 4 ++-- firmware/target/arm/imx31/crt0.S | 2 +- firmware/target/arm/imx31/gigabeat-s/pcm-gigabeat-s.c | 12 ++++++------ firmware/target/arm/imx31/sdma-imx31.c | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) (limited to 'firmware/target/arm/imx31') diff --git a/firmware/target/arm/imx31/ata-imx31.c b/firmware/target/arm/imx31/ata-imx31.c index 80539b9c9d..3b08a38c1b 100644 --- a/firmware/target/arm/imx31/ata-imx31.c +++ b/firmware/target/arm/imx31/ata-imx31.c @@ -475,7 +475,7 @@ bool ata_dma_setup(void *addr, unsigned long bytes, bool write) if (LIKELY(buf != addr)) { /* addr is virtual */ - clean_dcache_range(addr, bytes); + commit_dcache_range(addr, bytes); } /* Setup ATA controller for DMA transmit */ @@ -495,7 +495,7 @@ bool ata_dma_setup(void *addr, unsigned long bytes, bool write) if (LIKELY(buf != addr)) { /* addr is virtual */ - dump_dcache_range(addr, bytes); + discard_dcache_range(addr, bytes); if ((unsigned long)addr & 31) { diff --git a/firmware/target/arm/imx31/crt0.S b/firmware/target/arm/imx31/crt0.S index b6a49266ef..1c1ae55736 100644 --- a/firmware/target/arm/imx31/crt0.S +++ b/firmware/target/arm/imx31/crt0.S @@ -301,7 +301,7 @@ remap_end: #endif /* Make memory coherent for devices */ - bl cpucache_commit_discard + bl commit_discard_idcache bl main diff --git a/firmware/target/arm/imx31/gigabeat-s/pcm-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/pcm-gigabeat-s.c index 180a0feee4..e106cf78e3 100644 --- a/firmware/target/arm/imx31/gigabeat-s/pcm-gigabeat-s.c +++ b/firmware/target/arm/imx31/gigabeat-s/pcm-gigabeat-s.c @@ -99,7 +99,7 @@ static void play_dma_callback(void) return; /* Flush any pending cache writes */ - clean_dcache_range(start, size); + commit_dcache_range(start, size); dma_play_bd.buf_addr = (void *)addr_virt_to_phys((unsigned long)start); dma_play_bd.mode.count = size; dma_play_bd.mode.command = TRANSFER_16BIT; @@ -202,7 +202,7 @@ static void play_stop_pcm(void) unsigned long dsa = 0; dma_play_bd.buf_addr = NULL; dma_play_bd.mode.count = 0; - clean_dcache_range(&dsa, sizeof(dsa)); + discard_dcache_range(&dsa, sizeof(dsa)); sdma_write_words(&dsa, CHANNEL_CONTEXT_ADDR(DMA_PLAY_CH_NUM)+0x0b, 1); } @@ -221,7 +221,7 @@ void pcm_play_dma_start(const void *addr, size_t size) if (!sdma_channel_reset(DMA_PLAY_CH_NUM)) return; - clean_dcache_range(addr, size); + commit_dcache_range(addr, size); dma_play_bd.buf_addr = (void *)addr_virt_to_phys((unsigned long)(void *)addr); dma_play_bd.mode.count = size; @@ -353,7 +353,7 @@ static void rec_dma_callback(void) return; /* Invalidate - buffer must be coherent */ - dump_dcache_range(start, size); + discard_dcache_range(start, size); start = (void *)addr_virt_to_phys((unsigned long)start); @@ -412,7 +412,7 @@ void pcm_rec_dma_stop(void) unsigned long pda = 0; dma_rec_bd.buf_addr = NULL; dma_rec_bd.mode.count = 0; - clean_dcache_range(&pda, sizeof(pda)); + discard_dcache_range(&pda, sizeof(pda)); sdma_write_words(&pda, CHANNEL_CONTEXT_ADDR(DMA_REC_CH_NUM)+0x0a, 1); } @@ -428,7 +428,7 @@ void pcm_rec_dma_start(void *addr, size_t size) return; /* Invalidate - buffer must be coherent */ - dump_dcache_range(addr, size); + discard_dcache_range(addr, size); addr = (void *)addr_virt_to_phys((unsigned long)addr); dma_rec_bd.buf_addr = addr; diff --git a/firmware/target/arm/imx31/sdma-imx31.c b/firmware/target/arm/imx31/sdma-imx31.c index 68aa0aa35f..d3e6233a4b 100644 --- a/firmware/target/arm/imx31/sdma-imx31.c +++ b/firmware/target/arm/imx31/sdma-imx31.c @@ -382,7 +382,7 @@ static bool setup_channel(struct channel_control_block *ccb_p) } /* Send channel context to SDMA core */ - clean_dcache_range(&context_buffer, sizeof (context_buffer)); + commit_dcache_range(&context_buffer, sizeof (context_buffer)); sdma_write_words((unsigned long *)&context_buffer, CHANNEL_CONTEXT_ADDR(channel), sizeof (context_buffer)/4); -- cgit v1.2.3