- Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH V2] Modify mpc5200 AC97 driver to use V9 of spin_event_timeout()
by Jon Smirl 27 May '09

27 May '09

The function signature for spin_event_timeout() has changed in version V9. Adjust the mpc5200 AC97 driver to use the new function. v2 - switch back to udelay() for fixed timeouts. Signed-off-by: Jon Smirl <jonsmirl(a)gmail.com> --- sound/soc/fsl/mpc5200_psc_ac97.c | 30 ++++++++++++++---------------- 1 files changed, 14 insertions(+), 16 deletions(-) diff --git a/sound/soc/fsl/mpc5200_psc_ac97.c b/sound/soc/fsl/mpc5200_psc_ac97.c index 9f2df15..4342b51 100644 --- a/sound/soc/fsl/mpc5200_psc_ac97.c +++ b/sound/soc/fsl/mpc5200_psc_ac97.c @@ -31,13 +31,13 @@ static struct psc_dma *psc_dma; static unsigned short psc_ac97_read(struct snd_ac97 *ac97, unsigned short reg) { - int rc; + int status; unsigned int val; /* Wait for command send status zero = ready */ - spin_event_timeout(!(in_be16(&psc_dma->psc_regs->sr_csr.status) & - MPC52xx_PSC_SR_CMDSEND), 100, 0, rc); - if (rc == 0) { + status= spin_event_timeout(!(in_be16(&psc_dma->psc_regs->sr_csr.status) & + MPC52xx_PSC_SR_CMDSEND), 100, 0); + if (status == 0) { pr_err("timeout on ac97 bus (rdy)\n"); return -ENODEV; } @@ -45,9 +45,9 @@ static unsigned short psc_ac97_read(struct snd_ac97 *ac97, unsigned short reg) out_be32(&psc_dma->psc_regs->ac97_cmd, (1<<31) | ((reg & 0x7f) << 24)); /* Wait for the answer */ - spin_event_timeout((in_be16(&psc_dma->psc_regs->sr_csr.status) & - MPC52xx_PSC_SR_DATA_VAL), 100, 0, rc); - if (rc == 0) { + status = spin_event_timeout((in_be16(&psc_dma->psc_regs->sr_csr.status) & + MPC52xx_PSC_SR_DATA_VAL), 100, 0); + if (status == 0) { pr_err("timeout on ac97 read (val) %x\n", in_be16(&psc_dma->psc_regs->sr_csr.status)); return -ENODEV; @@ -66,12 +66,12 @@ static unsigned short psc_ac97_read(struct snd_ac97 *ac97, unsigned short reg) static void psc_ac97_write(struct snd_ac97 *ac97, unsigned short reg, unsigned short val) { - int rc; + int status; /* Wait for command status zero = ready */ - spin_event_timeout(!(in_be16(&psc_dma->psc_regs->sr_csr.status) & - MPC52xx_PSC_SR_CMDSEND), 100, 0, rc); - if (rc == 0) { + status = spin_event_timeout(!(in_be16(&psc_dma->psc_regs->sr_csr.status) & + MPC52xx_PSC_SR_CMDSEND), 100, 0); + if (status == 0) { pr_err("timeout on ac97 bus (write)\n"); return; } @@ -82,24 +82,22 @@ static void psc_ac97_write(struct snd_ac97 *ac97, static void psc_ac97_warm_reset(struct snd_ac97 *ac97) { - int rc; struct mpc52xx_psc __iomem *regs = psc_dma->psc_regs; out_be32(&regs->sicr, psc_dma->sicr | MPC52xx_PSC_SICR_AWR); - spin_event_timeout(0, 3, 0, rc); + udelay(3); out_be32(&regs->sicr, psc_dma->sicr); } static void psc_ac97_cold_reset(struct snd_ac97 *ac97) { - int rc; struct mpc52xx_psc __iomem *regs = psc_dma->psc_regs; /* Do a cold reset */ out_8(&regs->op1, MPC52xx_PSC_OP_RES); - spin_event_timeout(0, 10, 0, rc); + udelay(10); out_8(&regs->op0, MPC52xx_PSC_OP_RES); - spin_event_timeout(0, 50, 0, rc); + udelat(50); psc_ac97_warm_reset(ac97); }

2 1

[alsa-devel] spdif/iec958 outputs at VT1708S not recognized
by Sentinel 27 May '09

27 May '09

Okay I figured out my own problem. This is specific to those who run 64bit OS. for anyone who is getting register_sound_special_device error when attempting to compile ALSA, on a 64 bit OS make sure your running your configure properly. Most likely your distro has ALSA libraries located in the /usr/lib64 path not in /usr/lib and most likely the ld.so.conf is set to look in /usr/lib64 before it searches /usr/lib which is the default for the configure script. As a warning I'd not try to change that order especially if you have built any 32bit compatibility drivers into /usr/lib ./configure -prefix=/usr/lib64 Although it wouldn't be a bad idea for the configure to detect that if possible.

2 1

[alsa-devel] [PATCH V3] Modify mpc5200 AC97 driver to use V9 of spin_event_timeout()
by Jon Smirl 27 May '09

27 May '09

The function signature for spin_event_timeout() has changed in version V9. Adjust the mpc5200 AC97 driver to use the new function. v2 - switch back to udelay() for fixed timeouts. v3 - forgot about driver being market broken, fix typo Signed-off-by: Jon Smirl <jonsmirl(a)gmail.com> --- sound/soc/fsl/mpc5200_psc_ac97.c | 30 ++++++++++++++---------------- 1 files changed, 14 insertions(+), 16 deletions(-) diff --git a/sound/soc/fsl/mpc5200_psc_ac97.c b/sound/soc/fsl/mpc5200_psc_ac97.c index 9f2df15..794a247 100644 --- a/sound/soc/fsl/mpc5200_psc_ac97.c +++ b/sound/soc/fsl/mpc5200_psc_ac97.c @@ -31,13 +31,13 @@ static struct psc_dma *psc_dma; static unsigned short psc_ac97_read(struct snd_ac97 *ac97, unsigned short reg) { - int rc; + int status; unsigned int val; /* Wait for command send status zero = ready */ - spin_event_timeout(!(in_be16(&psc_dma->psc_regs->sr_csr.status) & - MPC52xx_PSC_SR_CMDSEND), 100, 0, rc); - if (rc == 0) { + status = spin_event_timeout(!(in_be16(&psc_dma->psc_regs->sr_csr.status) & + MPC52xx_PSC_SR_CMDSEND), 100, 0); + if (status == 0) { pr_err("timeout on ac97 bus (rdy)\n"); return -ENODEV; } @@ -45,9 +45,9 @@ static unsigned short psc_ac97_read(struct snd_ac97 *ac97, unsigned short reg) out_be32(&psc_dma->psc_regs->ac97_cmd, (1<<31) | ((reg & 0x7f) << 24)); /* Wait for the answer */ - spin_event_timeout((in_be16(&psc_dma->psc_regs->sr_csr.status) & - MPC52xx_PSC_SR_DATA_VAL), 100, 0, rc); - if (rc == 0) { + status = spin_event_timeout((in_be16(&psc_dma->psc_regs->sr_csr.status) & + MPC52xx_PSC_SR_DATA_VAL), 100, 0); + if (status == 0) { pr_err("timeout on ac97 read (val) %x\n", in_be16(&psc_dma->psc_regs->sr_csr.status)); return -ENODEV; @@ -66,12 +66,12 @@ static unsigned short psc_ac97_read(struct snd_ac97 *ac97, unsigned short reg) static void psc_ac97_write(struct snd_ac97 *ac97, unsigned short reg, unsigned short val) { - int rc; + int status; /* Wait for command status zero = ready */ - spin_event_timeout(!(in_be16(&psc_dma->psc_regs->sr_csr.status) & - MPC52xx_PSC_SR_CMDSEND), 100, 0, rc); - if (rc == 0) { + status = spin_event_timeout(!(in_be16(&psc_dma->psc_regs->sr_csr.status) & + MPC52xx_PSC_SR_CMDSEND), 100, 0); + if (status == 0) { pr_err("timeout on ac97 bus (write)\n"); return; } @@ -82,24 +82,22 @@ static void psc_ac97_write(struct snd_ac97 *ac97, static void psc_ac97_warm_reset(struct snd_ac97 *ac97) { - int rc; struct mpc52xx_psc __iomem *regs = psc_dma->psc_regs; out_be32(&regs->sicr, psc_dma->sicr | MPC52xx_PSC_SICR_AWR); - spin_event_timeout(0, 3, 0, rc); + udelay(3); out_be32(&regs->sicr, psc_dma->sicr); } static void psc_ac97_cold_reset(struct snd_ac97 *ac97) { - int rc; struct mpc52xx_psc __iomem *regs = psc_dma->psc_regs; /* Do a cold reset */ out_8(&regs->op1, MPC52xx_PSC_OP_RES); - spin_event_timeout(0, 10, 0, rc); + udelay(10); out_8(&regs->op0, MPC52xx_PSC_OP_RES); - spin_event_timeout(0, 50, 0, rc); + udelay(50); psc_ac97_warm_reset(ac97); }

1 0

[alsa-devel] [PATCH] Modify mpc5200 AC97 driver to use V9 of spin_event_timeout()
by Jon Smirl 27 May '09

27 May '09

The function signature for spin_event_timeout() has changed in version V9. Adjust the mpc5200 AC97 driver to use the new function. Signed-off-by: Jon Smirl <jonsmirl(a)gmail.com> --- sound/soc/fsl/mpc5200_psc_ac97.c | 30 ++++++++++++++---------------- 1 files changed, 14 insertions(+), 16 deletions(-) diff --git a/sound/soc/fsl/mpc5200_psc_ac97.c b/sound/soc/fsl/mpc5200_psc_ac97.c index 9f2df15..bab80ac 100644 --- a/sound/soc/fsl/mpc5200_psc_ac97.c +++ b/sound/soc/fsl/mpc5200_psc_ac97.c @@ -31,13 +31,13 @@ static struct psc_dma *psc_dma; static unsigned short psc_ac97_read(struct snd_ac97 *ac97, unsigned short reg) { - int rc; + int status; unsigned int val; /* Wait for command send status zero = ready */ - spin_event_timeout(!(in_be16(&psc_dma->psc_regs->sr_csr.status) & - MPC52xx_PSC_SR_CMDSEND), 100, 0, rc); - if (rc == 0) { + status= spin_event_timeout(!(in_be16(&psc_dma->psc_regs->sr_csr.status) & + MPC52xx_PSC_SR_CMDSEND), 100, 0); + if (status == 0) { pr_err("timeout on ac97 bus (rdy)\n"); return -ENODEV; } @@ -45,9 +45,9 @@ static unsigned short psc_ac97_read(struct snd_ac97 *ac97, unsigned short reg) out_be32(&psc_dma->psc_regs->ac97_cmd, (1<<31) | ((reg & 0x7f) << 24)); /* Wait for the answer */ - spin_event_timeout((in_be16(&psc_dma->psc_regs->sr_csr.status) & - MPC52xx_PSC_SR_DATA_VAL), 100, 0, rc); - if (rc == 0) { + status = spin_event_timeout((in_be16(&psc_dma->psc_regs->sr_csr.status) & + MPC52xx_PSC_SR_DATA_VAL), 100, 0); + if (status == 0) { pr_err("timeout on ac97 read (val) %x\n", in_be16(&psc_dma->psc_regs->sr_csr.status)); return -ENODEV; @@ -66,12 +66,12 @@ static unsigned short psc_ac97_read(struct snd_ac97 *ac97, unsigned short reg) static void psc_ac97_write(struct snd_ac97 *ac97, unsigned short reg, unsigned short val) { - int rc; + int status; /* Wait for command status zero = ready */ - spin_event_timeout(!(in_be16(&psc_dma->psc_regs->sr_csr.status) & - MPC52xx_PSC_SR_CMDSEND), 100, 0, rc); - if (rc == 0) { + status = spin_event_timeout(!(in_be16(&psc_dma->psc_regs->sr_csr.status) & + MPC52xx_PSC_SR_CMDSEND), 100, 0); + if (status == 0) { pr_err("timeout on ac97 bus (write)\n"); return; } @@ -82,24 +82,22 @@ static void psc_ac97_write(struct snd_ac97 *ac97, static void psc_ac97_warm_reset(struct snd_ac97 *ac97) { - int rc; struct mpc52xx_psc __iomem *regs = psc_dma->psc_regs; out_be32(&regs->sicr, psc_dma->sicr | MPC52xx_PSC_SICR_AWR); - spin_event_timeout(0, 3, 0, rc); + spin_event_timeout(0, 3, 0); out_be32(&regs->sicr, psc_dma->sicr); } static void psc_ac97_cold_reset(struct snd_ac97 *ac97) { - int rc; struct mpc52xx_psc __iomem *regs = psc_dma->psc_regs; /* Do a cold reset */ out_8(&regs->op1, MPC52xx_PSC_OP_RES); - spin_event_timeout(0, 10, 0, rc); + spin_event_timeout(0, 10, 0); out_8(&regs->op0, MPC52xx_PSC_OP_RES); - spin_event_timeout(0, 50, 0, rc); + spin_event_timeout(0, 50, 0); psc_ac97_warm_reset(ac97); }

3 8

[alsa-devel] spdif/iec958 outputs at VT1708S not recognized
by Sentinel 27 May '09

27 May '09

Well I guess not it still didn't work and its not -prefix= its -libdir=

1 0

[alsa-devel] [PATCH] ASoC: Switch FSL SSI DAI over to symmetric_rates
by Mark Brown 27 May '09

27 May '09

The effect of symmetric_constraints should provide a standard way to enforce the use of the same sample rate for both directions. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/fsl/fsl_ssi.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 47afaa9..93f0f38 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -375,18 +375,14 @@ static int fsl_ssi_startup(struct snd_pcm_substream *substream, struct snd_pcm_runtime *first_runtime = ssi_private->first_stream->runtime; - if (!first_runtime->rate || !first_runtime->sample_bits) { + if (!first_runtime->sample_bits) { dev_err(substream->pcm->card->dev, - "set sample rate and size in %s stream first\n", + "set sample size in %s stream first\n", substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? "capture" : "playback"); return -EAGAIN; } - snd_pcm_hw_constraint_minmax(substream->runtime, - SNDRV_PCM_HW_PARAM_RATE, - first_runtime->rate, first_runtime->rate); - /* If we're in synchronous mode, then we need to constrain * the sample size as well. We don't support independent sample * rates in asynchronous mode. @@ -693,6 +689,7 @@ struct snd_soc_dai *fsl_ssi_create_dai(struct fsl_ssi_info *ssi_info) fsl_ssi_dai->name = ssi_private->name; fsl_ssi_dai->id = ssi_info->id; fsl_ssi_dai->dev = ssi_info->dev; + fsl_ssi_dai->symmetric_rates = 1; ret = snd_soc_register_dai(fsl_ssi_dai); if (ret != 0) { -- 1.6.3.1

2 1

[alsa-devel] [PATCH V5 0/5] AC97 driver for mpc5200
by Jon Smirl 26 May '09

26 May '09

Version 5. Modified to use spin_event_timeout() as originally written. --- Jon Smirl (5): Fabric bindings for STAC9766 on the Efika Support for AC97 on Phytec pmc030 base board. AC97 driver for mpc5200 Main rewite of the mpc5200 audio DMA code powerpc: introduce macro spin_event_timeout() arch/powerpc/include/asm/delay.h | 33 +++ sound/soc/fsl/Kconfig | 27 ++ sound/soc/fsl/Makefile | 5 sound/soc/fsl/efika-audio-fabric.c | 90 +++++++ sound/soc/fsl/mpc5200_dma.c | 442 ++++++++++++++++++++++------------- sound/soc/fsl/mpc5200_dma.h | 33 +-- sound/soc/fsl/mpc5200_psc_ac97.c | 331 ++++++++++++++++++++++++++ sound/soc/fsl/mpc5200_psc_ac97.h | 15 + sound/soc/fsl/mpc5200_psc_i2s.c | 247 +++----------------- sound/soc/fsl/mpc5200_psc_i2s.h | 12 + sound/soc/fsl/pcm030-audio-fabric.c | 90 +++++++ 11 files changed, 934 insertions(+), 391 deletions(-) create mode 100644 sound/soc/fsl/efika-audio-fabric.c create mode 100644 sound/soc/fsl/mpc5200_psc_ac97.c create mode 100644 sound/soc/fsl/mpc5200_psc_ac97.h create mode 100644 sound/soc/fsl/mpc5200_psc_i2s.h create mode 100644 sound/soc/fsl/pcm030-audio-fabric.c -- Jon Smirl jonsmirl(a)gmail.com

3 9

[alsa-devel] spdif/iec958 outputs at VT1708S not recognized
by Sentinel 26 May '09

26 May '09

I tried using the snapshot because I was having the same problem as Peter was. No spdif out on my vt1708s. Unfortunately for me my build didn't go quite as well, for some reason I had 2 undefined which make the snd.ko fail to load. Is there something that I'm missing? I am running slamd64 distro current, with the latest kernel along with the alsa kernel patch "2.6.29.4-rt15". Please help. Building modules, stage 2. MODPOST 131 modules WARNING: "register_sound_special_device" [/usr/src/alsa-driver/acore/snd.ko] undefined! WARNING: "unregister_sound_special" [/usr/src/alsa-driver/acore/snd.ko] undefined! make[1]: Leaving directory `/usr/src/linux-2.6.29.4' utils/link-modules /usr/src/alsa-driver

1 0

[alsa-devel] [PATCH V4 0/5] AC97 driver for mpc5200
by Jon Smirl 26 May '09

26 May '09

Version 4. Changed timeouts to use relax_cpu() instead of udelay(). Fixed locking to lock bestcomm instead of registers. Code reorg as requested in the various comments. Removed sysfs over/underrun reporting. Removed reset retries. Removing the retries makes the driver fail to load about 5% of the time. An oscilliscope is needed to figure out what is going on with failed resets. Both pcm030 and Efika ocasionally fail to reset and they use different codec chips. --- Jon Smirl (5): Fabric bindings for STAC9766 on the Efika Support for AC97 on Phytec pmc030 base board. AC97 driver for mpc5200 Main rewite of the mpc5200 audio DMA code The macro spin_event_timeout() takes a condition and timeout value arch/powerpc/include/asm/delay.h | 33 +++ sound/soc/fsl/Kconfig | 27 ++ sound/soc/fsl/Makefile | 5 sound/soc/fsl/efika-audio-fabric.c | 90 +++++++ sound/soc/fsl/mpc5200_dma.c | 442 ++++++++++++++++++++++------------- sound/soc/fsl/mpc5200_dma.h | 43 ++- sound/soc/fsl/mpc5200_psc_ac97.c | 331 ++++++++++++++++++++++++++ sound/soc/fsl/mpc5200_psc_ac97.h | 15 + sound/soc/fsl/mpc5200_psc_i2s.c | 247 +++----------------- sound/soc/fsl/mpc5200_psc_i2s.h | 12 + sound/soc/fsl/pcm030-audio-fabric.c | 90 +++++++ 11 files changed, 946 insertions(+), 389 deletions(-) create mode 100644 sound/soc/fsl/efika-audio-fabric.c create mode 100644 sound/soc/fsl/mpc5200_psc_ac97.c create mode 100644 sound/soc/fsl/mpc5200_psc_ac97.h create mode 100644 sound/soc/fsl/mpc5200_psc_i2s.h create mode 100644 sound/soc/fsl/pcm030-audio-fabric.c -- Jon Smirl jonsmirl(a)gmail.com

7 24

[alsa-devel] Fixes in intel8x0.c
by Pavel Hofman 26 May '09

26 May '09

Hi, while trying to dive into complexities of intel8x0.c I found the following: static struct snd_pci_quirk intel8x0_clock_list[] __devinitdata = { SND_PCI_QUIRK(0x0e11, 0x008a, "AD1885", 41000), SND_PCI_QUIRK(0x1028, 0x00be, "AD1885", 44100), ..... Is it really supposed to be 41000, instead of 44100? In static int snd_intel8x0_pcm_open(struct snd_pcm_substream *substream, struct ichdev *ichdev) ... runtime->hw.rates = ichdev->pcm->rates; The pcm field in ichdev is snd_ac97, while the rates field in snd_ac97 is defined unsigned int rates[6]; /* see AC97_RATES_* defines */ I guess this way always rates[0] from the list is taken, unlike e.g. in via82xx.c: runtime->hw.rates = chip->ac97->rates[AC97_RATES_SPDIF]; It seems a bug to me, though I may be wrong of course. Thanks and regards, Pavel

2 5