korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 12:28:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

[ALSA] protect Dreamcast PCM driver (AICA) from G2 bus effects

Browse Source 
The G2 bus on the SEGA Dreamcast connects both the maple peripheral
bus and the AICA sound memory. DMA requests on one can cause the other
to timeout on memory operations.
This patch prevents maple interrupts from causing hiccoughs in the
AICA sound (maple bus code will land in 2.6.24).
There are other cleanups for this (AICA) code - but this is in effect
a regression fix rather than a cleanup.

Signed-off-by: Adrian McMenamin <adrian@mcmen.demon.co.uk>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Adrian McMenamin 2007-10-18 10:46:59 +02:00 committed by Jaroslav Kysela
parent e5ab3a7c00
commit 44e0b6821d
1 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
sound/sh/aica.c
View File

@ -106,11 +106,14 @@ static void spu_write_wait(void)
static void spu_memset(u32 toi, u32 what, int length) static void spu_memset(u32 toi, u32 what, int length)
{ {
int i; int i;
unsigned long flags;
snd_assert(length % 4 == 0, return); snd_assert(length % 4 == 0, return);
for (i = 0; i < length; i++) { for (i = 0; i < length; i++) {
if (!(i % 8)) if (!(i % 8))
spu_write_wait(); spu_write_wait();
local_irq_save(flags);
writel(what, toi + SPU_MEMORY_BASE); writel(what, toi + SPU_MEMORY_BASE);
local_irq_restore(flags);
toi++; toi++;
} }
} }
@ -118,6 +121,7 @@ static void spu_memset(u32 toi, u32 what, int length)
/* spu_memload - write to SPU address space */ /* spu_memload - write to SPU address space */
static void spu_memload(u32 toi, void *from, int length) static void spu_memload(u32 toi, void *from, int length)
{ {
unsigned long flags;
u32 *froml = from; u32 *froml = from;
u32 __iomem *to = (u32 __iomem *) (SPU_MEMORY_BASE + toi); u32 __iomem *to = (u32 __iomem *) (SPU_MEMORY_BASE + toi);
int i; int i;
@ -128,7 +132,9 @@ static void spu_memload(u32 toi, void *from, int length)
if (!(i % 8)) if (!(i % 8))
spu_write_wait(); spu_write_wait();
val = *froml; val = *froml;
local_irq_save(flags);
writel(val, to); writel(val, to);
local_irq_restore(flags);
froml++; froml++;
to++; to++;
} }
@ -138,28 +144,36 @@ static void spu_memload(u32 toi, void *from, int length)
static void spu_disable(void) static void spu_disable(void)
{ {
int i; int i;
unsigned long flags;
u32 regval; u32 regval;
spu_write_wait(); spu_write_wait();
regval = readl(ARM_RESET_REGISTER); regval = readl(ARM_RESET_REGISTER);
regval |= 1; regval |= 1;
spu_write_wait(); spu_write_wait();
local_irq_save(flags);
writel(regval, ARM_RESET_REGISTER); writel(regval, ARM_RESET_REGISTER);
local_irq_restore(flags);
for (i = 0; i < 64; i++) { for (i = 0; i < 64; i++) {
spu_write_wait(); spu_write_wait();
regval = readl(SPU_REGISTER_BASE + (i * 0x80)); regval = readl(SPU_REGISTER_BASE + (i * 0x80));
regval = (regval & ~0x4000) | 0x8000; regval = (regval & ~0x4000) | 0x8000;
spu_write_wait(); spu_write_wait();
local_irq_save(flags);
writel(regval, SPU_REGISTER_BASE + (i * 0x80)); writel(regval, SPU_REGISTER_BASE + (i * 0x80));
local_irq_restore(flags);
} }
} }
/* spu_enable - set spu registers to enable sound output */ /* spu_enable - set spu registers to enable sound output */
static void spu_enable(void) static void spu_enable(void)
{ {
unsigned long flags;
u32 regval = readl(ARM_RESET_REGISTER); u32 regval = readl(ARM_RESET_REGISTER);
regval &= ~1; regval &= ~1;
spu_write_wait(); spu_write_wait();
local_irq_save(flags);
writel(regval, ARM_RESET_REGISTER); writel(regval, ARM_RESET_REGISTER);
local_irq_restore(flags);
} }
/* /*
@ -168,25 +182,34 @@ static void spu_enable(void)
*/ */
static void spu_reset(void) static void spu_reset(void)
{ {
unsigned long flags;
spu_disable(); spu_disable();
spu_memset(0, 0, 0x200000 / 4); spu_memset(0, 0, 0x200000 / 4);
/* Put ARM7 in endless loop */ /* Put ARM7 in endless loop */
local_irq_save(flags);
ctrl_outl(0xea000002, SPU_MEMORY_BASE); ctrl_outl(0xea000002, SPU_MEMORY_BASE);
local_irq_restore(flags);
spu_enable(); spu_enable();
} }
/* aica_chn_start - write to spu to start playback */ /* aica_chn_start - write to spu to start playback */
static void aica_chn_start(void) static void aica_chn_start(void)
{ {
unsigned long flags;
spu_write_wait(); spu_write_wait();
local_irq_save(flags);
writel(AICA_CMD_KICK | AICA_CMD_START, (u32 *) AICA_CONTROL_POINT); writel(AICA_CMD_KICK | AICA_CMD_START, (u32 *) AICA_CONTROL_POINT);
local_irq_restore(flags);
} }
/* aica_chn_halt - write to spu to halt playback */ /* aica_chn_halt - write to spu to halt playback */
static void aica_chn_halt(void) static void aica_chn_halt(void)
{ {
unsigned long flags;
spu_write_wait(); spu_write_wait();
local_irq_save(flags);
writel(AICA_CMD_KICK | AICA_CMD_STOP, (u32 *) AICA_CONTROL_POINT); writel(AICA_CMD_KICK | AICA_CMD_STOP, (u32 *) AICA_CONTROL_POINT);
local_irq_restore(flags);
} }
/* ALSA code below */ /* ALSA code below */
@ -213,12 +236,13 @@ static int aica_dma_transfer(int channels, int buffer_size,
int q, err, period_offset; int q, err, period_offset;
struct snd_card_aica *dreamcastcard; struct snd_card_aica *dreamcastcard;
struct snd_pcm_runtime *runtime; struct snd_pcm_runtime *runtime;
err = 0; unsigned long flags;
dreamcastcard = substream->pcm->private_data; dreamcastcard = substream->pcm->private_data;
period_offset = dreamcastcard->clicks; period_offset = dreamcastcard->clicks;
period_offset %= (AICA_PERIOD_NUMBER / channels); period_offset %= (AICA_PERIOD_NUMBER / channels);
runtime = substream->runtime; runtime = substream->runtime;
for (q = 0; q < channels; q++) { for (q = 0; q < channels; q++) {
local_irq_save(flags);
err = dma_xfer(AICA_DMA_CHANNEL, err = dma_xfer(AICA_DMA_CHANNEL,
(unsigned long) (runtime->dma_area + (unsigned long) (runtime->dma_area +
(AICA_BUFFER_SIZE * q) / (AICA_BUFFER_SIZE * q) /
@ -228,9 +252,12 @@ static int aica_dma_transfer(int channels, int buffer_size,
AICA_CHANNEL0_OFFSET + q * CHANNEL_OFFSET + AICA_CHANNEL0_OFFSET + q * CHANNEL_OFFSET +
AICA_PERIOD_SIZE * period_offset, AICA_PERIOD_SIZE * period_offset,
buffer_size / channels, AICA_DMA_MODE); buffer_size / channels, AICA_DMA_MODE);
if (unlikely(err < 0)) if (unlikely(err < 0)) {
local_irq_restore(flags);
break; break;
}
dma_wait_for_completion(AICA_DMA_CHANNEL); dma_wait_for_completion(AICA_DMA_CHANNEL);
local_irq_restore(flags);
} }
return err; return err;
} }