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

Re: [alsa-devel] [PATCH] sscape: convert to firmware loader framework
by krzysztof.h1＠poczta.fm 29 Sep '09

29 Sep '09

Please drop this patch. It does not compile because it includes removed sscape_ioctl.h. I will send updated patch. Best regards, Krzysztof "Krzysztof Helt" <krzysztof.h1(a)poczta.fm> pisze: > The conversion solves the problem that firmware size was set to 64KB > while non PnP cards have 128KB firmware files. > > An additional post firmware initialization code has been moved > from the OSS driver. > > --- > Now, the MIDI is audible but not correct. It is not played timely. > The sscape_ctl alsa-tool is not needed any more. > > > Documentation/sound/alsa/ALSA-Configuration.txt | 8 +- > include/sound/sscape_ioctl.h | 21 -- > sound/isa/Kconfig | 8 +- > sound/isa/sscape.c | 305 > +++++++---------------- > 4 files changed, 101 insertions(+), 241 deletions(-) > delete mode 100644 include/sound/sscape_ioctl.h > > diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt > b/Documentation/sound/alsa/ALSA-Configuration.txt > index 1c8eb45..cf98525 100644 > --- a/Documentation/sound/alsa/ALSA-Configuration.txt > +++ b/Documentation/sound/alsa/ALSA-Configuration.txt > @@ -1631,7 +1631,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' > prefix. This was removed. > Module snd-sscape > ----------------- > > - Module for ENSONIQ SoundScape PnP cards. > + Module for ENSONIQ SoundScape cards. > > port - Port # (PnP setup) > wss_port - WSS Port # (PnP setup) > @@ -1640,9 +1640,9 @@ Prior to version 0.9.0rc4 options had a 'snd_' > prefix. This was removed. > dma - DMA # (PnP setup) > dma2 - 2nd DMA # (PnP setup, -1 to disable) > > - This module supports multiple cards. ISA PnP must be enabled. > - You need sscape_ctl tool in alsa-tools package for loading > - the microcode. > + This module supports multiple cards. > + > + The driver requires the firmware loader support on kernel. > > Module snd-sun-amd7930 (on sparc only) > -------------------------------------- > diff --git a/include/sound/sscape_ioctl.h b/include/sound/sscape_ioctl.h > deleted file mode 100644 > index 0d88859..0000000 > --- a/include/sound/sscape_ioctl.h > +++ /dev/null > @@ -1,21 +0,0 @@ > -#ifndef SSCAPE_IOCTL_H > -#define SSCAPE_IOCTL_H > - > - > -struct sscape_bootblock > -{ > - unsigned char code[256]; > - unsigned version; > -}; > - > -#define SSCAPE_MICROCODE_SIZE 65536 > - > -struct sscape_microcode > -{ > - unsigned char __user *code; > -}; > - > -#define SND_SSCAPE_LOAD_BOOTB _IOWR('P', 100, struct sscape_bootblock) > -#define SND_SSCAPE_LOAD_MCODE _IOW ('P', 101, struct sscape_microcode) > - > -#endif > diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig > index b90fc16..02fe81c 100644 > --- a/sound/isa/Kconfig > +++ b/sound/isa/Kconfig > @@ -372,9 +372,9 @@ config SND_SGALAXY > > config SND_SSCAPE > tristate "Ensoniq SoundScape driver" > - select SND_HWDEP > select SND_MPU401_UART > select SND_WSS_LIB > + select FW_LOADER > help > Say Y here to include support for Ensoniq SoundScape > and Ensoniq OEM soundcards. > @@ -382,7 +382,11 @@ config SND_SSCAPE > The PCM audio is supported on SoundScape Classic, Elite, PnP > and VIVO cards. The supported OEM cards are SPEA Media FX and > Reveal SC-600. > - The MIDI support is very experimental. > + The MIDI support is very experimental and requires binary > + firmware files called "scope.cod" and "sndscape.co?" where the > + ? is digit 0, 1, 2, 3 or 4. The firmware files can be found > + in DOS or Windows driver packages. One has to put the firmware > + files into the /lib/firmware directory. > > To compile this driver as a module, choose M here: the module > will be called snd-sscape. > diff --git a/sound/isa/sscape.c b/sound/isa/sscape.c > index b11c35f..08389a2 100644 > --- a/sound/isa/sscape.c > +++ b/sound/isa/sscape.c > @@ -1,5 +1,5 @@ > /* > - * Low-level ALSA driver for the ENSONIQ SoundScape PnP > + * Low-level ALSA driver for the ENSONIQ SoundScape > * Copyright (c) by Chris Rankin > * > * This driver was written in part using information obtained from > @@ -25,12 +25,12 @@ > #include <linux/err.h> > #include <linux/isa.h> > #include <linux/delay.h> > +#include <linux/firmware.h> > #include <linux/pnp.h> > #include <linux/spinlock.h> > #include <linux/moduleparam.h> > #include <asm/dma.h> > #include <sound/core.h> > -#include <sound/hwdep.h> > #include <sound/wss.h> > #include <sound/mpu401.h> > #include <sound/initval.h> > @@ -39,7 +39,7 @@ > > > MODULE_AUTHOR("Chris Rankin"); > -MODULE_DESCRIPTION("ENSONIQ SoundScape PnP driver"); > +MODULE_DESCRIPTION("ENSONIQ SoundScape driver"); > MODULE_LICENSE("GPL"); > > static int index[SNDRV_CARDS] __devinitdata = SNDRV_DEFAULT_IDX; > @@ -142,14 +142,12 @@ struct soundscape { > struct resource *wss_res; > struct snd_wss *chip; > struct snd_mpu401 *mpu; > - struct snd_hwdep *hw; > > /* > * The MIDI device won't work until we've loaded > * its firmware via a hardware-dependent device IOCTL > */ > spinlock_t fwlock; > - int hw_in_use; > unsigned long midi_usage; > unsigned char midi_vol; > }; > @@ -167,12 +165,6 @@ static inline struct soundscape > *get_mpu401_soundscape(struct snd_mpu401 * mpu) > return (struct soundscape *) (mpu->private_data); > } > > -static inline struct soundscape *get_hwdep_soundscape(struct snd_hwdep * > hw) > -{ > - return (struct soundscape *) (hw->private_data); > -} > - > - > /* > * Allocates some kernel memory that we can use for DMA. > * I think this means that the memory has to map to > @@ -438,14 +430,14 @@ static int host_startup_ack(struct soundscape *s, > unsigned timeout) > * Upload a byte-stream into the SoundScape using DMA channel A. > */ > static int upload_dma_data(struct soundscape *s, > - const unsigned char __user *data, > + const unsigned char *data, > size_t size) > { > unsigned long flags; > struct snd_dma_buffer dma; > int ret; > > - if (!get_dmabuf(&dma, PAGE_ALIGN(size))) > + if (!get_dmabuf(&dma, PAGE_ALIGN(32 * 1024))) > return -ENOMEM; > > spin_lock_irqsave(&s->lock, flags); > @@ -468,35 +460,17 @@ static int upload_dma_data(struct soundscape *s, > sscape_write_unsafe(s->io_base, GA_HMCTL_REG, > sscape_read_unsafe(s->io_base, GA_HMCTL_REG) | 0x80); > > /* > - * Upload the user's data (firmware?) to the SoundScape > + * Upload the firmware to the SoundScape > * board through the DMA channel ... > */ > while (size != 0) { > unsigned long len; > > - /* > - * Apparently, copying to/from userspace can sleep. > - * We are therefore forbidden from holding any > - * spinlocks while we copy ... > - */ > - spin_unlock_irqrestore(&s->lock, flags); > - > - /* > - * Remember that the data that we want to DMA > - * comes from USERSPACE. We have already verified > - * the userspace pointer ... > - */ > len = min(size, dma.bytes); > - len -= __copy_from_user(dma.area, data, len); > + memcpy(dma.area, data, len); > data += len; > size -= len; > > - /* > - * Grab that spinlock again, now that we've > - * finished copying! > - */ > - spin_lock_irqsave(&s->lock, flags); > - > snd_dma_program(s->chip->dma1, dma.addr, len, DMA_MODE_WRITE); > sscape_start_dma_unsafe(s->io_base, GA_DMAA_REG); > if (!sscape_wait_dma_unsafe(s->io_base, GA_DMAA_REG, 5000)) { > @@ -512,6 +486,7 @@ static int upload_dma_data(struct soundscape *s, > } /* while */ > > set_host_mode_unsafe(s->io_base); > + outb(0x0, s->io_base); > > /* > * Boot the board ... (I think) > @@ -537,7 +512,7 @@ _release_dma: > /* > * NOTE!!! We are NOT holding any spinlocks at this point !!! > */ > - sscape_write(s, GA_DMAA_REG, (s->ic_type == IC_ODIE ? 0x70 : 0x40)); > + sscape_write(s, GA_DMAA_REG, (s->ic_type == IC_OPUS ? 0x40 : 0x70)); > free_dmabuf(&dma); > > return ret; > @@ -547,162 +522,70 @@ _release_dma: > * Upload the bootblock(?) into the SoundScape. The only > * purpose of this block of code seems to be to tell > * us which version of the microcode we should be using. > - * > - * NOTE: The boot-block data resides in USER-SPACE!!! > - * However, we have already verified its memory > - * addresses by the time we get here. > */ > -static int sscape_upload_bootblock(struct soundscape *sscape, struct > sscape_bootblock __user *bb) > +static int sscape_upload_bootblock(struct snd_card *card) > { > + struct soundscape *sscape = get_card_soundscape(card); > unsigned long flags; > + const struct firmware *init_fw = NULL; > int data = 0; > int ret; > > - ret = upload_dma_data(sscape, bb->code, sizeof(bb->code)); > - > - spin_lock_irqsave(&sscape->lock, flags); > - if (ret == 0) { > - data = host_read_ctrl_unsafe(sscape->io_base, 100); > - } > - set_midi_mode_unsafe(sscape->io_base); > - spin_unlock_irqrestore(&sscape->lock, flags); > - > - if (ret == 0) { > - if (data < 0) { > - snd_printk(KERN_ERR "sscape: timeout reading firmware versionn"); > - ret = -EAGAIN; > - } > - else if (__copy_to_user(&bb->version, &data, sizeof(bb->version))) { > - ret = -EFAULT; > - } > + ret = request_firmware(&init_fw, "scope.cod", card->dev); > + if (ret < 0) { > + snd_printk(KERN_ERR "Error loading scope.cod"); > + return ret; > } > + ret = upload_dma_data(sscape, init_fw->data, init_fw->size); > > - return ret; > -} > + release_firmware(init_fw); > > -/* > - * Upload the microcode into the SoundScape. The > - * microcode is 64K of data, and if we try to copy > - * it into a local variable then we will SMASH THE > - * KERNEL'S STACK! We therefore leave it in USER > - * SPACE, and save ourselves from copying it at all. > - */ > -static int sscape_upload_microcode(struct soundscape *sscape, > - const struct sscape_microcode __user > *mc) > -{ > - unsigned long flags; > - char __user *code; > - int err; > - > - /* > - * We are going to have to copy this data into a special > - * DMA-able buffer before we can upload it. We shall therefore > - * just check that the data pointer is valid for now. > - * > - * NOTE: This buffer is 64K long! That's WAY too big to > - * copy into a stack-temporary anyway. > - */ > - if ( get_user(code, &mc->code) || > - !access_ok(VERIFY_READ, code, SSCAPE_MICROCODE_SIZE) ) > - return -EFAULT; > + spin_lock_irqsave(&sscape->lock, flags); > + if (ret == 0) > + data = host_read_ctrl_unsafe(sscape->io_base, 100); > > - if ((err = upload_dma_data(sscape, code, SSCAPE_MICROCODE_SIZE)) == 0) > { > - snd_printk(KERN_INFO "sscape: MIDI firmware loadedn"); > - } > + if (data & 0x10) > + sscape_write_unsafe(sscape->io_base, GA_SMCFGA_REG, 0x2f); > > - spin_lock_irqsave(&sscape->lock, flags); > - set_midi_mode_unsafe(sscape->io_base); > spin_unlock_irqrestore(&sscape->lock, flags); > > - initialise_mpu401(sscape->mpu); > + data &= 0xf; > + if (ret == 0 && data > 7) { > + snd_printk(KERN_ERR > + "sscape: timeout reading firmware versionn"); > + ret = -EAGAIN; > + } > > - return err; > + return (ret == 0) ? data : ret; > } > > /* > - * Hardware-specific device functions, to implement special > - * IOCTLs for the SoundScape card. This is how we upload > - * the microcode into the card, for example, and so we > - * must ensure that no two processes can open this device > - * simultaneously, and that we can't open it at all if > - * someone is using the MIDI device. > + * Upload the microcode into the SoundScape. > */ > -static int sscape_hw_open(struct snd_hwdep * hw, struct file *file) > +static int sscape_upload_microcode(struct snd_card *card, int version) > { > - register struct soundscape *sscape = get_hwdep_soundscape(hw); > - unsigned long flags; > + struct soundscape *sscape = get_card_soundscape(card); > + const struct firmware *init_fw = NULL; > + char name[14] = "sndscape.co0"; > int err; > > - spin_lock_irqsave(&sscape->fwlock, flags); > + name[11] = '0' + version; > > - if ((sscape->midi_usage != 0) || sscape->hw_in_use) { > - err = -EBUSY; > - } else { > - sscape->hw_in_use = 1; > - err = 0; > + err = request_firmware(&init_fw, name, card->dev); > + if (err < 0) { > + snd_printk(KERN_ERR "Error loading sndscape.co0"); > + return err; > } > + err = upload_dma_data(sscape, init_fw->data, init_fw->size); > + if (err == 0) > + snd_printk(KERN_INFO "MIDI firmware loaded %d KBsn", > + init_fw->size >> 10); > > - spin_unlock_irqrestore(&sscape->fwlock, flags); > - return err; > -} > - > -static int sscape_hw_release(struct snd_hwdep * hw, struct file *file) > -{ > - register struct soundscape *sscape = get_hwdep_soundscape(hw); > - unsigned long flags; > - > - spin_lock_irqsave(&sscape->fwlock, flags); > - sscape->hw_in_use = 0; > - spin_unlock_irqrestore(&sscape->fwlock, flags); > - return 0; > -} > - > -static int sscape_hw_ioctl(struct snd_hwdep * hw, struct file *file, > - unsigned int cmd, unsigned long arg) > -{ > - struct soundscape *sscape = get_hwdep_soundscape(hw); > - int err = -EBUSY; > - > - switch (cmd) { > - case SND_SSCAPE_LOAD_BOOTB: > - { > - register struct sscape_bootblock __user *bb = (struct sscape_bootblock > __user *) arg; > - > - /* > - * We are going to have to copy this data into a special > - * DMA-able buffer before we can upload it. We shall therefore > - * just check that the data pointer is valid for now ... > - */ > - if ( !access_ok(VERIFY_READ, bb->code, sizeof(bb->code)) ) > - return -EFAULT; > - > - /* > - * Now check that we can write the firmware version number too... > - */ > - if ( !access_ok(VERIFY_WRITE, &bb->version, sizeof(bb->version)) ) > - return -EFAULT; > - > - err = sscape_upload_bootblock(sscape, bb); > - } > - break; > - > - case SND_SSCAPE_LOAD_MCODE: > - { > - register const struct sscape_microcode __user *mc = (const struct > sscape_microcode __user *) arg; > - > - err = sscape_upload_microcode(sscape, mc); > - } > - break; > - > - default: > - err = -EINVAL; > - break; > - } /* switch */ > + release_firmware(init_fw); > > return err; > } > > - > /* > * Mixer control for the SoundScape's MIDI device. > */ > @@ -920,7 +803,7 @@ static int mpu401_open(struct snd_mpu401 * mpu) > > spin_lock_irqsave(&sscape->fwlock, flags); > > - if (sscape->hw_in_use || (sscape->midi_usage == ULONG_MAX)) { > + if (sscape->midi_usage == ULONG_MAX) { > err = -EBUSY; > } else { > ++(sscape->midi_usage); > @@ -1053,13 +936,6 @@ static int __devinit create_ad1845(struct snd_card > *card, unsigned port, > } > } > > - strcpy(card->driver, "SoundScape"); > - strcpy(card->shortname, pcm->name); > - snprintf(card->longname, sizeof(card->longname), > - "%s at 0x%lx, IRQ %d, DMA1 %d, DMA2 %dn", > - pcm->name, chip->port, chip->irq, > - chip->dma1, chip->dma2); > - > sscape->chip = chip; > } > > @@ -1162,29 +1038,6 @@ static int __devinit create_sscape(int dev, struct > snd_card *card) > return -ENXIO; > } > > - if (sscape->type != SSCAPE_VIVO) { > - /* > - * Now create the hardware-specific device so that we can > - * load the microcode into the on-board processor. > - * We cannot use the MPU-401 MIDI system until this firmware > - * has been loaded into the card. > - */ > - err = snd_hwdep_new(card, "MC68EC000", 0, &(sscape->hw)); > - if (err < 0) { > - printk(KERN_ERR "sscape: Failed to create " > - "firmware devicen"); > - goto _release_dma; > - } > - strlcpy(sscape->hw->name, "SoundScape M68K", > - sizeof(sscape->hw->name)); > - sscape->hw->name[sizeof(sscape->hw->name) - 1] = '�'; > - sscape->hw->iface = SNDRV_HWDEP_IFACE_SSCAPE; > - sscape->hw->ops.open = sscape_hw_open; > - sscape->hw->ops.release = sscape_hw_release; > - sscape->hw->ops.ioctl = sscape_hw_ioctl; > - sscape->hw->private_data = sscape; > - } > - > /* > * Tell the on-board devices where their resources are (I think - > * I can't be sure without a datasheet ... So many magic values!) > @@ -1222,28 +1075,51 @@ static int __devinit create_sscape(int dev, struct > snd_card *card) > wss_port[dev], irq[dev]); > goto _release_dma; > } > + strcpy(card->driver, "SoundScape"); > + strcpy(card->shortname, name); > + snprintf(card->longname, sizeof(card->longname), > + "%s at 0x%lx, IRQ %d, DMA1 %d, DMA2 %dn", > + name, sscape->chip->port, sscape->chip->irq, > + sscape->chip->dma1, sscape->chip->dma2); > + > #define MIDI_DEVNUM 0 > if (sscape->type != SSCAPE_VIVO) { > - err = create_mpu401(card, MIDI_DEVNUM, port[dev], mpu_irq[dev]); > - if (err < 0) { > - printk(KERN_ERR "sscape: Failed to create " > - "MPU-401 device at 0x%lxn", > - port[dev]); > - goto _release_dma; > - } > + err = sscape_upload_bootblock(card); > + if (err >= 0) > + err = sscape_upload_microcode(card, err); > + > + if (err == 0) { > + err = create_mpu401(card, MIDI_DEVNUM, port[dev], > + mpu_irq[dev]); > + if (err < 0) { > + printk(KERN_ERR "sscape: Failed to create " > + "MPU-401 device at 0x%lxn", > + port[dev]); > + goto _release_dma; > + } > > - /* > - * Enable the master IRQ ... > - */ > - sscape_write(sscape, GA_INTENA_REG, 0x80); > - > - /* > - * Initialize mixer > - */ > - sscape->midi_vol = 0; > - host_write_ctrl_unsafe(sscape->io_base, CMD_SET_MIDI_VOL, 100); > - host_write_ctrl_unsafe(sscape->io_base, 0, 100); > - host_write_ctrl_unsafe(sscape->io_base, CMD_XXX_MIDI_VOL, 100); > + /* > + * Initialize mixer > + */ > + spin_lock_irqsave(&sscape->lock, flags); > + sscape->midi_vol = 0; > + host_write_ctrl_unsafe(sscape->io_base, > + CMD_SET_MIDI_VOL, 100); > + host_write_ctrl_unsafe(sscape->io_base, > + sscape->midi_vol, 100); > + host_write_ctrl_unsafe(sscape->io_base, > + CMD_XXX_MIDI_VOL, 100); > + host_write_ctrl_unsafe(sscape->io_base, > + sscape->midi_vol, 100); > + host_write_ctrl_unsafe(sscape->io_base, > + CMD_SET_EXTMIDI, 100); > + host_write_ctrl_unsafe(sscape->io_base, > + 0, 100); > + host_write_ctrl_unsafe(sscape->io_base, 80, 1); > + > + set_midi_mode_unsafe(sscape->io_base); > + spin_unlock_irqrestore(&sscape->lock, flags); > + } > } > > /* > @@ -1301,11 +1177,12 @@ static int __devinit snd_sscape_probe(struct > device *pdev, unsigned int dev) > sscape->type = SSCAPE; > > dma[dev] &= 0x03; > + snd_card_set_dev(card, pdev); > + > ret = create_sscape(dev, card); > if (ret < 0) > goto _release_card; > > - snd_card_set_dev(card, pdev); > if ((ret = snd_card_register(card)) < 0) { > printk(KERN_ERR "sscape: Failed to register sound cardn"); > goto _release_card; > @@ -1426,12 +1303,12 @@ static int __devinit sscape_pnp_detect(struct > pnp_card_link *pcard, > wss_port[idx] = pnp_port_start(dev, 1); > dma2[idx] = pnp_dma(dev, 1); > } > + snd_card_set_dev(card, &pcard->card->dev); > > ret = create_sscape(idx, card); > if (ret < 0) > goto _release_card; > > - snd_card_set_dev(card, &pcard->card->dev); > if ((ret = snd_card_register(card)) < 0) { > printk(KERN_ERR "sscape: Failed to register sound cardn"); > goto _release_card; > -- > 1.6.0.3 > > ---------------------------------------------------------------------- > Co godzine losujemy 15 000 z ---------------------------------------------------------------------- Praca za granic�? Zobacz oferty! http://link.interia.pl/f2331

2 1

[alsa-devel] [PATCH] sscape: convert to firmware loader framework
by Krzysztof Helt 29 Sep '09

29 Sep '09

The conversion solves the problem that firmware size was set to 64KB while non PnP cards have 128KB firmware files. An additional post firmware initialization code has been moved from the OSS driver. --- Now, the MIDI is audible but not correct. It is not played timely. The sscape_ctl alsa-tool is not needed any more. Documentation/sound/alsa/ALSA-Configuration.txt | 8 +- include/sound/sscape_ioctl.h | 21 -- sound/isa/Kconfig | 8 +- sound/isa/sscape.c | 305 +++++++---------------- 4 files changed, 101 insertions(+), 241 deletions(-) delete mode 100644 include/sound/sscape_ioctl.h diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt index 1c8eb45..cf98525 100644 --- a/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/Documentation/sound/alsa/ALSA-Configuration.txt @@ -1631,7 +1631,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. Module snd-sscape ----------------- - Module for ENSONIQ SoundScape PnP cards. + Module for ENSONIQ SoundScape cards. port - Port # (PnP setup) wss_port - WSS Port # (PnP setup) @@ -1640,9 +1640,9 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. dma - DMA # (PnP setup) dma2 - 2nd DMA # (PnP setup, -1 to disable) - This module supports multiple cards. ISA PnP must be enabled. - You need sscape_ctl tool in alsa-tools package for loading - the microcode. + This module supports multiple cards. + + The driver requires the firmware loader support on kernel. Module snd-sun-amd7930 (on sparc only) -------------------------------------- diff --git a/include/sound/sscape_ioctl.h b/include/sound/sscape_ioctl.h deleted file mode 100644 index 0d88859..0000000 --- a/include/sound/sscape_ioctl.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef SSCAPE_IOCTL_H -#define SSCAPE_IOCTL_H - - -struct sscape_bootblock -{ - unsigned char code[256]; - unsigned version; -}; - -#define SSCAPE_MICROCODE_SIZE 65536 - -struct sscape_microcode -{ - unsigned char __user *code; -}; - -#define SND_SSCAPE_LOAD_BOOTB _IOWR('P', 100, struct sscape_bootblock) -#define SND_SSCAPE_LOAD_MCODE _IOW ('P', 101, struct sscape_microcode) - -#endif diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig index b90fc16..02fe81c 100644 --- a/sound/isa/Kconfig +++ b/sound/isa/Kconfig @@ -372,9 +372,9 @@ config SND_SGALAXY config SND_SSCAPE tristate "Ensoniq SoundScape driver" - select SND_HWDEP select SND_MPU401_UART select SND_WSS_LIB + select FW_LOADER help Say Y here to include support for Ensoniq SoundScape and Ensoniq OEM soundcards. @@ -382,7 +382,11 @@ config SND_SSCAPE The PCM audio is supported on SoundScape Classic, Elite, PnP and VIVO cards. The supported OEM cards are SPEA Media FX and Reveal SC-600. - The MIDI support is very experimental. + The MIDI support is very experimental and requires binary + firmware files called "scope.cod" and "sndscape.co?" where the + ? is digit 0, 1, 2, 3 or 4. The firmware files can be found + in DOS or Windows driver packages. One has to put the firmware + files into the /lib/firmware directory. To compile this driver as a module, choose M here: the module will be called snd-sscape. diff --git a/sound/isa/sscape.c b/sound/isa/sscape.c index b11c35f..08389a2 100644 --- a/sound/isa/sscape.c +++ b/sound/isa/sscape.c @@ -1,5 +1,5 @@ /* - * Low-level ALSA driver for the ENSONIQ SoundScape PnP + * Low-level ALSA driver for the ENSONIQ SoundScape * Copyright (c) by Chris Rankin * * This driver was written in part using information obtained from @@ -25,12 +25,12 @@ #include <linux/err.h> #include <linux/isa.h> #include <linux/delay.h> +#include <linux/firmware.h> #include <linux/pnp.h> #include <linux/spinlock.h> #include <linux/moduleparam.h> #include <asm/dma.h> #include <sound/core.h> -#include <sound/hwdep.h> #include <sound/wss.h> #include <sound/mpu401.h> #include <sound/initval.h> @@ -39,7 +39,7 @@ MODULE_AUTHOR("Chris Rankin"); -MODULE_DESCRIPTION("ENSONIQ SoundScape PnP driver"); +MODULE_DESCRIPTION("ENSONIQ SoundScape driver"); MODULE_LICENSE("GPL"); static int index[SNDRV_CARDS] __devinitdata = SNDRV_DEFAULT_IDX; @@ -142,14 +142,12 @@ struct soundscape { struct resource *wss_res; struct snd_wss *chip; struct snd_mpu401 *mpu; - struct snd_hwdep *hw; /* * The MIDI device won't work until we've loaded * its firmware via a hardware-dependent device IOCTL */ spinlock_t fwlock; - int hw_in_use; unsigned long midi_usage; unsigned char midi_vol; }; @@ -167,12 +165,6 @@ static inline struct soundscape *get_mpu401_soundscape(struct snd_mpu401 * mpu) return (struct soundscape *) (mpu->private_data); } -static inline struct soundscape *get_hwdep_soundscape(struct snd_hwdep * hw) -{ - return (struct soundscape *) (hw->private_data); -} - - /* * Allocates some kernel memory that we can use for DMA. * I think this means that the memory has to map to @@ -438,14 +430,14 @@ static int host_startup_ack(struct soundscape *s, unsigned timeout) * Upload a byte-stream into the SoundScape using DMA channel A. */ static int upload_dma_data(struct soundscape *s, - const unsigned char __user *data, + const unsigned char *data, size_t size) { unsigned long flags; struct snd_dma_buffer dma; int ret; - if (!get_dmabuf(&dma, PAGE_ALIGN(size))) + if (!get_dmabuf(&dma, PAGE_ALIGN(32 * 1024))) return -ENOMEM; spin_lock_irqsave(&s->lock, flags); @@ -468,35 +460,17 @@ static int upload_dma_data(struct soundscape *s, sscape_write_unsafe(s->io_base, GA_HMCTL_REG, sscape_read_unsafe(s->io_base, GA_HMCTL_REG) | 0x80); /* - * Upload the user's data (firmware?) to the SoundScape + * Upload the firmware to the SoundScape * board through the DMA channel ... */ while (size != 0) { unsigned long len; - /* - * Apparently, copying to/from userspace can sleep. - * We are therefore forbidden from holding any - * spinlocks while we copy ... - */ - spin_unlock_irqrestore(&s->lock, flags); - - /* - * Remember that the data that we want to DMA - * comes from USERSPACE. We have already verified - * the userspace pointer ... - */ len = min(size, dma.bytes); - len -= __copy_from_user(dma.area, data, len); + memcpy(dma.area, data, len); data += len; size -= len; - /* - * Grab that spinlock again, now that we've - * finished copying! - */ - spin_lock_irqsave(&s->lock, flags); - snd_dma_program(s->chip->dma1, dma.addr, len, DMA_MODE_WRITE); sscape_start_dma_unsafe(s->io_base, GA_DMAA_REG); if (!sscape_wait_dma_unsafe(s->io_base, GA_DMAA_REG, 5000)) { @@ -512,6 +486,7 @@ static int upload_dma_data(struct soundscape *s, } /* while */ set_host_mode_unsafe(s->io_base); + outb(0x0, s->io_base); /* * Boot the board ... (I think) @@ -537,7 +512,7 @@ _release_dma: /* * NOTE!!! We are NOT holding any spinlocks at this point !!! */ - sscape_write(s, GA_DMAA_REG, (s->ic_type == IC_ODIE ? 0x70 : 0x40)); + sscape_write(s, GA_DMAA_REG, (s->ic_type == IC_OPUS ? 0x40 : 0x70)); free_dmabuf(&dma); return ret; @@ -547,162 +522,70 @@ _release_dma: * Upload the bootblock(?) into the SoundScape. The only * purpose of this block of code seems to be to tell * us which version of the microcode we should be using. - * - * NOTE: The boot-block data resides in USER-SPACE!!! - * However, we have already verified its memory - * addresses by the time we get here. */ -static int sscape_upload_bootblock(struct soundscape *sscape, struct sscape_bootblock __user *bb) +static int sscape_upload_bootblock(struct snd_card *card) { + struct soundscape *sscape = get_card_soundscape(card); unsigned long flags; + const struct firmware *init_fw = NULL; int data = 0; int ret; - ret = upload_dma_data(sscape, bb->code, sizeof(bb->code)); - - spin_lock_irqsave(&sscape->lock, flags); - if (ret == 0) { - data = host_read_ctrl_unsafe(sscape->io_base, 100); - } - set_midi_mode_unsafe(sscape->io_base); - spin_unlock_irqrestore(&sscape->lock, flags); - - if (ret == 0) { - if (data < 0) { - snd_printk(KERN_ERR "sscape: timeout reading firmware version\n"); - ret = -EAGAIN; - } - else if (__copy_to_user(&bb->version, &data, sizeof(bb->version))) { - ret = -EFAULT; - } + ret = request_firmware(&init_fw, "scope.cod", card->dev); + if (ret < 0) { + snd_printk(KERN_ERR "Error loading scope.cod"); + return ret; } + ret = upload_dma_data(sscape, init_fw->data, init_fw->size); - return ret; -} + release_firmware(init_fw); -/* - * Upload the microcode into the SoundScape. The - * microcode is 64K of data, and if we try to copy - * it into a local variable then we will SMASH THE - * KERNEL'S STACK! We therefore leave it in USER - * SPACE, and save ourselves from copying it at all. - */ -static int sscape_upload_microcode(struct soundscape *sscape, - const struct sscape_microcode __user *mc) -{ - unsigned long flags; - char __user *code; - int err; - - /* - * We are going to have to copy this data into a special - * DMA-able buffer before we can upload it. We shall therefore - * just check that the data pointer is valid for now. - * - * NOTE: This buffer is 64K long! That's WAY too big to - * copy into a stack-temporary anyway. - */ - if ( get_user(code, &mc->code) || - !access_ok(VERIFY_READ, code, SSCAPE_MICROCODE_SIZE) ) - return -EFAULT; + spin_lock_irqsave(&sscape->lock, flags); + if (ret == 0) + data = host_read_ctrl_unsafe(sscape->io_base, 100); - if ((err = upload_dma_data(sscape, code, SSCAPE_MICROCODE_SIZE)) == 0) { - snd_printk(KERN_INFO "sscape: MIDI firmware loaded\n"); - } + if (data & 0x10) + sscape_write_unsafe(sscape->io_base, GA_SMCFGA_REG, 0x2f); - spin_lock_irqsave(&sscape->lock, flags); - set_midi_mode_unsafe(sscape->io_base); spin_unlock_irqrestore(&sscape->lock, flags); - initialise_mpu401(sscape->mpu); + data &= 0xf; + if (ret == 0 && data > 7) { + snd_printk(KERN_ERR + "sscape: timeout reading firmware version\n"); + ret = -EAGAIN; + } - return err; + return (ret == 0) ? data : ret; } /* - * Hardware-specific device functions, to implement special - * IOCTLs for the SoundScape card. This is how we upload - * the microcode into the card, for example, and so we - * must ensure that no two processes can open this device - * simultaneously, and that we can't open it at all if - * someone is using the MIDI device. + * Upload the microcode into the SoundScape. */ -static int sscape_hw_open(struct snd_hwdep * hw, struct file *file) +static int sscape_upload_microcode(struct snd_card *card, int version) { - register struct soundscape *sscape = get_hwdep_soundscape(hw); - unsigned long flags; + struct soundscape *sscape = get_card_soundscape(card); + const struct firmware *init_fw = NULL; + char name[14] = "sndscape.co0"; int err; - spin_lock_irqsave(&sscape->fwlock, flags); + name[11] = '0' + version; - if ((sscape->midi_usage != 0) || sscape->hw_in_use) { - err = -EBUSY; - } else { - sscape->hw_in_use = 1; - err = 0; + err = request_firmware(&init_fw, name, card->dev); + if (err < 0) { + snd_printk(KERN_ERR "Error loading sndscape.co0"); + return err; } + err = upload_dma_data(sscape, init_fw->data, init_fw->size); + if (err == 0) + snd_printk(KERN_INFO "MIDI firmware loaded %d KBs\n", + init_fw->size >> 10); - spin_unlock_irqrestore(&sscape->fwlock, flags); - return err; -} - -static int sscape_hw_release(struct snd_hwdep * hw, struct file *file) -{ - register struct soundscape *sscape = get_hwdep_soundscape(hw); - unsigned long flags; - - spin_lock_irqsave(&sscape->fwlock, flags); - sscape->hw_in_use = 0; - spin_unlock_irqrestore(&sscape->fwlock, flags); - return 0; -} - -static int sscape_hw_ioctl(struct snd_hwdep * hw, struct file *file, - unsigned int cmd, unsigned long arg) -{ - struct soundscape *sscape = get_hwdep_soundscape(hw); - int err = -EBUSY; - - switch (cmd) { - case SND_SSCAPE_LOAD_BOOTB: - { - register struct sscape_bootblock __user *bb = (struct sscape_bootblock __user *) arg; - - /* - * We are going to have to copy this data into a special - * DMA-able buffer before we can upload it. We shall therefore - * just check that the data pointer is valid for now ... - */ - if ( !access_ok(VERIFY_READ, bb->code, sizeof(bb->code)) ) - return -EFAULT; - - /* - * Now check that we can write the firmware version number too... - */ - if ( !access_ok(VERIFY_WRITE, &bb->version, sizeof(bb->version)) ) - return -EFAULT; - - err = sscape_upload_bootblock(sscape, bb); - } - break; - - case SND_SSCAPE_LOAD_MCODE: - { - register const struct sscape_microcode __user *mc = (const struct sscape_microcode __user *) arg; - - err = sscape_upload_microcode(sscape, mc); - } - break; - - default: - err = -EINVAL; - break; - } /* switch */ + release_firmware(init_fw); return err; } - /* * Mixer control for the SoundScape's MIDI device. */ @@ -920,7 +803,7 @@ static int mpu401_open(struct snd_mpu401 * mpu) spin_lock_irqsave(&sscape->fwlock, flags); - if (sscape->hw_in_use || (sscape->midi_usage == ULONG_MAX)) { + if (sscape->midi_usage == ULONG_MAX) { err = -EBUSY; } else { ++(sscape->midi_usage); @@ -1053,13 +936,6 @@ static int __devinit create_ad1845(struct snd_card *card, unsigned port, } } - strcpy(card->driver, "SoundScape"); - strcpy(card->shortname, pcm->name); - snprintf(card->longname, sizeof(card->longname), - "%s at 0x%lx, IRQ %d, DMA1 %d, DMA2 %d\n", - pcm->name, chip->port, chip->irq, - chip->dma1, chip->dma2); - sscape->chip = chip; } @@ -1162,29 +1038,6 @@ static int __devinit create_sscape(int dev, struct snd_card *card) return -ENXIO; } - if (sscape->type != SSCAPE_VIVO) { - /* - * Now create the hardware-specific device so that we can - * load the microcode into the on-board processor. - * We cannot use the MPU-401 MIDI system until this firmware - * has been loaded into the card. - */ - err = snd_hwdep_new(card, "MC68EC000", 0, &(sscape->hw)); - if (err < 0) { - printk(KERN_ERR "sscape: Failed to create " - "firmware device\n"); - goto _release_dma; - } - strlcpy(sscape->hw->name, "SoundScape M68K", - sizeof(sscape->hw->name)); - sscape->hw->name[sizeof(sscape->hw->name) - 1] = '\0'; - sscape->hw->iface = SNDRV_HWDEP_IFACE_SSCAPE; - sscape->hw->ops.open = sscape_hw_open; - sscape->hw->ops.release = sscape_hw_release; - sscape->hw->ops.ioctl = sscape_hw_ioctl; - sscape->hw->private_data = sscape; - } - /* * Tell the on-board devices where their resources are (I think - * I can't be sure without a datasheet ... So many magic values!) @@ -1222,28 +1075,51 @@ static int __devinit create_sscape(int dev, struct snd_card *card) wss_port[dev], irq[dev]); goto _release_dma; } + strcpy(card->driver, "SoundScape"); + strcpy(card->shortname, name); + snprintf(card->longname, sizeof(card->longname), + "%s at 0x%lx, IRQ %d, DMA1 %d, DMA2 %d\n", + name, sscape->chip->port, sscape->chip->irq, + sscape->chip->dma1, sscape->chip->dma2); + #define MIDI_DEVNUM 0 if (sscape->type != SSCAPE_VIVO) { - err = create_mpu401(card, MIDI_DEVNUM, port[dev], mpu_irq[dev]); - if (err < 0) { - printk(KERN_ERR "sscape: Failed to create " - "MPU-401 device at 0x%lx\n", - port[dev]); - goto _release_dma; - } + err = sscape_upload_bootblock(card); + if (err >= 0) + err = sscape_upload_microcode(card, err); + + if (err == 0) { + err = create_mpu401(card, MIDI_DEVNUM, port[dev], + mpu_irq[dev]); + if (err < 0) { + printk(KERN_ERR "sscape: Failed to create " + "MPU-401 device at 0x%lx\n", + port[dev]); + goto _release_dma; + } - /* - * Enable the master IRQ ... - */ - sscape_write(sscape, GA_INTENA_REG, 0x80); - - /* - * Initialize mixer - */ - sscape->midi_vol = 0; - host_write_ctrl_unsafe(sscape->io_base, CMD_SET_MIDI_VOL, 100); - host_write_ctrl_unsafe(sscape->io_base, 0, 100); - host_write_ctrl_unsafe(sscape->io_base, CMD_XXX_MIDI_VOL, 100); + /* + * Initialize mixer + */ + spin_lock_irqsave(&sscape->lock, flags); + sscape->midi_vol = 0; + host_write_ctrl_unsafe(sscape->io_base, + CMD_SET_MIDI_VOL, 100); + host_write_ctrl_unsafe(sscape->io_base, + sscape->midi_vol, 100); + host_write_ctrl_unsafe(sscape->io_base, + CMD_XXX_MIDI_VOL, 100); + host_write_ctrl_unsafe(sscape->io_base, + sscape->midi_vol, 100); + host_write_ctrl_unsafe(sscape->io_base, + CMD_SET_EXTMIDI, 100); + host_write_ctrl_unsafe(sscape->io_base, + 0, 100); + host_write_ctrl_unsafe(sscape->io_base, 80, 1); + + set_midi_mode_unsafe(sscape->io_base); + spin_unlock_irqrestore(&sscape->lock, flags); + } } /* @@ -1301,11 +1177,12 @@ static int __devinit snd_sscape_probe(struct device *pdev, unsigned int dev) sscape->type = SSCAPE; dma[dev] &= 0x03; + snd_card_set_dev(card, pdev); + ret = create_sscape(dev, card); if (ret < 0) goto _release_card; - snd_card_set_dev(card, pdev); if ((ret = snd_card_register(card)) < 0) { printk(KERN_ERR "sscape: Failed to register sound card\n"); goto _release_card; @@ -1426,12 +1303,12 @@ static int __devinit sscape_pnp_detect(struct pnp_card_link *pcard, wss_port[idx] = pnp_port_start(dev, 1); dma2[idx] = pnp_dma(dev, 1); } + snd_card_set_dev(card, &pcard->card->dev); ret = create_sscape(idx, card); if (ret < 0) goto _release_card; - snd_card_set_dev(card, &pcard->card->dev); if ((ret = snd_card_register(card)) < 0) { printk(KERN_ERR "sscape: Failed to register sound card\n"); goto _release_card; -- 1.6.0.3 ---------------------------------------------------------------------- Co godzine losujemy 15 000 z�! http://link.interia.pl/f2376

1 0

[alsa-devel] [PATCHv2 0/7] TWL6030 audio codec initial support
by Lopez Cruz, Misael 28 Sep '09

28 Sep '09

Following patch series adds initial support for TWL6030 codec driver. TWL6030 codec depends on TWL6030_CORE, which is not accepted yet. The main intention then is to get comments, I'll repost the patches of this series when TWL6030_CORE support gets accepted and rework patches as needed. Changes from v1: - Renamed dai format for PDM as SND_SOC_DAIFMT_PDM - CODEC driver registered as a platform driver - AUDPWRON gpio line handled in the CODEC driver - Handle scenario when no AUDPWRON gpio line is provided - Corrected names of some widgets - Avoid multiple calls to power functions in set_bias_level Thanks, -Misa --- Misael Lopez Cruz (7): OMAP4: PMIC: Add support for twl6030 codec ASoC: Add PDM DAI format definition ASoC: TWL6030: Add twl6030 codec driver ASoC: TWL6030: Manual power-up/down sequences ASoC: TWL6030: Add support for low-power mode ASoC: TWL6030: Enable audio interrupt ASoC: TWL6030: Power-up seq completion through audio interrupt drivers/mfd/twl-core.c | 15 + include/linux/i2c/twl.h | 11 + include/sound/soc-dai.h | 1 + sound/soc/codecs/Kconfig | 4 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/twl6030.c | 1179 ++++++++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/twl6030.h | 137 +++++ 7 files changed, 1349 insertions(+), 0 deletions(-) create mode 100644 sound/soc/codecs/twl6030.c create mode 100644 sound/soc/codecs/twl6030.h

3 3

Re: [alsa-devel] WM8731 using I2S on omap3 McBSP2 issues
by Rick Bronson 28 Sep '09

28 Sep '09

Hi Peter, Thanks for the help. I don't believe it's possible for me to try the master/slave switch. Please take a look at http://www.efn.org/~rick/pub/wm8731.jpg Note that DACLRC and ADCLRC are connected. This requires me to run as slave, right? Our bit clock line is buffered so I don't think that will be a problem. Rick > > Yes, I had tried 8 before and just tried it now. Same result. It > > really seems like there is a DMA issue. Can you think of anything > > else to try before I dive into the DMA code? > > > Ok, that wasn't the reason. > > Have you tried to reverse roles of codec and omap? I.e. by using > the codec as a master and omap as a slave with SND_SOC_DAIFMT_CBM_CFM. > > I don't think there is any HW reason as you have seen the bit-clock and > frame sync signals toggling but I remember one case few years back > where codec had slight too high capacitive load on the bit-clock line. > That was then causing unstable frame sync as it was internally derived > directly from the bit-clock pin without any buffer. Bit-clock signal > looked just fine on oscilloscope but wasn't well enough for internal > circuits of the cpu. > > So if assuming similar problem here, I could imagine that if the FSX is > used similar way directly inside the omap and if signal is not well > enough, the McBSP and DMA may not be running. > > This migh be a bit far reason to look for but at least easy to try by > switching the roles as then the codec is driving the both bit-clock and > fs. > >

2 1

[alsa-devel] [PATCHv2 1/7] OMAP4: PMIC: Add support for twl6030 codec
by Lopez Cruz, Misael 28 Sep '09

28 Sep '09

In order to have TWL6030 CODEC driver as a platform driver, codec data should be passed through twl_platform_data structure. For twl6030 audio codec, the following data is required: - audpwron_gpio: gpio line used to power-up/down the codec. A low-to-high transition powers codec up. Setting audpwron_gpio to a negative value means that codec will use manual power sequence instead of automatic sequence - naudint_irq: irq line for audio interrupt. twl6030 drives NAUDINT line to low when an interrupt (codec ready, plug insertion/removal, etc) is detected Signed-off-by: Misael Lopez Cruz <x0052729(a)ti.com> --- drivers/mfd/twl-core.c | 15 +++++++++++++++ include/linux/i2c/twl.h | 11 +++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c index af4cf47..e9d1ff1 100644 --- a/drivers/mfd/twl-core.c +++ b/drivers/mfd/twl-core.c @@ -108,6 +108,12 @@ #define twl_has_mmc() false #endif +#if defined(CONFIG_SND_SOC_TWL6030) +#define twl_has_codec() true +#else +#define twl_has_codec() false +#endif + #if defined(CONFIG_TWL4030_USB) || defined(CONFIG_TWL4030_USB_MODULE) #define twl_has_usb() true #else @@ -190,6 +196,7 @@ #define BCI_SUB_CHIP_ID SUB_CHIP_ID1 #define GPIO_SUB_CHIP_ID 0 /* NOT SUPPORTED IN TWL6030 */ #define KEYPAD_SUB_CHIP_ID 0 /* ADDED FOR COMPILATION ONLY */ +#define CODEC_SUB_CHIP_ID SUB_CHIP_ID3 /* subchip/slave 0 0x48 - POWER */ #define TWL6030_BASEADD_RTC 0x0000 @@ -632,6 +639,14 @@ add_children(struct twl_platform_data *pdata, unsigned long features) if (IS_ERR(child)) return PTR_ERR(child); } + + if (twl_has_codec() && pdata->codec) { + child = add_child(CODEC_SUB_CHIP_ID, "twl6030_codec", + pdata->codec, sizeof(*pdata->codec), false, + 0, 0); + if (IS_ERR(child)) + return PTR_ERR(child); + } #endif if (twl_has_usb() && pdata->usb) { diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h index b687a8b..d8a8823 100644 --- a/include/linux/i2c/twl.h +++ b/include/linux/i2c/twl.h @@ -472,6 +472,16 @@ struct twl_usb_data { enum twl_usb_mode usb_mode; }; +struct snd_soc_codec; + +struct twl_codec_data { + struct snd_soc_codec *codec; + + /* twl6030 */ + int audpwron_gpio; /* audio power-on gpio */ + int naudint_irq; /* audio interrupt */ +}; + struct twl_platform_data { unsigned irq_base, irq_end; struct twl_bci_platform_data *bci; @@ -479,6 +489,7 @@ struct twl_platform_data { struct twl_madc_platform_data *madc; struct twl_keypad_data *keypad; struct twl_usb_data *usb; + struct twl_codec_data *codec; /* LDO regulators common to TWL4030/TWL6030 */ struct regulator_init_data *vdac; -- 1.5.4.3

2 1

[alsa-devel] snd-hda-intel and MSI
by Elimar Riesebieter 28 Sep '09

28 Sep '09

Hi folks, are there any contradictions to enable-msi=1 by default? There are users with chips like an 00:1b.0 Audio device: Intel Corporation 82801I (ICH9 Family) HD Audio Controller (rev 03) Subsystem: Hewlett-Packard Company Device 30f7 Control: I/O- Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx+ Status: Cap+ 66MHz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx- Latency: 0, Cache Line Size: 64 bytes Interrupt: pin B routed to IRQ 33 Region 0: Memory at dc500000 (64-bit, non-prefetchable) [size=16K] Capabilities: <access denied> Kernel driver in use: HDA Intel which only works with MSI. And it is somewhat hard to find the appropriate Documantation in HD-Audio.txt. 2nd it will be very hard for Distributers to maintain modul options by chip ID's. Thanks for cooperation. Elimar (one of Debian's alsa maintainers) -- Do you smell something burning or ist it me?

5 15

[alsa-devel] [PATCHv2 2/7] ASoC: Add PDM DAI format definition
by Lopez Cruz, Misael 28 Sep '09

28 Sep '09

Add DAI format definition for PDM interfaces. Signed-off-by: Misael Lopez Cruz <x0052729(a)ti.com> --- include/sound/soc-dai.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index 352d7ee..9239cb0 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h @@ -30,6 +30,7 @@ struct snd_pcm_substream; #define SND_SOC_DAIFMT_DSP_A 3 /* L data msb after FRM LRC */ #define SND_SOC_DAIFMT_DSP_B 4 /* L data msb during FRM LRC */ #define SND_SOC_DAIFMT_AC97 5 /* AC97 */ +#define SND_SOC_DAIFMT_PDM 6 /* Pulse density modulation */ /* left and right justified also known as MSB and LSB respectively */ #define SND_SOC_DAIFMT_MSB SND_SOC_DAIFMT_LEFT_J -- 1.5.4.3

2 1

[alsa-devel] [PATCHv2 7/7] ASoC: TWL6030: Power-up seq completion through audio interrupt
by Lopez Cruz, Misael 28 Sep '09

28 Sep '09

When the codec is powered-up through external AUDPWRON line it starts its power-up sequence. The completion of the sequence is signaled through the audio interrupt, and then codec is operational. CODEC driver starts a wait_for_completion just after AUDPWRON line transitions from low to high. It's signaled as complete when servicing READYINT interrupt. Signed-off-by: Misael Lopez Cruz <x0052729(a)ti.com> --- sound/soc/codecs/twl6030.c | 46 ++++++++++++++++++++++++++++--------------- 1 files changed, 30 insertions(+), 16 deletions(-) diff --git a/sound/soc/codecs/twl6030.c b/sound/soc/codecs/twl6030.c index 5cf2099..f8bd8ee 100644 --- a/sound/soc/codecs/twl6030.c +++ b/sound/soc/codecs/twl6030.c @@ -48,6 +48,7 @@ struct twl6030_data { int codec_powered; unsigned int sysclk; struct work_struct audint_work; + struct completion ready_completion; }; /* @@ -58,7 +59,7 @@ static const u8 twl6030_reg[TWL6030_CACHEREGNUM] = { 0x4B, /* TWL6030_ASICID (ro) 0x01 */ 0x00, /* TWL6030_ASICREV (ro) 0x02 */ 0x00, /* TWL6030_INTID 0x03 */ - 0x41, /* TWL6030_INTMR 0x04 */ + 0x00, /* TWL6030_INTMR 0x04 */ 0x00, /* TWL6030_NCPCTRL 0x05 */ 0x00, /* TWL6030_LDOCTL 0x06 */ 0x00, /* TWL6030_HPPLLCTL 0x07 */ @@ -186,6 +187,23 @@ static inline void twl6030_write_reg_cache(struct snd_soc_codec *codec, } /* + * read from twl6030 hardware register + */ +static int twl6030_read(struct snd_soc_codec *codec, + unsigned int reg) +{ + u8 value; + + if (reg > TWL6030_CACHEREGNUM) + return -EIO; + + twl_i2c_read_u8(TWL6030_MODULE_AUDIO, &value, reg); + twl6030_write_reg_cache(codec, reg, value); + + return value; +} + +/* * write to the twl6030 register space */ static int twl6030_write(struct snd_soc_codec *codec, @@ -372,7 +390,8 @@ void twl6030_naudint_work(struct work_struct *work) dev_alert(codec->dev, "vib drivers over current detection\n"); break; case TWL6030_READYINT: - dev_alert(codec->dev, "codec is ready\n"); + priv->codec_powered = 1; + complete(&priv->ready_completion); break; default: dev_err(codec->dev, "unknown audio interrupt %d\n", intid); @@ -617,25 +636,21 @@ static int twl6030_set_bias_level(struct snd_soc_codec *codec, /* use AUDPWRON line */ gpio_set_value(audpwron_gpio, 1); - /* power-up sequence latency */ - mdelay(16); + /* wait for ready interrupt */ + wait_for_completion(&priv->ready_completion); /* sync registers updated during power-up sequence */ - twl6030_write_reg_cache(codec, TWL6030_REG_NCPCTL, - 0x81); - twl6030_write_reg_cache(codec, TWL6030_REG_LDOCTL, - 0x45); - twl6030_write_reg_cache(codec, TWL6030_REG_LPPLLCTL, - 0x01); + twl6030_read(codec, TWL6030_REG_NCPCTL); + twl6030_read(codec, TWL6030_REG_LDOCTL); + twl6030_read(codec, TWL6030_REG_LPPLLCTL); } else { /* use manual power-up sequence */ twl6030_power_up(codec); + priv->codec_powered = 1; } /* initialize vdd/vss registers with reg_cache */ twl6030_init_vdd_regs(codec); - - priv->codec_powered = 1; break; case SND_SOC_BIAS_OFF: if (!priv->codec_powered) @@ -649,10 +664,8 @@ static int twl6030_set_bias_level(struct snd_soc_codec *codec, udelay(500); /* sync registers updated during power-down sequence */ - twl6030_write_reg_cache(codec, TWL6030_REG_NCPCTL, - 0x00); - twl6030_write_reg_cache(codec, TWL6030_REG_LDOCTL, - 0x00); + twl6030_read(codec, TWL6030_REG_NCPCTL); + twl6030_read(codec, TWL6030_REG_LDOCTL); twl6030_write_reg_cache(codec, TWL6030_REG_LPPLLCTL, 0x00); } else { @@ -1061,6 +1074,7 @@ static int __devinit twl6030_codec_probe(struct platform_device *pdev) /* audio interrupt */ INIT_WORK(&priv->audint_work, twl6030_naudint_work); + init_completion(&priv->ready_completion); ret = request_irq(naudint_irq, twl6030_naudint_handler, -- 1.5.4.3

2 1

[alsa-devel] [PATCHv2 6/7] ASoC: TWL6030: Enable audio interrupt
by Lopez Cruz, Misael 28 Sep '09

28 Sep '09

NAUDINT interrupt line is provided by the TWL6030 codec to signal externally events like headset plug/unplug, hook, power-up sequence completion, etc. Signed-off-by: Misael Lopez Cruz <x0052729(a)ti.com> --- sound/soc/codecs/twl6030.c | 78 +++++++++++++++++++++++++++++++++++++++++++- sound/soc/codecs/twl6030.h | 10 ++++++ 2 files changed, 87 insertions(+), 1 deletions(-) diff --git a/sound/soc/codecs/twl6030.c b/sound/soc/codecs/twl6030.c index 032619d..5cf2099 100644 --- a/sound/soc/codecs/twl6030.c +++ b/sound/soc/codecs/twl6030.c @@ -47,6 +47,7 @@ struct twl6030_data { struct snd_soc_codec codec; int codec_powered; unsigned int sysclk; + struct work_struct audint_work; }; /* @@ -329,6 +330,58 @@ static int headset_power_mode(struct snd_soc_codec *codec, int high_perf) return 0; } +/* audio interrupt handler */ +irqreturn_t twl6030_naudint_handler(int irq, void *data) +{ + struct snd_soc_codec *codec = data; + struct twl6030_data *priv = codec->private_data; + + schedule_work(&priv->audint_work); + + /* disable audint irq to let workqueue to execute */ + disable_irq_nosync(irq); + + return IRQ_HANDLED; +} + +void twl6030_naudint_work(struct work_struct *work) +{ + struct twl_codec_data *twl_codec; + struct snd_soc_codec *codec; + struct twl6030_data *priv; + u8 intid; + + priv = container_of(work, struct twl6030_data, audint_work); + codec = &priv->codec; + twl_codec = codec->control_data; + + twl_i2c_read_u8(TWL6030_MODULE_AUDIO, &intid, TWL6030_REG_INTID); + + switch (intid) { + case TWL6030_THINT: + dev_alert(codec->dev, "die temp over-limit detection\n"); + break; + case TWL6030_PLUGINT: + case TWL6030_UNPLUGINT: + case TWL6030_HOOKINT: + break; + case TWL6030_HFINT: + dev_alert(codec->dev, "hf drivers over current detection\n"); + break; + case TWL6030_VIBINT: + dev_alert(codec->dev, "vib drivers over current detection\n"); + break; + case TWL6030_READYINT: + dev_alert(codec->dev, "codec is ready\n"); + break; + default: + dev_err(codec->dev, "unknown audio interrupt %d\n", intid); + break; + } + + enable_irq(twl_codec->naudint_irq); +} + /* * MICATT volume control: * from -6 to 0 dB in 6 dB steps @@ -610,6 +663,7 @@ static int twl6030_set_bias_level(struct snd_soc_codec *codec, priv->codec_powered = 0; break; } + codec->bias_level = level; return 0; @@ -954,8 +1008,15 @@ static int __devinit twl6030_codec_probe(struct platform_device *pdev) struct twl6030_data *priv; struct snd_soc_codec *codec; int audpwron_gpio = twl_codec->audpwron_gpio; + int naudint_irq = twl_codec->naudint_irq; int ret = 0; + /* prerequisites */ + if (!naudint_irq) { + dev_err(&pdev->dev, "no audio interrupt irq supplied\n"); + return -EINVAL; + } + priv = kzalloc(sizeof(struct twl6030_data), GFP_KERNEL); if (priv == NULL) return -ENOMEM; @@ -998,6 +1059,17 @@ static int __devinit twl6030_codec_probe(struct platform_device *pdev) priv->codec_powered = 0; } + /* audio interrupt */ + INIT_WORK(&priv->audint_work, twl6030_naudint_work); + + ret = request_irq(naudint_irq, + twl6030_naudint_handler, + IRQF_TRIGGER_LOW | IRQF_DISABLED, + "twl6030-codec", + codec); + if (ret) + goto gpio2_err; + /* init vio registers */ twl6030_init_vio_regs(codec); @@ -1006,7 +1078,7 @@ static int __devinit twl6030_codec_probe(struct platform_device *pdev) ret = snd_soc_register_codec(codec); if (ret) - goto gpio2_err; + goto reg_err; twl6030_codec = codec; @@ -1019,6 +1091,8 @@ static int __devinit twl6030_codec_probe(struct platform_device *pdev) dai_err: snd_soc_unregister_codec(codec); twl6030_codec = NULL; +reg_err: + free_irq(naudint_irq, twl_codec); gpio2_err: if (gpio_is_valid(audpwron_gpio)) gpio_free(audpwron_gpio); @@ -1036,6 +1110,8 @@ static int __devexit twl6030_codec_remove(struct platform_device *pdev) if (gpio_is_valid(twl_codec->audpwron_gpio)) gpio_free(twl_codec->audpwron_gpio); + free_irq(twl_codec->naudint_irq, twl6030_codec); + snd_soc_unregister_dai(&twl6030_dai); snd_soc_unregister_codec(twl6030_codec); diff --git a/sound/soc/codecs/twl6030.h b/sound/soc/codecs/twl6030.h index 15d3e1b..8a106f2 100644 --- a/sound/soc/codecs/twl6030.h +++ b/sound/soc/codecs/twl6030.h @@ -67,6 +67,16 @@ #define TWL6030_VIOREGNUM 18 #define TWL6030_VDDREGNUM 21 +/* INTID (0x03) fields */ + +#define TWL6030_THINT 0x01 +#define TWL6030_PLUGINT 0x02 +#define TWL6030_UNPLUGINT 0x04 +#define TWL6030_HOOKINT 0x08 +#define TWL6030_HFINT 0x10 +#define TWL6030_VIBINT 0x20 +#define TWL6030_READYINT 0x40 + /* NCPCTL (0x05) fields */ #define TWL6030_NCPENA 0x01 -- 1.5.4.3

2 1

[alsa-devel] [PATCHv2 4/7] ASoC: TWL6030: Manual power-up/down sequences
by Lopez Cruz, Misael 28 Sep '09

28 Sep '09

TWL6030 codec device can be powered-up/down through a specific register writes sequence. These sequences can be used when no gpio line is provided for AUDPWRON. When the codec is powered-up in this way, automatic power-down sequence (triggered by thermal shutdown) is not possible. Signed-off-by: Misael Lopez Cruz <x0052729(a)ti.com> --- sound/soc/codecs/twl6030.c | 117 +++++++++++++++++++++++++++++++++++++++----- sound/soc/codecs/twl6030.h | 16 ++++++ 2 files changed, 120 insertions(+), 13 deletions(-) diff --git a/sound/soc/codecs/twl6030.c b/sound/soc/codecs/twl6030.c index 92797e7..f1e333f 100644 --- a/sound/soc/codecs/twl6030.c +++ b/sound/soc/codecs/twl6030.c @@ -223,6 +223,88 @@ static void twl6030_init_vdd_regs(struct snd_soc_codec *codec) } } +/* twl6030 codec manual power-up sequence */ +static void twl6030_power_up(struct snd_soc_codec *codec) +{ + u8 ncpctl, ldoctl, lppllctl, accctl; + + ncpctl = twl6030_read_reg_cache(codec, TWL6030_REG_NCPCTL); + ldoctl = twl6030_read_reg_cache(codec, TWL6030_REG_LDOCTL); + lppllctl = twl6030_read_reg_cache(codec, TWL6030_REG_LPPLLCTL); + accctl = twl6030_read_reg_cache(codec, TWL6030_REG_ACCCTL); + + /* enable reference system */ + ldoctl |= TWL6030_REFENA; + twl6030_write(codec, TWL6030_REG_LDOCTL, ldoctl); + mdelay(10); + /* enable internal oscillator */ + ldoctl |= TWL6030_OSCENA; + twl6030_write(codec, TWL6030_REG_LDOCTL, ldoctl); + udelay(10); + /* enable high-side ldo */ + ldoctl |= TWL6030_HSLDOENA; + twl6030_write(codec, TWL6030_REG_LDOCTL, ldoctl); + udelay(244); + /* enable negative charge pump */ + ncpctl |= TWL6030_NCPENA | TWL6030_NCPOPEN; + twl6030_write(codec, TWL6030_REG_NCPCTL, ncpctl); + udelay(488); + /* enable low-side ldo */ + ldoctl |= TWL6030_LSLDOENA; + twl6030_write(codec, TWL6030_REG_LDOCTL, ldoctl); + udelay(244); + /* enable low-power pll */ + lppllctl |= TWL6030_LPLLENA; + twl6030_write(codec, TWL6030_REG_LPPLLCTL, lppllctl); + /* reset state machine */ + accctl |= TWL6030_RESETSPLIT; + twl6030_write(codec, TWL6030_REG_ACCCTL, accctl); + mdelay(5); + accctl &= ~TWL6030_RESETSPLIT; + twl6030_write(codec, TWL6030_REG_ACCCTL, accctl); + /* disable internal oscillator */ + ldoctl &= ~TWL6030_OSCENA; + twl6030_write(codec, TWL6030_REG_LDOCTL, ldoctl); +} + +/* twl6030 codec manual power-down sequence */ +static void twl6030_power_down(struct snd_soc_codec *codec) +{ + u8 ncpctl, ldoctl, lppllctl, accctl; + + ncpctl = twl6030_read_reg_cache(codec, TWL6030_REG_NCPCTL); + ldoctl = twl6030_read_reg_cache(codec, TWL6030_REG_LDOCTL); + lppllctl = twl6030_read_reg_cache(codec, TWL6030_REG_LPPLLCTL); + accctl = twl6030_read_reg_cache(codec, TWL6030_REG_ACCCTL); + + /* enable internal oscillator */ + ldoctl |= TWL6030_OSCENA; + twl6030_write(codec, TWL6030_REG_LDOCTL, ldoctl); + udelay(10); + /* disable low-power pll */ + lppllctl &= ~TWL6030_LPLLENA; + twl6030_write(codec, TWL6030_REG_LPPLLCTL, lppllctl); + /* disable low-side ldo */ + ldoctl &= ~TWL6030_LSLDOENA; + twl6030_write(codec, TWL6030_REG_LDOCTL, ldoctl); + udelay(244); + /* disable negative charge pump */ + ncpctl &= ~(TWL6030_NCPENA | TWL6030_NCPOPEN); + twl6030_write(codec, TWL6030_REG_NCPCTL, ncpctl); + udelay(488); + /* disable high-side ldo */ + ldoctl &= ~TWL6030_HSLDOENA; + twl6030_write(codec, TWL6030_REG_LDOCTL, ldoctl); + udelay(244); + /* disable internal oscillator */ + ldoctl &= ~TWL6030_OSCENA; + twl6030_write(codec, TWL6030_REG_LDOCTL, ldoctl); + /* disable reference system */ + ldoctl &= ~TWL6030_REFENA; + twl6030_write(codec, TWL6030_REG_LDOCTL, ldoctl); + mdelay(10); +} + /* * MICATT volume control: * from -6 to 0 dB in 6 dB steps @@ -460,12 +542,18 @@ static int twl6030_set_bias_level(struct snd_soc_codec *codec, /* power-up sequence latency */ mdelay(16); - } - /* sync registers updated during power-up sequence */ - twl6030_write_reg_cache(codec, TWL6030_REG_NCPCTL, 0x81); - twl6030_write_reg_cache(codec, TWL6030_REG_LDOCTL, 0x45); - twl6030_write_reg_cache(codec, TWL6030_REG_LPPLLCTL, 0x01); + /* sync registers updated during power-up sequence */ + twl6030_write_reg_cache(codec, TWL6030_REG_NCPCTL, + 0x81); + twl6030_write_reg_cache(codec, TWL6030_REG_LDOCTL, + 0x45); + twl6030_write_reg_cache(codec, TWL6030_REG_LPPLLCTL, + 0x01); + } else { + /* use manual power-up sequence */ + twl6030_power_up(codec); + } /* initialize vdd/vss registers with reg_cache */ twl6030_init_vdd_regs(codec); @@ -482,12 +570,18 @@ static int twl6030_set_bias_level(struct snd_soc_codec *codec, /* power-down sequence latency */ udelay(500); - } - /* sync registers updated during power-down sequence */ - twl6030_write_reg_cache(codec, TWL6030_REG_NCPCTL, 0x00); - twl6030_write_reg_cache(codec, TWL6030_REG_LDOCTL, 0x00); - twl6030_write_reg_cache(codec, TWL6030_REG_LPPLLCTL, 0x00); + /* sync registers updated during power-down sequence */ + twl6030_write_reg_cache(codec, TWL6030_REG_NCPCTL, + 0x00); + twl6030_write_reg_cache(codec, TWL6030_REG_LDOCTL, + 0x00); + twl6030_write_reg_cache(codec, TWL6030_REG_LPPLLCTL, + 0x00); + } else { + /* use manual power-down sequence */ + twl6030_power_down(codec); + } priv->codec_powered = 0; break; @@ -746,9 +840,6 @@ static int __devinit twl6030_codec_probe(struct platform_device *pdev) goto gpio2_err; priv->codec_powered = 0; - } else { - /* if no gpio is provided, then assume its always on */ - priv->codec_powered = 1; } /* init vio registers */ diff --git a/sound/soc/codecs/twl6030.h b/sound/soc/codecs/twl6030.h index d99d469..7375ae8 100644 --- a/sound/soc/codecs/twl6030.h +++ b/sound/soc/codecs/twl6030.h @@ -67,6 +67,18 @@ #define TWL6030_VIOREGNUM 18 #define TWL6030_VDDREGNUM 21 +/* NCPCTL (0x05) fields */ + +#define TWL6030_NCPENA 0x01 +#define TWL6030_NCPOPEN 0x40 + +/* LDOCTL (0x06) fields */ + +#define TWL6030_LSLDOENA 0x01 +#define TWL6030_HSLDOENA 0x04 +#define TWL6030_REFENA 0x40 +#define TWL6030_OSCENA 0x80 + /* HPPLLCTL (0x07) fields */ #define TWL6030_HPLLENA 0x01 @@ -88,6 +100,10 @@ #define TWL6030_LPLLFIN 0x08 #define TWL6030_HPLLSEL 0x10 +/* ACCCTL (0x2D) fields */ + +#define TWL6030_RESETSPLIT 0x04 + extern struct snd_soc_dai twl6030_dai; extern struct snd_soc_codec_device soc_codec_dev_twl6030; -- 1.5.4.3

2 1