summaryrefslogtreecommitdiffstats
path: root/firmware/target/arm/imx233/pcm-imx233.c
diff options
context:
space:
mode:
authorAmaury Pouly <amaury.pouly@gmail.com>2012-05-20 01:23:17 +0200
committerAmaury Pouly <amaury.pouly@gmail.com>2012-05-20 01:35:25 +0200
commit1b6e8cba62d0ea12bc39b0e3f60f66c3892ca1ff (patch)
tree9d034e05f485b42f837a509ff91844c0f7432be5 /firmware/target/arm/imx233/pcm-imx233.c
parent1adc47477144e701dcb1184f907887eadec05fda (diff)
downloadrockbox-1b6e8cba62d0ea12bc39b0e3f60f66c3892ca1ff.tar.gz
rockbox-1b6e8cba62d0ea12bc39b0e3f60f66c3892ca1ff.tar.bz2
rockbox-1b6e8cba62d0ea12bc39b0e3f60f66c3892ca1ff.zip
imx233: make sure dma descriptors are cache friendly
Because DMA descriptors needs to be committed and discarded from the cache, if they are not cache aligned and/or if their size is not a multiple of cache ligne, nasty side effects could occur with adjacents data. The same applies to DMA buffers which are still potentially broken. Add a macro to ensure that these constraints will not break by error in the future. Change-Id: I1dd69a5a9c29796c156d953eaa57c0d281e79846
Diffstat (limited to 'firmware/target/arm/imx233/pcm-imx233.c')
-rw-r--r--firmware/target/arm/imx233/pcm-imx233.c19
1 files changed, 14 insertions, 5 deletions
diff --git a/firmware/target/arm/imx233/pcm-imx233.c b/firmware/target/arm/imx233/pcm-imx233.c
index e94260e457..5cce1591fa 100644
--- a/firmware/target/arm/imx233/pcm-imx233.c
+++ b/firmware/target/arm/imx233/pcm-imx233.c
@@ -26,8 +26,17 @@
#include "pcm-internal.h"
#include "audioout-imx233.h"
+struct pcm_dma_command_t
+{
+ struct apb_dma_command_t dma;
+ /* padded to next multiple of cache line size (32 bytes) */
+ uint32_t pad[5];
+} __attribute__((packed)) CACHEALIGN_ATTR;
+
+__ENSURE_STRUCT_CACHE_FRIENDLY(struct pcm_dma_command_t)
+
static int locked = 0;
-static struct apb_dma_command_t dac_dma;
+static struct pcm_dma_command_t dac_dma;
static bool pcm_freezed = false;
/**
@@ -37,14 +46,14 @@ static bool pcm_freezed = false;
static void play(const void *addr, size_t size)
{
- dac_dma.next = NULL;
- dac_dma.buffer = (void *)addr;
- dac_dma.cmd = HW_APB_CHx_CMD__COMMAND__READ |
+ dac_dma.dma.next = NULL;
+ dac_dma.dma.buffer = (void *)addr;
+ dac_dma.dma.cmd = HW_APB_CHx_CMD__COMMAND__READ |
HW_APB_CHx_CMD__IRQONCMPLT |
HW_APB_CHx_CMD__SEMAPHORE |
size << HW_APB_CHx_CMD__XFER_COUNT_BP;
/* dma subsystem will make sure cached stuff is written to memory */
- imx233_dma_start_command(APB_AUDIO_DAC, &dac_dma);
+ imx233_dma_start_command(APB_AUDIO_DAC, &dac_dma.dma);
}
void INT_DAC_DMA(void)