adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 19:56:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

ASoC: au1x: psc-ac97: reorganize timeouts

Browse source 
Codec read/write functions: wait 21us between the pokings of hardware.
Add timeouts to unbounded loops waiting for bits to change.

Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Manuel Lauss 2009-10-19 16:10:59 +02:00 committed by Mark Brown
parent e697cd410a
commit 8d567b6b44
1 changed files with 25 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
sound/soc/au1x/psc-ac97.c
View file

@ -75,10 +75,12 @@ static unsigned short au1xpsc_ac97_read(struct snd_ac97 *ac97,
AC97_CDC(pscdata)); AC97_CDC(pscdata));
au_sync(); au_sync();
tmo = 2000; tmo = 20;
while ((!(au_readl(AC97_EVNT(pscdata)) & PSC_AC97EVNT_CD)) do {
&& --tmo) udelay(21);
udelay(2); if (au_readl(AC97_EVNT(pscdata)) & PSC_AC97EVNT_CD)
break;
} while (--tmo);
data = au_readl(AC97_CDC(pscdata)); data = au_readl(AC97_CDC(pscdata));
@ -114,10 +116,12 @@ static void au1xpsc_ac97_write(struct snd_ac97 *ac97, unsigned short reg,
AC97_CDC(pscdata)); AC97_CDC(pscdata));
au_sync(); au_sync();
tmo = 2000; tmo = 20;
while ((!(au_readl(AC97_EVNT(pscdata)) & PSC_AC97EVNT_CD)) do {
&& --tmo) udelay(21);
udelay(2); if (au_readl(AC97_EVNT(pscdata)) & PSC_AC97EVNT_CD)
break;
} while (--tmo);
au_writel(PSC_AC97EVNT_CD, AC97_EVNT(pscdata)); au_writel(PSC_AC97EVNT_CD, AC97_EVNT(pscdata));
au_sync(); au_sync();
@ -200,7 +204,7 @@ static int au1xpsc_ac97_hw_params(struct snd_pcm_substream *substream,
/* FIXME */ /* FIXME */
struct au1xpsc_audio_data *pscdata = au1xpsc_ac97_workdata; struct au1xpsc_audio_data *pscdata = au1xpsc_ac97_workdata;
unsigned long r, ro, stat; unsigned long r, ro, stat;
int chans, stype = SUBSTREAM_TYPE(substream); int chans, t, stype = SUBSTREAM_TYPE(substream);
chans = params_channels(params); chans = params_channels(params);
@ -242,8 +246,12 @@ static int au1xpsc_ac97_hw_params(struct snd_pcm_substream *substream,
au_sync(); au_sync();
/* ...wait for it... */ /* ...wait for it... */
while (au_readl(AC97_STAT(pscdata)) & PSC_AC97STAT_DR) t = 100;
asm volatile ("nop"); while ((au_readl(AC97_STAT(pscdata)) & PSC_AC97STAT_DR) && --t)
msleep(1);
if (!t)
printk(KERN_ERR "PSC-AC97: can't disable!\n");
/* ...write config... */ /* ...write config... */
au_writel(r, AC97_CFG(pscdata)); au_writel(r, AC97_CFG(pscdata));
@ -254,8 +262,12 @@ static int au1xpsc_ac97_hw_params(struct snd_pcm_substream *substream,
au_sync(); au_sync();
/* ...and wait for ready bit */ /* ...and wait for ready bit */
while (!(au_readl(AC97_STAT(pscdata)) & PSC_AC97STAT_DR)) t = 100;
asm volatile ("nop"); while ((!(au_readl(AC97_STAT(pscdata)) & PSC_AC97STAT_DR)) && --t)
msleep(1);
if (!t)
printk(KERN_ERR "PSC-AC97: can't enable!\n");
mutex_unlock(&pscdata->lock); mutex_unlock(&pscdata->lock);