diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
commit | ba2dacab305c598cd4c34a604f8e276bf5bab5ff (patch) | |
tree | 78670a0139bf4d5ace617b29b7eba82bbc74d602 /drivers/sound | |
parent | b77bf69998121e689c5e86cc5630d39a0a9ee6ca (diff) |
Merge with Linux 2.3.99-pre7 and various other bits.
Diffstat (limited to 'drivers/sound')
-rw-r--r-- | drivers/sound/Config.in | 3 | ||||
-rw-r--r-- | drivers/sound/Makefile | 4 | ||||
-rw-r--r-- | drivers/sound/ac97_codec.c | 1 | ||||
-rw-r--r-- | drivers/sound/dmasound/awacs_defs.h (renamed from drivers/sound/awacs_defs.h) | 0 | ||||
-rw-r--r-- | drivers/sound/emu10k1/.cvsignore | 5 | ||||
-rw-r--r-- | drivers/sound/emu10k1/main.c | 5 | ||||
-rw-r--r-- | drivers/sound/es1370.c | 3 | ||||
-rw-r--r-- | drivers/sound/es1371.c | 3 | ||||
-rw-r--r-- | drivers/sound/esssolo1.c | 3 | ||||
-rw-r--r-- | drivers/sound/i810_audio.c | 10 | ||||
-rw-r--r-- | drivers/sound/mad16.c | 4 | ||||
-rw-r--r-- | drivers/sound/midibuf.c | 2 | ||||
-rw-r--r-- | drivers/sound/sb_card.c | 12 | ||||
-rw-r--r-- | drivers/sound/sonicvibes.c | 3 | ||||
-rw-r--r-- | drivers/sound/soundcard.c | 2 | ||||
-rw-r--r-- | drivers/sound/soundmodule.h | 2 | ||||
-rw-r--r-- | drivers/sound/sys_timer.c | 2 | ||||
-rw-r--r-- | drivers/sound/trident.c | 128 | ||||
-rw-r--r-- | drivers/sound/trident.h | 5 | ||||
-rw-r--r-- | drivers/sound/trix.c | 4 | ||||
-rw-r--r-- | drivers/sound/uart6850.c | 2 | ||||
-rw-r--r-- | drivers/sound/via82cxxx_audio.c | 2600 |
22 files changed, 2344 insertions, 459 deletions
diff --git a/drivers/sound/Config.in b/drivers/sound/Config.in index 1c6073d2a..eea182f5e 100644 --- a/drivers/sound/Config.in +++ b/drivers/sound/Config.in @@ -79,6 +79,8 @@ if [ "$CONFIG_SOUND_MSNDPIN" = "y" -o "$CONFIG_SOUND_MSNDCLAS" = "y" ]; then int 'MSND buffer size (kB)' CONFIG_MSND_FIFOSIZE 128 fi +tristate ' VIA 82C686 Audio Codec' CONFIG_SOUND_VIA82CXXX + dep_tristate ' OSS sound modules' CONFIG_SOUND_OSS $CONFIG_SOUND if [ "$CONFIG_SOUND_OSS" = "y" -o "$CONFIG_SOUND_OSS" = "m" ]; then @@ -144,7 +146,6 @@ if [ "$CONFIG_SOUND_OSS" = "y" -o "$CONFIG_SOUND_OSS" = "m" ]; then fi fi - dep_tristate ' VIA 82C686 Audio Codec' CONFIG_SOUND_VIA82CXXX $CONFIG_SOUND_OSS dep_tristate ' Yamaha FM synthesizer (YM3812/OPL-3) support' CONFIG_SOUND_YM3812 $CONFIG_SOUND_OSS dep_tristate ' Yamaha OPL3-SA1 audio controller' CONFIG_SOUND_OPL3SA1 $CONFIG_SOUND_OSS dep_tristate ' Yamaha OPL3-SA2, SA3, and SAx based PnP cards' CONFIG_SOUND_OPL3SA2 $CONFIG_SOUND_OSS diff --git a/drivers/sound/Makefile b/drivers/sound/Makefile index 5d9f23201..ec43a1d26 100644 --- a/drivers/sound/Makefile +++ b/drivers/sound/Makefile @@ -66,12 +66,12 @@ obj-$(CONFIG_SOUND_AD1816) += ad1816.o obj-$(CONFIG_SOUND_ACI_MIXER) += aci.o obj-$(CONFIG_SOUND_AWE32_SYNTH) += awe_wave.o -obj-$(CONFIG_SOUND_VIA82CXXX) += via82cxxx_audio.o sb_lib.o uart401.o ac97.o +obj-$(CONFIG_SOUND_VIA82CXXX) += via82cxxx_audio.o ac97_codec.o obj-$(CONFIG_SOUND_MSNDCLAS) += msnd.o msnd_classic.o obj-$(CONFIG_SOUND_MSNDPIN) += msnd.o msnd_pinnacle.o obj-$(CONFIG_SOUND_VWSND) += vwsnd.o obj-$(CONFIG_SOUND_NM256) += nm256_audio.o ac97.o -obj-$(CONFIG_SOUND_ICH) += i810_audio.o ac97.o +obj-$(CONFIG_SOUND_ICH) += i810_audio.o ac97_codec.o obj-$(CONFIG_SOUND_SONICVIBES) += sonicvibes.o obj-$(CONFIG_SOUND_CMPCI) += cmpci.o obj-$(CONFIG_SOUND_ES1370) += es1370.o diff --git a/drivers/sound/ac97_codec.c b/drivers/sound/ac97_codec.c index ae866148b..13e588c98 100644 --- a/drivers/sound/ac97_codec.c +++ b/drivers/sound/ac97_codec.c @@ -34,6 +34,7 @@ #include <linux/kernel.h> #include <linux/string.h> #include <linux/errno.h> +#include <linux/bitops.h> #include <linux/ac97_codec.h> #include <asm/uaccess.h> diff --git a/drivers/sound/awacs_defs.h b/drivers/sound/dmasound/awacs_defs.h index 2757347ad..2757347ad 100644 --- a/drivers/sound/awacs_defs.h +++ b/drivers/sound/dmasound/awacs_defs.h diff --git a/drivers/sound/emu10k1/.cvsignore b/drivers/sound/emu10k1/.cvsignore new file mode 100644 index 000000000..88fff7fc4 --- /dev/null +++ b/drivers/sound/emu10k1/.cvsignore @@ -0,0 +1,5 @@ +.depend +.*.flags +.defines +local.h +configure diff --git a/drivers/sound/emu10k1/main.c b/drivers/sound/emu10k1/main.c index bbdf721fb..5f06dc368 100644 --- a/drivers/sound/emu10k1/main.c +++ b/drivers/sound/emu10k1/main.c @@ -80,7 +80,7 @@ static char *card_names[] __devinitdata = { "EMU10K1", }; -static struct pci_device_id emu10k1_pci_tbl[] __initdata = { +static struct pci_device_id emu10k1_pci_tbl[] = { {PCI_VENDOR_ID_CREATIVE, PCI_DEVICE_ID_CREATIVE_EMU10K1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, EMU10K1}, {0,} @@ -616,7 +616,6 @@ static int __devinit emu10k1_probe(struct pci_dev *pci_dev, const struct pci_dev } if (pci_enable_device(pci_dev)) { - printk(KERN_ERR "emu10k1: couldn't enable device\n"); kfree(card); return -ENODEV; } @@ -764,7 +763,7 @@ static void __devexit emu10k1_remove(struct pci_dev *pci_dev) MODULE_AUTHOR("Bertrand Lee, Cai Ying. (Email to: emu10k1-devel@opensource.creative.com)"); MODULE_DESCRIPTION("Creative EMU10K1 PCI Audio Driver v" DRIVER_VERSION "\nCopyright (C) 1999 Creative Technology Ltd."); -static struct pci_driver emu10k1_pci_driver __initdata = { +static struct pci_driver emu10k1_pci_driver = { name:"emu10k1", id_table:emu10k1_pci_tbl, probe:emu10k1_probe, diff --git a/drivers/sound/es1370.c b/drivers/sound/es1370.c index 0003a4b1d..f45734771 100644 --- a/drivers/sound/es1370.c +++ b/drivers/sound/es1370.c @@ -2494,11 +2494,12 @@ static int __devinit es1370_probe(struct pci_dev *pcidev, const struct pci_devic printk(KERN_ERR "es1370: io ports %#lx-%#lx in use\n", s->io, s->io+ES1370_EXTENT-1); goto err_region; } + if (pci_enable_device(pcidev)) + goto err_irq; if (request_irq(s->irq, es1370_interrupt, SA_SHIRQ, "es1370", s)) { printk(KERN_ERR "es1370: irq %u in use\n", s->irq); goto err_irq; } - pci_enable_device(pcidev); /* initialize codec registers */ /* note: setting CTRL_SERR_DIS is reported to break * mic bias setting (by Kim.Berts@fisub.mail.abb.com) */ diff --git a/drivers/sound/es1371.c b/drivers/sound/es1371.c index 73333a73d..8ae10a074 100644 --- a/drivers/sound/es1371.c +++ b/drivers/sound/es1371.c @@ -2664,11 +2664,12 @@ static int __devinit es1371_probe(struct pci_dev *pcidev, const struct pci_devic printk(KERN_ERR PFX "io ports %#lx-%#lx in use\n", s->io, s->io+ES1371_EXTENT-1); goto err_region; } + if (pci_enable_device(pcidev)) + goto err_irq; if (request_irq(s->irq, es1371_interrupt, SA_SHIRQ, "es1371", s)) { printk(KERN_ERR PFX "irq %u in use\n", s->irq); goto err_irq; } - pci_enable_device(pcidev); printk(KERN_INFO PFX "found es1371 rev %d at io %#lx irq %u\n" KERN_INFO PFX "features: joystick 0x%x\n", s->rev, s->io, s->irq, joystick[devindex]); /* register devices */ diff --git a/drivers/sound/esssolo1.c b/drivers/sound/esssolo1.c index f62f01414..aa1fc77d1 100644 --- a/drivers/sound/esssolo1.c +++ b/drivers/sound/esssolo1.c @@ -2252,11 +2252,12 @@ static int __devinit solo1_probe(struct pci_dev *pcidev, const struct pci_device printk(KERN_ERR "solo1: io ports in use\n"); goto err_region4; } + if (pci_enable_device(pcidev)) + goto err_irq; if (request_irq(s->irq, solo1_interrupt, SA_SHIRQ, "ESS Solo1", s)) { printk(KERN_ERR "solo1: irq %u in use\n", s->irq); goto err_irq; } - pci_enable_device(pcidev); printk(KERN_DEBUG "solo1: ddma base address: 0x%lx\n", s->ddmabase); printk(KERN_INFO "solo1: joystick port at %#lx\n", s->gpbase+1); /* register devices */ diff --git a/drivers/sound/i810_audio.c b/drivers/sound/i810_audio.c index 10438f115..76bfcc3c0 100644 --- a/drivers/sound/i810_audio.c +++ b/drivers/sound/i810_audio.c @@ -924,7 +924,10 @@ static void i810_interrupt(int irq, void *dev_id, struct pt_regs *regs) status = inl(card->iobase + GLOB_STA); if(!(status & INT_MASK)) + { + spin_unlock(&card->lock); return; /* not for us */ + } // printk("Interrupt %X: ", status); if(status & (INT_PO|INT_PI|INT_MC)) @@ -1735,14 +1738,16 @@ static int __init i810_probe(struct pci_dev *pci_dev, const struct pci_device_id return -ENODEV; } + if (pci_enable_device(pci_dev)) + return -EIO; if ((card = kmalloc(sizeof(struct i810_card), GFP_KERNEL)) == NULL) { printk(KERN_ERR "i810_audio: out of memory\n"); return -ENOMEM; } memset(card, 0, sizeof(*card)); - card->iobase = pci_dev->resource[1].start; - card->ac97base = pci_dev->resource[0].start; + card->iobase = pci_resource_start (pci_dev, 1); + card->ac97base = pci_resource_start (pci_dev, 0); card->pci_dev = pci_dev; card->pci_id = pci_id->device; card->irq = pci_dev->irq; @@ -1752,7 +1757,6 @@ static int __init i810_probe(struct pci_dev *pci_dev, const struct pci_device_id devs = card; pci_set_master(pci_dev); - pci_enable_device(pci_dev); printk(KERN_INFO "i810: %s found at IO 0x%04lx and 0x%04lx, IRQ %d\n", card_names[pci_id->driver_data], card->iobase, card->ac97base, diff --git a/drivers/sound/mad16.c b/drivers/sound/mad16.c index 5ba9236a3..5290b42ed 100644 --- a/drivers/sound/mad16.c +++ b/drivers/sound/mad16.c @@ -643,10 +643,10 @@ static int __init probe_mad16(struct address_info *hw_config) static void __init attach_mad16(struct address_info *hw_config) { - static char interrupt_bits[12] = { + static signed char interrupt_bits[12] = { -1, -1, -1, -1, -1, -1, -1, 0x08, -1, 0x10, 0x18, 0x20 }; - char bits; + signed char bits; static char dma_bits[4] = { 1, 2, 0, 3 diff --git a/drivers/sound/midibuf.c b/drivers/sound/midibuf.c index 3f0822fa8..913493a4a 100644 --- a/drivers/sound/midibuf.c +++ b/drivers/sound/midibuf.c @@ -51,7 +51,7 @@ static void midi_poll(unsigned long dummy); static struct timer_list poll_timer = { - NULL, NULL, 0, 0, midi_poll + function: midi_poll }; static volatile int open_devs = 0; diff --git a/drivers/sound/sb_card.c b/drivers/sound/sb_card.c index 13e456111..427167b3d 100644 --- a/drivers/sound/sb_card.c +++ b/drivers/sound/sb_card.c @@ -40,6 +40,8 @@ * Thanks to Gaël Quéri and Alessandro Zummo for testing and fixes. * Paul E. Laufer <pelaufer@csupomona.edu> * + * 06-05-2000 added another card. Daniel M. Newman <dmnewman@pobox.com> + * */ #include <linux/config.h> @@ -262,6 +264,11 @@ static struct { ISAPNP_VENDOR('C','T','L'), ISAPNP_FUNCTION(0x0031), 0,0,0,0, 0,1,1,-1}, + {"Sound Blaster 16", + ISAPNP_VENDOR('C','T','L'), ISAPNP_DEVICE(0x002a), + ISAPNP_VENDOR('C','T','L'), ISAPNP_FUNCTION(0x0031), + 0,0,0,0, + 0,1,1,-1}, {"Sound Blaster 16", ISAPNP_VENDOR('C','T','L'), ISAPNP_DEVICE(0x002b), ISAPNP_VENDOR('C','T','L'), ISAPNP_FUNCTION(0x0031), @@ -435,6 +442,11 @@ static struct { ISAPNP_VENDOR('@','X','@'), ISAPNP_FUNCTION(0x2001), ISAPNP_VENDOR('@','H','@'), ISAPNP_FUNCTION(0x0001), 1,0,0,0}, + {"Creative SB16 PnP", + ISAPNP_VENDOR('C','T','L'), ISAPNP_DEVICE(0x002a), + ISAPNP_VENDOR('C','T','L'), ISAPNP_FUNCTION(0x0031), + 0,0,0,0, + 0,1,1,-1}, {0} }; diff --git a/drivers/sound/sonicvibes.c b/drivers/sound/sonicvibes.c index a5fb3a1ef..6588f3b3f 100644 --- a/drivers/sound/sonicvibes.c +++ b/drivers/sound/sonicvibes.c @@ -2520,7 +2520,8 @@ static int __devinit sv_probe(struct pci_dev *pcidev, const struct pci_device_id printk(KERN_ERR "sv: io ports %#lx-%#lx in use\n", s->iosynth, s->iosynth+SV_EXTENT_SYNTH-1); goto err_region1; } - pci_enable_device(pcidev); + if (pci_enable_device(pcidev)) + goto err_irq; /* initialize codec registers */ outb(0x80, s->ioenh + SV_CODEC_CONTROL); /* assert reset */ udelay(50); diff --git a/drivers/sound/soundcard.c b/drivers/sound/soundcard.c index 9ed6305ef..0bf2b8e0f 100644 --- a/drivers/sound/soundcard.c +++ b/drivers/sound/soundcard.c @@ -734,7 +734,7 @@ static void do_sequencer_timer(unsigned long dummy) static struct timer_list seq_timer = -{NULL, NULL, 0, 0, do_sequencer_timer}; +{function: do_sequencer_timer}; void request_sound_timer(int count) { diff --git a/drivers/sound/soundmodule.h b/drivers/sound/soundmodule.h index 6fb0b00a0..2187f1c9b 100644 --- a/drivers/sound/soundmodule.h +++ b/drivers/sound/soundmodule.h @@ -26,4 +26,4 @@ static struct notifier_block sound_notifier= 0 }; -#endif +#endif /* _SOUNDMODULE_H */ diff --git a/drivers/sound/sys_timer.c b/drivers/sound/sys_timer.c index 88a4aaf1c..2d0cc953f 100644 --- a/drivers/sound/sys_timer.c +++ b/drivers/sound/sys_timer.c @@ -29,7 +29,7 @@ static void poll_def_tmr(unsigned long dummy); static struct timer_list def_tmr = -{NULL, NULL, 0, 0, poll_def_tmr}; +{function: poll_def_tmr}; static unsigned long tmr2ticks(int tmr_value) diff --git a/drivers/sound/trident.c b/drivers/sound/trident.c index 575a65616..a1f462f3b 100644 --- a/drivers/sound/trident.c +++ b/drivers/sound/trident.c @@ -101,6 +101,7 @@ #include <linux/ac97_codec.h> #include <asm/uaccess.h> #include <asm/hardirq.h> +#include <linux/bitops.h> #include "trident.h" @@ -284,7 +285,7 @@ struct trident_card { /* Function support */ struct trident_channel *(*alloc_pcm_channel)(struct trident_card *); struct trident_channel *(*alloc_rec_pcm_channel)(struct trident_card *); - void (*free_pcm_channel)(struct trident_card *, int chan); + void (*free_pcm_channel)(struct trident_card *, unsigned int chan); void (*address_interrupt)(struct trident_card *); }; @@ -434,13 +435,19 @@ static void trident_stop_voice(struct trident_card * card, unsigned int channel) #endif } -static int trident_check_channel_interrupt(struct trident_card * card, int channel) +static u32 trident_get_interrupt_mask (struct trident_card * card, + unsigned int b) { - unsigned int mask = 1 << (channel & 0x1f); - struct trident_pcm_bank *bank = &card->banks[channel >> 5]; - u32 reg, addr = bank->addresses->aint; + struct trident_pcm_bank *bank = &card->banks[b]; + u32 addr = bank->addresses->aint; + return inl(TRID_REG(card, addr)); +} - reg = inl(TRID_REG(card, addr)); +static int trident_check_channel_interrupt(struct trident_card * card, + unsigned int channel) +{ + unsigned int mask = 1 << (channel & 0x1f); + u32 reg = trident_get_interrupt_mask (card, channel >> 5); #ifdef DEBUG if (reg & mask) @@ -450,7 +457,8 @@ static int trident_check_channel_interrupt(struct trident_card * card, int chann return (reg & mask) ? TRUE : FALSE; } -static void trident_ack_channel_interrupt(struct trident_card * card, int channel) +static void trident_ack_channel_interrupt(struct trident_card * card, + unsigned int channel) { unsigned int mask = 1 << (channel & 0x1f); struct trident_pcm_bank *bank = &card->banks[channel >> 5]; @@ -473,11 +481,7 @@ static struct trident_channel * trident_alloc_pcm_channel(struct trident_card *c int idx; bank = &card->banks[BANK_B]; - if (bank->bitmap == ~0UL) { - /* no more free channels avaliable */ - printk(KERN_ERR "trident: no more channels available on Bank B.\n"); - return NULL; - } + for (idx = 31; idx >= 0; idx--) { if (!(bank->bitmap & (1 << idx))) { struct trident_channel *channel = &bank->channels[idx]; @@ -486,6 +490,9 @@ static struct trident_channel * trident_alloc_pcm_channel(struct trident_card *c return channel; } } + + /* no more free channels avaliable */ + printk(KERN_ERR "trident: no more channels available on Bank B.\n"); return NULL; } @@ -496,12 +503,7 @@ static struct trident_channel *ali_alloc_pcm_channel(struct trident_card *card) bank = &card->banks[BANK_A]; - if (bank->bitmap == ~0UL) { - /* no more free channels avaliable */ - printk(KERN_ERR "trident: no more channels available on Bank B.\n"); - return NULL; - } - for (idx = 0; idx <= 31; idx++) { + for (idx = ALI_PCM_OUT_CHANNEL_FIRST; idx <= ALI_PCM_OUT_CHANNEL_LAST ; idx++) { if (!(bank->bitmap & (1 << idx))) { struct trident_channel *channel = &bank->channels[idx]; bank->bitmap |= 1 << idx; @@ -509,6 +511,9 @@ static struct trident_channel *ali_alloc_pcm_channel(struct trident_card *card) return channel; } } + + /* no more free channels avaliable */ + printk(KERN_ERR "trident: no more channels available on Bank B.\n"); return NULL; } @@ -529,7 +534,8 @@ static struct trident_channel *ali_alloc_rec_pcm_channel(struct trident_card *ca } -static void trident_free_pcm_channel(struct trident_card *card, int channel) +static void trident_free_pcm_channel(struct trident_card *card, + unsigned int channel) { int bank; @@ -539,12 +545,10 @@ static void trident_free_pcm_channel(struct trident_card *card, int channel) bank = channel >> 5; channel = channel & 0x1f; - if (card->banks[bank].bitmap & (1 << (channel))) { - card->banks[bank].bitmap &= ~(1 << (channel)); - } + card->banks[bank].bitmap &= ~(1 << (channel)); } -static void ali_free_pcm_channel(struct trident_card *card, int channel) +static void ali_free_pcm_channel(struct trident_card *card, unsigned int channel) { int bank; @@ -554,9 +558,7 @@ static void ali_free_pcm_channel(struct trident_card *card, int channel) bank = channel >> 5; channel = channel & 0x1f; - if (card->banks[bank].bitmap & (1 << (channel))) { - card->banks[bank].bitmap &= ~(1 << (channel)); - } + card->banks[bank].bitmap &= ~(1 << (channel)); } @@ -569,14 +571,16 @@ static int trident_load_channel_registers(struct trident_card *card, u32 *data, if (channel > 63) return FALSE; - /* select hardware channel to write */ + /* select hardware channel to write */ outb(channel, TRID_REG(card, T4D_LFO_GC_CIR)); - /* output the channel registers */ + + /* Output the channel registers, but don't write register + three to an ALI chip. */ + for (i = 0; i < CHANNEL_REGS; i++) { + if (i == 3 && card->pci_id == PCI_DEVICE_ID_ALI_5451) + continue; outl(data[i], TRID_REG(card, CHANNEL_START + 4*i)); - if (i == 2) - if (card->pci_id == PCI_DEVICE_ID_ALI_5451) - i++; //skip i=3 } return TRUE; @@ -1229,21 +1233,50 @@ static void trident_address_interrupt(struct trident_card *card) static void ali_address_interrupt(struct trident_card *card) { int i; - struct trident_state *state; - + u32 mask = trident_get_interrupt_mask (card, BANK_A); + +#ifdef DEBUG + /* Sanity check to make sure that every state has a channel + and vice versa. */ + u32 done = 0; + unsigned ns = 0; + unsigned nc = 0; for (i = 0; i < NR_HW_CH; i++) { - if (trident_check_channel_interrupt(card, i)) { - trident_ack_channel_interrupt(card, i); - if ((state = card->states[i]) != NULL) { - state->dmabuf.update_flag |= ALI_ADDRESS_INT_UPDATE; - trident_update_ptr(state); - } else { + if (card->banks[BANK_A].bitmap & (1<<i)) + nc ++; + + if (card->states[i]) { + u32 bit = 1 << card->states[i]->dmabuf.channel->num; + if (bit & done) + printk (KERN_ERR "trident: channel allocated to two states\n"); + ns++; + + done |= bit; + } + } + if (ns != nc) + printk (KERN_ERR "trident: number of states != number of channels\n"); +#endif + + for (i = 0; mask && i < NR_HW_CH; i++) { + struct trident_state *state = card->states[i]; + if (!state) + continue; + + trident_ack_channel_interrupt(card, state->dmabuf.channel->num); + mask &= ~ (1<<state->dmabuf.channel->num); + state->dmabuf.update_flag |= ALI_ADDRESS_INT_UPDATE; + trident_update_ptr(state); + } + + if (mask) + for (i = 0; i < NR_HW_CH; i++) + if (mask & (1<<i)) { printk("ali: spurious channel irq %d.\n", i); trident_stop_voice(card, i); trident_disable_voice_irq(card, i); } - } - } + } static void trident_interrupt(int irq, void *dev_id, struct pt_regs *regs) @@ -1897,7 +1930,7 @@ static int trident_open(struct inode *inode, struct file *file) if (dmabuf->channel == NULL) { kfree (card->states[i]); - card->states[i] = NULL;; + card->states[i] = NULL; return -ENODEV; } @@ -1954,6 +1987,11 @@ static int trident_open(struct inode *inode, struct file *file) state->open_mode |= file->f_mode & (FMODE_READ | FMODE_WRITE); up(&state->open_sem); +#ifdef DEBUG + printk(KERN_ERR "trident: open virtual channel %d, hard channel %d\n", + state->virt, + dmabuf->channel->num); +#endif MOD_INC_USE_COUNT; return 0; } @@ -2343,13 +2381,16 @@ static int __init trident_probe(struct pci_dev *pci_dev, const struct pci_device } pci_read_config_byte(pci_dev, PCI_CLASS_REVISION, &revision); - iobase = pci_dev->resource[0].start; + iobase = pci_resource_start (pci_dev, 0); if (check_region(iobase, 256)) { printk(KERN_ERR "trident: can't allocate I/O space at 0x%4.4lx\n", iobase); return -ENODEV; } + if (pci_enable_device(pci_dev)) + return -ENODEV; + if ((card = kmalloc(sizeof(struct trident_card), GFP_KERNEL)) == NULL) { printk(KERN_ERR "trident: out of memory\n"); return -ENOMEM; @@ -2371,7 +2412,6 @@ static int __init trident_probe(struct pci_dev *pci_dev, const struct pci_device devs = card; pci_set_master(pci_dev); - pci_enable_device(pci_dev); printk(KERN_INFO "trident: %s found at IO 0x%04lx, IRQ %d\n", card_names[pci_id->driver_data], card->iobase, card->irq); diff --git a/drivers/sound/trident.h b/drivers/sound/trident.h index dc8239b0e..a35563622 100644 --- a/drivers/sound/trident.h +++ b/drivers/sound/trident.h @@ -103,6 +103,11 @@ enum ali_pcm_in_channel_num { ALI_PCM_IN_CHANNEL = 31 }; +enum ali_pcm_out_channel_num { + ALI_PCM_OUT_CHANNEL_FIRST = 1, + ALI_PCM_OUT_CHANNEL_LAST = 30 +}; + enum ali_ac97_power_control_bit { ALI_EAPD_POWER_DOWN = 0x8000 }; diff --git a/drivers/sound/trix.c b/drivers/sound/trix.c index 986544401..c1d71750e 100644 --- a/drivers/sound/trix.c +++ b/drivers/sound/trix.c @@ -276,7 +276,7 @@ static int __init probe_trix_sb(struct address_info *hw_config) int tmp; unsigned char conf; - static char irq_translate[] = { + static signed char irq_translate[] = { -1, -1, -1, 0, 1, 2, -1, 3 }; @@ -346,7 +346,7 @@ static void __init attach_trix_mpu(struct address_info *hw_config) static int __init probe_trix_mpu(struct address_info *hw_config) { unsigned char conf; - static char irq_bits[] = { + static int irq_bits[] = { -1, -1, -1, 1, 2, 3, -1, 4, -1, 5 }; diff --git a/drivers/sound/uart6850.c b/drivers/sound/uart6850.c index 6540df0f6..2bff6a655 100644 --- a/drivers/sound/uart6850.c +++ b/drivers/sound/uart6850.c @@ -76,7 +76,7 @@ static void poll_uart6850(unsigned long dummy); static struct timer_list uart6850_timer = { - NULL, NULL, 0, 0, poll_uart6850 + function: poll_uart6850 }; static void uart6850_input_loop(void) diff --git a/drivers/sound/via82cxxx_audio.c b/drivers/sound/via82cxxx_audio.c index 7f88b8177..1807e3db6 100644 --- a/drivers/sound/via82cxxx_audio.c +++ b/drivers/sound/via82cxxx_audio.c @@ -5,51 +5,45 @@ * Distributed under the GNU GENERAL PUBLIC LICENSE (GPL) Version 2. * See the "COPYING" file distributed with this software for more info. * - * Documentation for this driver available as - * linux/Documentation/sound/via82cxxx.txt. + * For a list of known bugs (errata) and documentation, + * see via82cxxx.txt in linux/Documentation/sound. * - * Since the mixer is called from the OSS glue the kernel lock is always held - * on our AC97 mixing */ -#define VIA_VERSION "1.1.2.1" +#define VIA_VERSION "1.1.5" - -#include <linux/module.h> #include <linux/config.h> -#include <linux/delay.h> -#include <linux/errno.h> -#include <linux/fs.h> +#include <linux/module.h> #include <linux/kernel.h> +#include <linux/fs.h> #include <linux/pci.h> #include <linux/init.h> #include <linux/proc_fs.h> - +#include <linux/spinlock.h> +#include <linux/sound.h> +#include <linux/soundcard.h> +#include <linux/ac97_codec.h> #include <asm/io.h> +#include <asm/delay.h> +#include <asm/uaccess.h> +#include <asm/hardirq.h> #include "sound_config.h" #include "soundmodule.h" -#include "sb.h" -#include "ac97.h" -#include "mpu401.h" -#ifndef SOUND_LOCK -#define SOUND_LOCK do {} while (0) -#define SOUND_LOCK_END do {} while (0) -#endif -#define VIA_DEBUG 0 /* define to 1 to enable debugging output and checks */ -#if VIA_DEBUG +#undef VIA_DEBUG /* define to enable debugging output and checks */ +#ifdef VIA_DEBUG /* note: prints function name for you */ #define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __FUNCTION__ , ## args) #else #define DPRINTK(fmt, args...) #endif -#define VIA_NDEBUG 0 /* define to 1 to disable lightweight runtime checks */ -#if VIA_NDEBUG +#define VIA_NDEBUG /* define to disable lightweight runtime checks */ +#ifdef VIA_NDEBUG #define assert(expr) #else #define assert(expr) \ @@ -59,29 +53,109 @@ } #endif +/* user switch: undefine to exclude /proc data */ +#define VIA_PROC_FS 1 + +/* don't mess with this */ +#ifndef CONFIG_PROC_FS +#undef VIA_PROC_FS +#endif + #define arraysize(x) (sizeof(x)/sizeof(*(x))) -#define MAX_CARDS 2 +#define MAX_CARDS 1 #define LINE_SIZE 10 #define VIA_CARD_NAME "VIA 82Cxxx Audio driver " VIA_VERSION -#define VIA_MODULE_NAME "via_audio" +#define VIA_MODULE_NAME "via82cxxx" #define PFX VIA_MODULE_NAME ": " #define VIA_COUNTER_LIMIT 100000 +/* size of DMA buffers */ +#define VIA_DMA_BUFFERS 16 +#define VIA_DMA_BUF_SIZE PAGE_SIZE + /* 82C686 function 5 (audio codec) PCI configuration registers */ +#define VIA_ACLINK_CTRL 0x41 #define VIA_FUNC_ENABLE 0x42 #define VIA_PNP_CONTROL 0x43 -#define VIA_AC97_CTRL 0x80 +#define VIA_FM_NMI_CTRL 0x48 + +/* + * controller base 0 (scatter-gather) registers + * + * NOTE: Via datasheet lists first channel as "read" + * channel and second channel as "write" channel. + * I changed the naming of the constants to be more + * clear than I felt the datasheet to be. + */ + +#define VIA_BASE0_PCM_OUT_CHAN 0x00 /* output PCM to user */ +#define VIA_BASE0_PCM_OUT_CHAN_STATUS 0x00 +#define VIA_BASE0_PCM_OUT_CHAN_CTRL 0x01 +#define VIA_BASE0_PCM_OUT_CHAN_TYPE 0x02 +#define VIA_BASE0_PCM_OUT_BLOCK_COUNT 0x0C + +#define VIA_BASE0_PCM_IN_CHAN 0x10 /* input PCM from user */ +#define VIA_BASE0_PCM_IN_CHAN_STATUS 0x10 +#define VIA_BASE0_PCM_IN_CHAN_CTRL 0x11 +#define VIA_BASE0_PCM_IN_CHAN_TYPE 0x12 + +/* offsets from base */ +#define VIA_PCM_STATUS 0x00 +#define VIA_PCM_CONTROL 0x01 +#define VIA_PCM_TYPE 0x02 +#define VIA_PCM_TABLE_ADDR 0x04 + +/* XXX unused DMA channel for FM PCM data */ +#define VIA_BASE0_FM_OUT_CHAN 0x20 +#define VIA_BASE0_FM_OUT_CHAN_STATUS 0x20 +#define VIA_BASE0_FM_OUT_CHAN_CTRL 0x21 +#define VIA_BASE0_FM_OUT_CHAN_TYPE 0x22 + +#define VIA_BASE0_AC97_CTRL 0x80 +#define VIA_BASE0_SGD_STATUS_SHADOW 0x84 +#define VIA_BASE0_GPI_INT_ENABLE 0x8C + +/* VIA_BASE0_AUDIO_xxx_CHAN_TYPE bits */ +#define VIA_IRQ_ON_FLAG (1<<0) /* int on each flagged scatter block */ +#define VIA_IRQ_ON_EOL (1<<1) /* int at end of scatter list */ +#define VIA_INT_SEL_PCI_LAST_LINE_READ (0) /* int at PCI read of last line */ +#define VIA_INT_SEL_LAST_SAMPLE_SENT (1<<2) /* int at last sample sent */ +#define VIA_INT_SEL_ONE_LINE_LEFT (1<<3) /* int at less than one line to send */ +#define VIA_PCM_FMT_STEREO (1<<4) /* PCM stereo format (bit clear == mono) */ +#define VIA_PCM_FMT_16BIT (1<<5) /* PCM 16-bit format (bit clear == 8-bit) */ +#define VIA_PCM_FIFO (1<<6) /* enable FIFO? documented as "reserved" */ +#define VIA_RESTART_SGD_ON_EOL (1<<7) /* restart scatter-gather at EOL */ +#define VIA_PCM_FMT_MASK (VIA_PCM_FMT_STEREO|VIA_PCM_FMT_16BIT) +#define VIA_CHAN_TYPE_MASK (VIA_RESTART_SGD_ON_EOL | \ + VIA_PCM_FIFO | \ + VIA_IRQ_ON_FLAG | \ + VIA_IRQ_ON_EOL) +#define VIA_CHAN_TYPE_INT_SELECT (VIA_INT_SEL_LAST_SAMPLE_SENT) /* PCI configuration register bits and masks */ #define VIA_CR40_AC97_READY 0x01 #define VIA_CR40_AC97_LOW_POWER 0x02 #define VIA_CR40_SECONDARY_READY 0x04 -#define VIA_CR41_ACLINK_ENABLE 0x80 +#define VIA_CR41_AC97_ENABLE 0x80 /* enable AC97 codec */ +#define VIA_CR41_AC97_RESET 0x40 /* clear bit to reset AC97 */ +#define VIA_CR41_AC97_WAKEUP 0x20 /* wake up from power-down mode */ +#define VIA_CR41_AC97_SDO 0x10 /* force Serial Data Out (SDO) high */ +#define VIA_CR41_VRA 0x08 /* enable variable sample rate */ +#define VIA_CR41_PCM_ENABLE 0x04 /* AC Link SGD Read Channel PCM Data Output */ +#define VIA_CR41_FM_PCM_ENABLE 0x02 /* AC Link FM Channel PCM Data Out */ +#define VIA_CR41_SB_PCM_ENABLE 0x01 /* AC Link SB PCM Data Output */ +#define VIA_CR41_BOOT_MASK (VIA_CR41_AC97_ENABLE | \ + VIA_CR41_AC97_WAKEUP | \ + VIA_CR41_AC97_SDO) +#define VIA_CR41_RUN_MASK (VIA_CR41_AC97_ENABLE | \ + VIA_CR41_AC97_RESET | \ + VIA_CR41_VRA | \ + VIA_CR41_PCM_ENABLE) #define VIA_CR42_SB_ENABLE 0x01 #define VIA_CR42_MIDI_ENABLE 0x02 @@ -91,272 +165,1937 @@ #define VIA_CR44_SECOND_CODEC_SUPPORT (1 << 6) #define VIA_CR44_AC_LINK_ACCESS (1 << 7) +#define VIA_CR48_FM_TRAP_TO_NMI (1 << 2) + +/* controller base 0 register bitmasks */ +#define VIA_INT_DISABLE_MASK (~(0x01|0x02)) +#define VIA_SGD_STOPPED (1 << 2) +#define VIA_SGD_ACTIVE (1 << 7) +#define VIA_SGD_TERMINATE (1 << 6) +#define VIA_SGD_FLAG (1 << 0) +#define VIA_SGD_EOL (1 << 1) +#define VIA_SGD_START (1 << 7) + #define VIA_CR80_FIRST_CODEC 0 #define VIA_CR80_SECOND_CODEC (1 << 30) #define VIA_CR80_FIRST_CODEC_VALID (1 << 25) +#define VIA_CR80_VALID (1 << 25) #define VIA_CR80_SECOND_CODEC_VALID (1 << 27) #define VIA_CR80_BUSY (1 << 24) -#define VIA_CR80_READ_MODE (1 << 23) +#define VIA_CR83_BUSY (1) +#define VIA_CR83_FIRST_CODEC_VALID (1 << 1) +#define VIA_CR80_READ (1 << 23) #define VIA_CR80_WRITE_MODE 0 -#define VIA_CR80_REG_IDX(idx) (((idx) & 0x7E) << 16) +#define VIA_CR80_REG_IDX(idx) ((((idx) & 0xFF) >> 1) << 16) + +/* h r puff n stuff */ +#define VIA_FMT_STEREO 0x01 +#define VIA_FMT_16BIT 0x02 +#define VIA_FMT_MASK 0x03 +#define VIA_DAC_SHIFT 0 +#define VIA_ADC_SHIFT 4 + +/* undocumented(?) values for setting rate, from Via's source */ +#define VIA_SET_RATE_IN 0x00320000 /* set input rate */ +#define VIA_SET_RATE_OUT 0x002c0000 /* set output rate */ + + +/* scatter-gather DMA table entry, exactly as passed to hardware */ +struct via_sgd_table { + u32 addr; + u32 count; /* includes additional bits also */ +}; +#define VIA_EOL (1 << 31) +#define VIA_FLAG (1 << 30) + + +enum via_channel_states { + sgd_stopped = 0, + sgd_in_progress = 1, +}; + + +struct via_sgd_data { + dma_addr_t handle; + volatile void *cpuaddr; +}; + + +struct via_channel { + unsigned rate; /* sample rate */ + + u8 pcm_fmt; /* VIA_PCM_FMT_xxx */ + + atomic_t state; + atomic_t buf_in_use; + atomic_t next_buf; + + volatile struct via_sgd_table *sgtable; + dma_addr_t sgt_handle; + + struct via_sgd_data sgbuf [VIA_DMA_BUFFERS]; + + wait_queue_head_t wait; + + long iobase; +}; + +/* data stored for each chip */ struct via_info { - struct address_info sb_data; - struct address_info opl3_data; struct pci_dev *pdev; - struct ac97_hwint ac97; - int mixer_oss_dev; - int have_ac97; + long baseaddr; + + struct ac97_codec ac97; + spinlock_t lock; + int card_num; /* unique card number, from 0 */ + + int dev_dsp; /* /dev/dsp index from register_sound_dsp() */ + + unsigned rev_h : 1; + + wait_queue_head_t open_wait; + int open_mode; + + struct via_channel ch_in; + struct via_channel ch_out; +}; + + +/* number of cards, used for assigning unique numbers to cards */ +static unsigned via_num_cards = 0; + + +/**************************************************************** + * + * prototypes + * + * + */ + +static int via_init_one (struct pci_dev *dev, const struct pci_device_id *id); +static void via_remove_one (struct pci_dev *pdev); + +static ssize_t via_dsp_read(struct file *file, char *buffer, size_t count, loff_t *ppos); +static ssize_t via_dsp_write(struct file *file, const char *buffer, size_t count, loff_t *ppos); +static unsigned int via_dsp_poll(struct file *file, struct poll_table_struct *wait); +static int via_dsp_ioctl (struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg); +static int via_dsp_open (struct inode *inode, struct file *file); +static int via_dsp_release(struct inode *inode, struct file *file); + +static u16 via_ac97_read_reg (struct ac97_codec *codec, u8 reg); +static void via_ac97_write_reg (struct ac97_codec *codec, u8 reg, u16 value); +static u8 via_ac97_wait_idle (struct via_info *card); +static u32 via_ac97_wait_valid (struct via_info *card); + +static void via_chan_free (struct via_info *card, struct via_channel *chan); +static void via_chan_clear (struct via_channel *chan); +static void via_chan_pcm_fmt (struct via_info *card, + struct via_channel *chan, int reset); + + +/**************************************************************** + * + * Various data the driver needs + * + * + */ + + +static struct pci_device_id via_pci_tbl[] __initdata = { + { PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_5, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, + { 0, }, }; -static struct via_info cards [MAX_CARDS]; -static unsigned num_cards = 0; - - -static const struct { - int revision; - const char *rev_name; -} via_chip_revs[] __initdata = { - { 0x10, "A" }, - { 0x11, "B" }, - { 0x12, "C" }, - { 0x13, "D" }, - { 0x14, "E" }, - { 0x20, "H" }, +MODULE_DEVICE_TABLE(pci,via_pci_tbl); + + +static struct pci_driver via_driver = { + name: VIA_MODULE_NAME, + id_table: via_pci_tbl, + probe: via_init_one, + remove: via_remove_one, }; -static inline void via_ac97_write32 (struct pci_dev *pdev, int port, u32 data) + +/**************************************************************** + * + * Low-level base 0 register read/write helpers + * + * + */ + +static inline void via_chan_stop (int iobase) +{ + if (inb (iobase + VIA_PCM_STATUS) & VIA_SGD_ACTIVE) + outb (VIA_SGD_TERMINATE, iobase + VIA_PCM_CONTROL); +} + +static inline void via_chan_status_clear (int iobase) +{ + u8 tmp = inb (iobase + VIA_PCM_STATUS); + + if (tmp != 0) + outb (tmp, iobase + VIA_PCM_STATUS); +} + +static inline void sg_begin (struct via_channel *chan) +{ + outb (VIA_SGD_START, chan->iobase + VIA_PCM_CONTROL); +} + + +static inline int via_chan_bufs_in_use (struct via_channel *chan) +{ + return atomic_read(&chan->next_buf) - + atomic_read(&chan->buf_in_use); +} + + +static inline int via_chan_full (struct via_channel *chan) +{ + return (via_chan_bufs_in_use (chan) == VIA_DMA_BUFFERS); +} + + +static inline int via_chan_empty (struct via_channel *chan) +{ + return (atomic_read(&chan->next_buf) == + atomic_read(&chan->buf_in_use)); +} + + +/**************************************************************** + * + * Miscellaneous debris + * + * + */ + +static void via_stop_everything (struct via_info *card) +{ + DPRINTK ("ENTER\n"); + + assert (card != NULL); + + /* + * terminate any existing operations on audio read/write channels + */ + via_chan_stop (card->baseaddr + VIA_BASE0_PCM_OUT_CHAN); + via_chan_stop (card->baseaddr + VIA_BASE0_PCM_IN_CHAN); + via_chan_stop (card->baseaddr + VIA_BASE0_FM_OUT_CHAN); + + /* + * clear any existing stops / flags (sanity check mainly) + */ + via_chan_status_clear (card->baseaddr + VIA_BASE0_PCM_OUT_CHAN); + via_chan_status_clear (card->baseaddr + VIA_BASE0_PCM_IN_CHAN); + via_chan_status_clear (card->baseaddr + VIA_BASE0_FM_OUT_CHAN); + + /* + * clear any enabled interrupt bits, reset to 8-bit mono PCM mode + */ + outb (0, card->baseaddr + VIA_BASE0_PCM_OUT_CHAN); + outb (0, card->baseaddr + VIA_BASE0_PCM_IN_CHAN); + outb (0, card->baseaddr + VIA_BASE0_FM_OUT_CHAN); + DPRINTK ("EXIT\n"); +} + + +static int via_set_rate (struct via_info *card, unsigned rate, int inhale_deeply) +{ +#if 0 + unsigned long flags; + u32 status; + u8 status8; +#endif + + DPRINTK ("ENTER, rate = %d, inhale = %s\n", + rate, inhale_deeply ? "yes" : "no"); + + if (rate > 48000) rate = 48000; + if (rate < 4000) rate = 4000; + +#if 0 + status8 = via_ac97_wait_idle (card); + if (status8 & VIA_CR83_BUSY) { + DPRINTK ("EXIT, status=0x%X, returning -EIO\n", status); + return -EIO; + } + + if (inhale_deeply) { + card->ch_in.rate = rate; + + spin_lock_irqsave (&card->lock, flags); + outl (VIA_SET_RATE_IN + rate, + card->baseaddr + VIA_BASE0_AC97_CTRL); + spin_unlock_irqrestore (&card->lock, flags); + } else { + card->ch_out.rate = rate; + + spin_lock_irqsave (&card->lock, flags); + outl (VIA_SET_RATE_OUT + rate, + card->baseaddr + VIA_BASE0_AC97_CTRL); + spin_unlock_irqrestore (&card->lock, flags); + } + +#else + via_ac97_write_reg (&card->ac97, AC97_POWER_CONTROL, + (via_ac97_read_reg (&card->ac97, AC97_POWER_CONTROL) & ~0x0200) | + 0x0200); + via_ac97_write_reg (&card->ac97, AC97_PCM_FRONT_DAC_RATE, rate); + via_ac97_write_reg (&card->ac97, AC97_POWER_CONTROL, + via_ac97_read_reg (&card->ac97, AC97_POWER_CONTROL) & ~0x0200); +#endif + + DPRINTK ("EXIT, returning 0\n"); + return rate; +} + + +static inline int via_set_adc_rate (struct via_info *card, int rate) { - struct resource *rsrc = &pdev->resource[0]; - outw ((u16)data,rsrc->start+port); - outw ((u16)(data>>16),rsrc->start+port+2); + return via_set_rate (card, rate, 1); } -static inline u32 via_ac97_read32 (struct pci_dev *pdev, int port) + +static inline int via_set_dac_rate (struct via_info *card, int rate) { - struct resource *rsrc = &pdev->resource[0]; - return - ((u32)inw (rsrc->start+port)) | - (((u32)inw (rsrc->start+port+2)) << 16); + return via_set_rate (card, rate, 0); } + /**************************************************************** * - * Intel Audio Codec '97 interface + * Channel-specific operations * * */ -static inline void via_ac97_wait_idle (struct pci_dev *pdev) +static int via_chan_init (struct via_info *card, + struct via_channel *chan, long chan_ofs) +{ + int i; + unsigned long flags; + + DPRINTK ("ENTER\n"); + + memset (chan, 0, sizeof (*chan)); + + /* alloc DMA-able memory for scatter-gather table */ + chan->sgtable = pci_alloc_consistent (card->pdev, + (sizeof (struct via_sgd_table) * VIA_DMA_BUFFERS), + &chan->sgt_handle); + if (!chan->sgtable) { + printk (KERN_ERR PFX "DMA table alloc fail, aborting\n"); + DPRINTK ("EXIT\n"); + return -ENOMEM; + } + + memset ((void*)chan->sgtable, 0, + (sizeof (struct via_sgd_table) * VIA_DMA_BUFFERS)); + + /* alloc DMA-able memory for scatter-gather buffers */ + for (i = 0; i < VIA_DMA_BUFFERS; i++) { + chan->sgbuf[i].cpuaddr = + pci_alloc_consistent (card->pdev, VIA_DMA_BUF_SIZE, + &chan->sgbuf[i].handle); + + if (!chan->sgbuf[i].cpuaddr) + goto err_out_nomem; + + if (i < (VIA_DMA_BUFFERS - 1)) + chan->sgtable[i].count = cpu_to_le32 (VIA_DMA_BUF_SIZE | VIA_FLAG); + else + chan->sgtable[i].count = cpu_to_le32 (VIA_DMA_BUF_SIZE | VIA_EOL); + chan->sgtable[i].addr = cpu_to_le32 (chan->sgbuf[i].handle); + +#ifndef VIA_NDEBUG + memset (chan->sgbuf[i].cpuaddr, 0xBC, VIA_DMA_BUF_SIZE); +#endif + +#if 1 + DPRINTK ("dmabuf #%d (h=%lx, 32(h)=%lx, v2p=%lx, a=%p)\n", + i, (long)chan->sgbuf[i].handle, + (long)chan->sgtable[i].addr, + virt_to_phys(chan->sgbuf[i].cpuaddr), + chan->sgbuf[i].cpuaddr); +#endif + } + + init_waitqueue_head (&chan->wait); + + chan->pcm_fmt = VIA_PCM_FMT_MASK; + chan->iobase = card->baseaddr + chan_ofs; + + spin_lock_irqsave (&card->lock, flags); + + /* stop any existing channel output */ + via_chan_clear (chan); + via_chan_status_clear (chan->iobase); + via_chan_pcm_fmt (card, chan, 1); + + spin_unlock_irqrestore (&card->lock, flags); + + /* set location of DMA-able scatter-gather info table */ + DPRINTK("outl (0x%X, 0x%04lX)\n", + cpu_to_le32 (chan->sgt_handle), + card->baseaddr + chan_ofs + VIA_PCM_TABLE_ADDR); + + via_ac97_wait_idle (card); + outl (cpu_to_le32 (chan->sgt_handle), + card->baseaddr + chan_ofs + VIA_PCM_TABLE_ADDR); + udelay (20); + via_ac97_wait_idle (card); + + DPRINTK("inl (0x%lX) = %x\n", + chan->iobase + VIA_PCM_TABLE_ADDR, + inl(chan->iobase + VIA_PCM_TABLE_ADDR)); + + DPRINTK ("EXIT\n"); + return 0; + +err_out_nomem: + printk (KERN_ERR PFX "DMA buffer alloc fail, aborting\n"); + via_chan_free (card, chan); + DPRINTK ("EXIT\n"); + return -ENOMEM; +} + + +static void via_chan_free (struct via_info *card, struct via_channel *chan) +{ + int i; + unsigned long flags; + + DPRINTK ("ENTER\n"); + + synchronize_irq(); + + spin_lock_irqsave (&card->lock, flags); + + /* stop any existing channel output */ + via_chan_stop (chan->iobase); + via_chan_status_clear (chan->iobase); + via_chan_pcm_fmt (card, chan, 1); + + spin_unlock_irqrestore (&card->lock, flags); + + /* zero location of DMA-able scatter-gather info table */ + via_ac97_wait_idle(card); + outl (0, chan->iobase + VIA_PCM_TABLE_ADDR); + + for (i = 0; i < VIA_DMA_BUFFERS; i++) + if (chan->sgbuf[i].cpuaddr) { + pci_free_consistent (card->pdev, VIA_DMA_BUF_SIZE, + (void*)chan->sgbuf[i].cpuaddr, + chan->sgbuf[i].handle); + chan->sgbuf[i].cpuaddr = NULL; + chan->sgbuf[i].handle = 0; + } + + if (chan->sgtable) { + pci_free_consistent (card->pdev, + (sizeof (struct via_sgd_table) * VIA_DMA_BUFFERS), + (void*)chan->sgtable, chan->sgt_handle); + chan->sgtable = NULL; + } + + DPRINTK ("EXIT\n"); +} + + +static void via_chan_pcm_fmt (struct via_info *card, + struct via_channel *chan, int reset) +{ + DPRINTK ("ENTER, pcm_fmt=0x%02X, reset=%s\n", + chan->pcm_fmt, reset ? "yes" : "no"); + + assert (card != NULL); + assert (chan != NULL); + + if (reset) + /* reset to 8-bit mono mode */ + chan->pcm_fmt = 0; + + /* enable interrupts on FLAG and EOL */ + chan->pcm_fmt |= VIA_CHAN_TYPE_MASK; + + /* set interrupt select bits where applicable (PCM & FM out channels) */ + if (chan == &card->ch_out) + chan->pcm_fmt |= VIA_CHAN_TYPE_INT_SELECT; + + outb (chan->pcm_fmt, chan->iobase + 2); + + DPRINTK ("EXIT, pcm_fmt = 0x%02X, reg = 0x%02X\n", + chan->pcm_fmt, + inb (chan->iobase + 2)); +} + + +static void via_chan_clear (struct via_channel *chan) +{ + via_chan_stop (chan->iobase); + atomic_set (&chan->state, sgd_stopped); + atomic_set (&chan->buf_in_use, 0); + atomic_set (&chan->next_buf, 0); +} + + +static int via_chan_set_speed (struct via_info *card, + struct via_channel *chan, int val) +{ + DPRINTK ("ENTER, requested rate = %d\n", val); + + via_chan_clear (chan); + + val = via_set_rate (card, val, chan == &card->ch_in); + + DPRINTK ("EXIT, returning %d\n", val); + return val; +} + + +static int via_chan_set_fmt (struct via_info *card, + struct via_channel *chan, int val) +{ + DPRINTK ("ENTER, val=%s\n", + val == AFMT_U8 ? "AFMT_U8" : + val == AFMT_S16_LE ? "AFMT_S16_LE" : + "unknown"); + + via_chan_clear (chan); + + switch (val) { + case AFMT_U8: + chan->pcm_fmt &= ~VIA_PCM_FMT_16BIT; + via_chan_pcm_fmt (card, chan, 0); + break; + case AFMT_S16_LE: + chan->pcm_fmt |= VIA_PCM_FMT_16BIT; + via_chan_pcm_fmt (card, chan, 0); + break; + default: + printk (KERN_WARNING PFX "unknown AFMT\n"); + val = -EINVAL; + break; + } + + DPRINTK ("EXIT, returning %d\n", val); + return val; +} + + +static int via_chan_set_stereo (struct via_info *card, + struct via_channel *chan, int val) +{ + DPRINTK ("ENTER, channels = %d\n", val); + + via_chan_clear (chan); + + switch (val) { + + /* mono */ + case 1: + chan->pcm_fmt &= ~VIA_PCM_FMT_STEREO; + via_chan_pcm_fmt (card, chan, 0); + break; + + /* stereo */ + case 2: + chan->pcm_fmt |= VIA_PCM_FMT_STEREO; + via_chan_pcm_fmt (card, chan, 0); + break; + + /* unknown */ + default: + printk (KERN_WARNING PFX "unknown number of channels\n"); + val = -EINVAL; + break; + } + + DPRINTK ("EXIT, returning %d\n", val); + return val; +} + + +#if 0 +static void via_chan_dump_bufs (struct via_channel *chan) +{ + int i; + + for (i = 0; i < VIA_DMA_BUFFERS; i++) { + DPRINTK ("#%02d: addr=%x, count=%u, flag=%d, eol=%d\n", + i, chan->sgtable[i].addr, + chan->sgtable[i].count & 0x00FFFFFF, + chan->sgtable[i].count & VIA_FLAG ? 1 : 0, + chan->sgtable[i].count & VIA_EOL ? 1 : 0); + } + DPRINTK ("buf_in_use = %d, nextbuf = %d\n", + atomic_read (&chan->buf_in_use), + atomic_read (&chan->next_buf)); +} +#endif + + +/**************************************************************** + * + * Interface to ac97-codec module + * + * + */ + +static u8 via_ac97_wait_idle (struct via_info *card) +{ + u8 tmp8; + int counter = VIA_COUNTER_LIMIT; + + DPRINTK ("ENTER/EXIT\n"); + + assert (card != NULL); + assert (card->pdev != NULL); + + do { + if (current->need_resched) + schedule (); + else + udelay (10); + + spin_lock_irq (&card->lock); + tmp8 = inb (card->baseaddr + 0x83); + spin_unlock_irq (&card->lock); + } while ((tmp8 & VIA_CR83_BUSY) && (counter-- > 0)); + + return tmp8; +} + + +static u32 via_ac97_wait_valid (struct via_info *card) { u32 tmp; int counter = VIA_COUNTER_LIMIT; DPRINTK ("ENTER\n"); - assert (pdev != NULL); + assert (card != NULL); + assert (card->pdev != NULL); do { - tmp = via_ac97_read32 (pdev,VIA_AC97_CTRL); + if (current->need_resched) + schedule (); + + spin_lock_irq (&card->lock); + tmp = inl (card->baseaddr + VIA_BASE0_AC97_CTRL); + spin_unlock_irq (&card->lock); + + udelay (10); + + if (tmp & VIA_CR80_FIRST_CODEC_VALID) { + DPRINTK ("EXIT valid, tmp=0x%X, cnt=%d\n", tmp, counter); + return tmp; + } } while ((tmp & VIA_CR80_BUSY) && (counter-- > 0)); - DPRINTK ("EXIT%s\n", counter > 0 ? "" : ", counter limit reached"); + DPRINTK ("EXIT, tmp=0x%X, cnt=%d%s\n", tmp, counter, + counter > 0 ? "" : ", counter limit reached"); + return tmp; } -static int via_ac97_read_reg (struct ac97_hwint *dev, u8 reg) +static u16 via_ac97_read_reg (struct ac97_codec *codec, u8 reg) { u32 data; struct via_info *card; - struct pci_dev *pdev; + int counter; DPRINTK ("ENTER\n"); - assert (dev != NULL); - assert (dev->driver_private != NULL); + assert (codec != NULL); + assert (codec->private_data != NULL); - card = (struct via_info *) dev->driver_private; - pdev = card->pdev; - assert (pdev != NULL); + card = codec->private_data; - via_ac97_wait_idle (pdev); - data = VIA_CR80_FIRST_CODEC | VIA_CR80_FIRST_CODEC_VALID | - VIA_CR80_READ_MODE | VIA_CR80_REG_IDX(reg); - via_ac97_write32 (pdev,VIA_AC97_CTRL,data); - via_ac97_wait_idle (pdev); - data = via_ac97_read32 (pdev,VIA_AC97_CTRL); + data = (reg << 16) | VIA_CR80_READ; -#if 0 - if (! (data & VIA_CR80_FIRST_CODEC_VALID)) { - DPRINTK ("EXIT, first codec not valid, returning -1\n"); - return -1; + outl (data, card->baseaddr + VIA_BASE0_AC97_CTRL); + udelay (20); + + for (counter = VIA_COUNTER_LIMIT; counter > 0; counter--) { + if (inl (card->baseaddr + 0x80) & VIA_CR80_VALID) + goto out; + udelay(10); + if (current->need_resched) + schedule (); } -#endif - DPRINTK ("EXIT, returning %d\n", data & 0xFFFF); - return data & 0xFFFF; + printk (KERN_WARNING PFX "timeout while reading AC97 codec\n"); + goto err_out; + +out: + data = inl (card->baseaddr + 0x80); + outb (0x02, card->baseaddr + 0x83); + + if (((data & 0x007F0000) >> 16) == reg) { + DPRINTK ("EXIT, success, data=0x%x, retval=0x%x\n", + data, data & 0x0000FFFF); + return data & 0x0000FFFF; + } + + DPRINTK ("WARNING: not our index: reg=0x%x, newreg=0x%x\n", + reg, ((data & 0x007F0000) >> 16)); + +err_out: + DPRINTK ("EXIT, returning 0\n"); + return 0; } -static int via_ac97_write_reg (struct ac97_hwint *dev, u8 reg, u16 value) +static void via_ac97_write_reg (struct ac97_codec *codec, u8 reg, u16 value) { u32 data; struct via_info *card; + int counter; + + DPRINTK ("ENTER\n"); + + assert (codec != NULL); + assert (codec->private_data != NULL); + + card = codec->private_data; + + data = (reg << 16) + value; + outl (data, card->baseaddr + VIA_BASE0_AC97_CTRL); + udelay (20); + + for (counter = VIA_COUNTER_LIMIT; counter > 0; counter--) { + if ((inb (card->baseaddr + 0x83) & VIA_CR83_BUSY) == 0) + goto out; + udelay(10); + if (current->need_resched) + schedule (); + } + + printk (KERN_WARNING PFX "timeout after AC97 codec write\n"); + +out: + DPRINTK ("EXIT\n"); +} + + +static int via_mixer_open (struct inode *inode, struct file *file) +{ + int minor = MINOR(inode->i_rdev); + struct via_info *card; struct pci_dev *pdev; + struct pci_driver *drvr; DPRINTK ("ENTER\n"); - assert (dev != NULL); - assert (dev->driver_private != NULL); + MOD_INC_USE_COUNT; + + pci_for_each_dev(pdev) { + drvr = pci_dev_driver (pdev); + if (drvr == &via_driver) { + assert (pdev->driver_data != NULL); + + card = pdev->driver_data; + if (card->ac97.dev_mixer == minor) + goto match; + } + } + + DPRINTK ("EXIT, returning -ENODEV\n"); + MOD_DEC_USE_COUNT; + return -ENODEV; + +match: + file->private_data = &card->ac97; + + DPRINTK ("EXIT, returning 0\n"); + return 0; +} + + +static int via_mixer_release (struct inode *inode, struct file *file) +{ + DPRINTK ("ENTER\n"); + + MOD_DEC_USE_COUNT; + + DPRINTK ("EXIT, returning 0\n"); + return 0; +} + + +static int via_mixer_ioctl (struct inode *inode, struct file *file, unsigned int cmd, + unsigned long arg) +{ + struct ac97_codec *codec = file->private_data; + int rc; + + assert (codec != NULL); + + rc = codec->mixer_ioctl(codec, cmd, arg); + + return rc; +} + + +static loff_t via_llseek(struct file *file, loff_t offset, int origin) +{ + DPRINTK ("ENTER\n"); + + DPRINTK("EXIT, returning -ESPIPE\n"); + return -ESPIPE; +} + + +static struct file_operations via_mixer_fops = { + open: via_mixer_open, + release: via_mixer_release, + llseek: via_llseek, + ioctl: via_mixer_ioctl, +}; + + +static struct { + u8 reg; + u16 data; +} mixer_init_vals[] __devinitdata = { + { 0x2, 0x404 }, + { 0x4, 0x404 }, + { 0x6, 0x404 }, + { 0x18, 0x404 }, + { 0x10, 0x404 }, + { 0x1a, 0x404 }, + { 0x1c, 0x404 }, + { 0x1a, 0x404 }, + { 0x1c, 0xc0c }, + { 0x12, 0x808 }, + { 0x10, 0x808 }, + { 0xe, 0x2 }, + { 0x2, 0x808 }, + { 0x18, 0x808 }, +}; + + +static int __init via_ac97_reset (struct via_info *card) +{ + struct pci_dev *pdev = card->pdev; + u8 tmp8; + u16 tmp16; + size_t idx; + + DPRINTK ("ENTER\n"); - card = (struct via_info *) dev->driver_private; - pdev = card->pdev; assert (pdev != NULL); + +#ifndef NDEBUG + { + u8 r40,r41,r42,r43,r44,r48; + pci_read_config_byte (card->pdev, 0x40, &r40); + pci_read_config_byte (card->pdev, 0x41, &r41); + pci_read_config_byte (card->pdev, 0x42, &r42); + pci_read_config_byte (card->pdev, 0x43, &r43); + pci_read_config_byte (card->pdev, 0x44, &r44); + pci_read_config_byte (card->pdev, 0x48, &r48); + DPRINTK("PCI config: %02X %02X %02X %02X %02X %02X\n", + r40,r41,r42,r43,r44,r48); + + spin_lock_irq (&card->lock); + DPRINTK ("regs==%02X %02X %02X %08X %08X %08X %08X\n", + inb (card->baseaddr + 0x00), + inb (card->baseaddr + 0x01), + inb (card->baseaddr + 0x02), + inl (card->baseaddr + 0x04), + inl (card->baseaddr + 0x0C), + inl (card->baseaddr + 0x80), + inl (card->baseaddr + 0x84)); + spin_unlock_irq (&card->lock); + + } +#endif + +#if 1 - via_ac97_wait_idle (pdev); - data = VIA_CR80_FIRST_CODEC | VIA_CR80_FIRST_CODEC_VALID | - VIA_CR80_WRITE_MODE | VIA_CR80_REG_IDX(reg) | value; - via_ac97_write32 (pdev,VIA_AC97_CTRL,data); + /* + * reset AC97 controller: enable, disable, enable + * pause after each command for good luck + */ + pci_write_config_byte (pdev, VIA_ACLINK_CTRL, VIA_CR41_AC97_ENABLE | + VIA_CR41_AC97_RESET | VIA_CR41_AC97_WAKEUP); + udelay (100); + + pci_write_config_byte (pdev, VIA_ACLINK_CTRL, 0); + udelay (100); + + pci_write_config_byte (pdev, VIA_ACLINK_CTRL, + VIA_CR41_AC97_ENABLE | VIA_CR41_PCM_ENABLE | + VIA_CR41_VRA | VIA_CR41_AC97_RESET); + udelay (100); +#endif #if 0 - if (! (data & VIA_CR80_FIRST_CODEC_VALID)) { - DPRINTK ("EXIT, first codec invalid, returning -1\n"); - return -1; + /* + * reset AC97 controller + */ + pci_read_config_byte(pdev, 0x08, &tmp8); + if ((tmp8 & 0xff) >= 0x20 ) { + pci_read_config_byte(pdev, 0x42, &tmp8); + pci_write_config_byte(pdev, 0x42,(tmp8 & 0x3f)); + } + udelay (100); + + /* init other mixer defaults */ + for (idx = 0; idx < arraysize(mixer_init_vals); idx++) { + via_ac97_write_reg (&card->ac97, + mixer_init_vals[idx].reg, + mixer_init_vals[idx].data); + udelay (20); } + + pci_write_config_byte (pdev, 0x41, 0xc0); + udelay (10); + pci_read_config_byte (pdev, 0x41, &tmp8); + udelay (10); + pci_write_config_byte (pdev, 0x41, tmp8 | 0x0f); + udelay (10); + #endif + /* disable legacy stuff */ + pci_write_config_byte (pdev, 0x42, 0x00); + udelay(10); + + /* route FM trap to IRQ, disable FM trap */ + pci_write_config_byte (pdev, 0x48, 0x05); + udelay(10); + + /* disable all codec GPI interrupts */ + outl (0, pci_resource_start (pdev, 0) + 0x8C); + +#if 0 /* ALSA */ + via_ac97_write_reg (&card->ac97, AC97_EXTENDED_STATUS, 0x0009); +#if 0 + via_ac97_write_reg (&card->ac97, AC97_POWER_CONTROL, + via_ac97_read_reg (&card->ac97, AC97_POWER_CONTROL) | 0x0300); +#endif + via_ac97_write_reg (&card->ac97, AC97_EXTENDED_STATUS, + via_ac97_read_reg (&card->ac97, AC97_EXTENDED_STATUS) | 0xe800); +#endif + + /* enable variable rate */ + tmp16 = via_ac97_read_reg (&card->ac97, 0x2A); + via_ac97_write_reg (&card->ac97, 0x2A, tmp16 | 0x01); + + /* boost headphone vol if disabled */ + tmp16 = via_ac97_read_reg (&card->ac97, AC97_HEADPHONE_VOL); + if (tmp16 == 0) + via_ac97_write_reg (&card->ac97, AC97_HEADPHONE_VOL, 0x1F1F); + + pci_read_config_byte (pdev, VIA_ACLINK_CTRL, &tmp8); + if ((tmp8 & (VIA_CR41_AC97_ENABLE | VIA_CR41_AC97_RESET)) == 0) { + printk (KERN_ERR PFX "cannot enable AC97 controller, aborting\n"); + DPRINTK ("EXIT, tmp8=%X, returning -ENODEV\n", tmp8); + return -ENODEV; + } + DPRINTK ("EXIT, returning 0\n"); return 0; } -static int via_ac97_reset (struct ac97_hwint *dev) +static int __init via_ac97_init (struct via_info *card) { - struct via_info *card; - struct pci_dev *pdev; + int rc; + u16 tmp16; DPRINTK ("ENTER\n"); - assert (dev != NULL); - assert (dev->driver_private != NULL); + assert (card != NULL); - card = (struct via_info *) dev->driver_private; - pdev = card->pdev; - assert (pdev != NULL); + memset (&card->ac97, 0, sizeof (card->ac97)); + card->ac97.private_data = card; + card->ac97.codec_read = via_ac97_read_reg; + card->ac97.codec_write = via_ac97_write_reg; - pci_write_config_word (pdev, PCI_COMMAND, PCI_COMMAND_IO); + card->ac97.dev_mixer = register_sound_mixer (&via_mixer_fops, -1); + if (card->ac97.dev_mixer < 0) { + printk (KERN_ERR PFX "unable to register AC97 mixer, aborting\n"); + DPRINTK("EXIT, returning -EIO\n"); + return -EIO; + } + rc = via_ac97_reset (card); + if (rc) { + printk (KERN_ERR PFX "unable to reset AC97 codec, aborting\n"); + goto err_out; + } + + if (ac97_probe_codec (&card->ac97) == 0) { + printk (KERN_ERR PFX "unable to probe AC97 codec, aborting\n"); + rc = -EIO; + goto err_out; + } + + tmp16 = via_ac97_read_reg (&card->ac97, 0x2A); + via_ac97_write_reg (&card->ac97, 0x2A, tmp16 | 0x01); + DPRINTK ("EXIT, returning 0\n"); return 0; + +err_out: + unregister_sound_mixer (card->ac97.dev_mixer); + DPRINTK("EXIT, returning %d\n", rc); + return rc; } -static struct via_info *via_ac97_find_card_for_mixer (int dev) +static void via_ac97_cleanup (struct via_info *card) { - int x; + DPRINTK("ENTER\n"); + + assert (card != NULL); + assert (card->ac97.dev_mixer >= 0); + + unregister_sound_mixer (card->ac97.dev_mixer); + + DPRINTK("EXIT\n"); +} + + + +/**************************************************************** + * + * Interrupt-related code + * + */ + +static inline void via_interrupt_write (struct via_channel *chan) +{ + assert (atomic_read(&chan->buf_in_use) < + atomic_read(&chan->next_buf)); + + /* XXX sanity check: read h/w counter to + * ensure no lost frames */ + + atomic_inc (&chan->buf_in_use); + + /* if SG ptr catches up with userland ptr, stop playback */ + if (atomic_read(&chan->buf_in_use) == atomic_read(&chan->next_buf)) { + atomic_set (&chan->state, sgd_stopped); + via_chan_stop (chan->iobase); + } + + /* wake up anybody listening */ + if (waitqueue_active (&chan->wait)) + wake_up (&chan->wait); +} - DPRINTK ("ENTER\n"); - for (x = 0; x < num_cards; x++) - if (cards[x].mixer_oss_dev == dev) { - DPRINTK ("EXIT, returning %p\n", cards + x); - return cards + x; + +static void via_interrupt(int irq, void *dev_id, struct pt_regs *regs) +{ + struct via_info *card = dev_id; + struct via_channel *chan; + u8 status; + int unhandled = 1; + static long intcount = 0; + + assert (irq == card->pdev->irq); + + intcount++; + + status = inb (card->baseaddr + 0x00); + if (status) { + assert (card->open_mode & FMODE_WRITE); + + chan = &card->ch_out; + unhandled = 0; + + if (status & VIA_SGD_FLAG) { + assert ((status & VIA_SGD_EOL) == 0); + outb (VIA_SGD_FLAG, chan->iobase + 0x00); + DPRINTK("FLAG intr, status=0x%02X, intcount=%ld\n", + status, intcount); + via_interrupt_write (chan); + } + + if (status & VIA_SGD_EOL) { + assert ((status & VIA_SGD_FLAG) == 0); + outb (VIA_SGD_EOL, chan->iobase + 0x00); + DPRINTK("EOL intr, status=0x%02X, intcount=%ld\n", + status, intcount); + via_interrupt_write (chan); + } + + if (status & VIA_SGD_STOPPED) { + outb (VIA_SGD_STOPPED, chan->iobase + 0x00); + DPRINTK("STOPPED intr, status=0x%02X, intcount=%ld\n", + status, intcount); } - DPRINTK ("EXIT, returning 0\n"); - return NULL; +#if 0 + via_chan_dump_bufs (&card->ch_out); +#endif + } + + if (unhandled) + printk (KERN_WARNING PFX "unhandled interrupt, st=%02x, st32=%08x\n", + status, inl (card->baseaddr + 0x84)); } -static int -via_ac97_default_mixer_ioctl (int dev, unsigned int cmd, caddr_t arg) +static void via_interrupt_disable (struct via_info *card) { - int rc; - struct via_info *card = via_ac97_find_card_for_mixer (dev); + u8 tmp8; + unsigned long flags; DPRINTK ("ENTER\n"); - if (card != NULL) { - rc = ac97_mixer_ioctl (&card->ac97, cmd, arg); - DPRINTK ("EXIT, returning %d\n", rc); - return rc; + assert (card != NULL); + + spin_lock_irqsave (&card->lock, flags); + + pci_read_config_byte (card->pdev, VIA_FM_NMI_CTRL, &tmp8); + if ((tmp8 & VIA_CR48_FM_TRAP_TO_NMI) == 0) { + tmp8 |= VIA_CR48_FM_TRAP_TO_NMI; + pci_write_config_byte (card->pdev, VIA_FM_NMI_CTRL, tmp8); + } + + outb (inb (card->baseaddr + VIA_BASE0_PCM_OUT_CHAN_TYPE) & + VIA_INT_DISABLE_MASK, + card->baseaddr + VIA_BASE0_PCM_OUT_CHAN_TYPE); + outb (inb (card->baseaddr + VIA_BASE0_PCM_IN_CHAN_TYPE) & + VIA_INT_DISABLE_MASK, + card->baseaddr + VIA_BASE0_PCM_IN_CHAN_TYPE); + outb (inb (card->baseaddr + VIA_BASE0_FM_OUT_CHAN_TYPE) & + VIA_INT_DISABLE_MASK, + card->baseaddr + VIA_BASE0_FM_OUT_CHAN_TYPE); + + spin_unlock_irqrestore (&card->lock, flags); + + DPRINTK ("EXIT\n"); +} + + +static int via_interrupt_init (struct via_info *card) +{ + DPRINTK ("ENTER\n"); + + assert (card != NULL); + assert (card->pdev != NULL); + + /* check for sane IRQ number. can this ever happen? */ + if (card->pdev->irq < 2) { + printk (KERN_ERR PFX "insane IRQ %d, aborting\n", + card->pdev->irq); + DPRINTK ("EXIT, returning -EIO\n"); + return -EIO; } - DPRINTK ("EXIT, returning -ENODEV\n"); - return -ENODEV; + if (request_irq (card->pdev->irq, via_interrupt, SA_SHIRQ, VIA_MODULE_NAME, card)) { + printk (KERN_ERR PFX "unable to obtain IRQ %d, aborting\n", + card->pdev->irq); + DPRINTK ("EXIT, returning -EBUSY\n"); + return -EBUSY; + } + + /* we don't want interrupts until we're opened */ + via_interrupt_disable (card); + DPRINTK ("EXIT, returning 0\n"); + return 0; } -static struct mixer_operations via_ac97_mixer_operations = + +static void via_interrupt_cleanup (struct via_info *card) { - "VIA82Cxxx", - "via82cxxxAC97Mixer", - via_ac97_default_mixer_ioctl + DPRINTK ("ENTER\n"); + + assert (card != NULL); + assert (card->pdev != NULL); + + via_interrupt_disable (card); + + free_irq (card->pdev->irq, card); + + DPRINTK ("EXIT\n"); +} + + +/**************************************************************** + * + * OSS DSP device + * + */ + +static struct file_operations via_dsp_fops = { + open: via_dsp_open, + release: via_dsp_release, + read: via_dsp_read, + write: via_dsp_write, + poll: via_dsp_poll, + llseek: via_llseek, + ioctl: via_dsp_ioctl, }; -static int __init via_attach_ac97 (struct via_info *card) + +static int __init via_dsp_init (struct via_info *card) +{ + u8 tmp8; + + DPRINTK ("ENTER\n"); + + assert (card != NULL); + + /* turn off legacy features, if not already */ + pci_read_config_byte (card->pdev, VIA_FUNC_ENABLE, &tmp8); + tmp8 &= ~(VIA_CR42_SB_ENABLE | VIA_CR42_MIDI_ENABLE | + VIA_CR42_FM_ENABLE); + pci_write_config_byte (card->pdev, VIA_FUNC_ENABLE, tmp8); + + via_stop_everything (card); + + card->dev_dsp = register_sound_dsp (&via_dsp_fops, -1); + if (card->dev_dsp < 0) { + DPRINTK ("EXIT, returning -ENODEV\n"); + return -ENODEV; + } + DPRINTK ("EXIT, returning 0\n"); + return 0; +} + + +static void via_dsp_cleanup (struct via_info *card) +{ + DPRINTK ("ENTER\n"); + + assert (card != NULL); + assert (card->dev_dsp >= 0); + + via_stop_everything (card); + + unregister_sound_dsp (card->dev_dsp); + + DPRINTK ("EXIT\n"); +} + + +static ssize_t via_dsp_read(struct file *file, char *buffer, size_t count, loff_t *ppos) +{ + struct via_info *card; + + DPRINTK ("ENTER\n"); + + assert (file != NULL); + assert (buffer != NULL); + card = file->private_data; + assert (card != NULL); + + DPRINTK("EXIT, returning -EINVAL\n"); + return -EINVAL; +} + + + +#define sgcount(n) (sgtable[(n)].count & 0x00FFFFFF) +#define NEXTBUF (atomic_read(&chan->next_buf) % VIA_DMA_BUFFERS) +#define BUF_IN_USE (atomic_read(&chan->buf_in_use) % VIA_DMA_BUFFERS) +#define STATE_STOPPED (atomic_read (state) == sgd_stopped) +#define STATE_STARTED (atomic_read (state) == sgd_in_progress) +static ssize_t via_dsp_do_write (struct via_info *card, + const char *userbuf, size_t count, + int non_blocking) +{ + const char *orig_userbuf = userbuf; + struct via_channel *chan = &card->ch_out; + volatile struct via_sgd_table *sgtable = chan->sgtable; + atomic_t *state = &chan->state; + size_t size; + int nextbuf, prevbuf, n, realcount; + ssize_t rc; + + while (count > 0) { + if (current->need_resched) + schedule (); + + spin_lock_irq (&card->lock); + DPRINTK ("regs==%02X %02X %02X %08X %08X %08X %08X\n", + inb (card->baseaddr + 0x00), + inb (card->baseaddr + 0x01), + inb (card->baseaddr + 0x02), + inl (card->baseaddr + 0x04), + inl (card->baseaddr + 0x0C), + inl (card->baseaddr + 0x80), + inl (card->baseaddr + 0x84)); + spin_unlock_irq (&card->lock); + + size = (count < VIA_DMA_BUF_SIZE) ? count : VIA_DMA_BUF_SIZE; + + /* case 1: SGD not active, list is ours for the mangling */ + + if (STATE_STOPPED) { + DPRINTK ("case 1\n"); + + if (copy_from_user ((void*)chan->sgbuf[0].cpuaddr, + userbuf, size)) + return -EFAULT; + + assert (sgtable[0].addr == cpu_to_le32 (chan->sgbuf[0].handle)); + sgtable[0].count = size | VIA_FLAG; + + atomic_set (state, sgd_in_progress); + atomic_set (&chan->buf_in_use, 0); + atomic_set (&chan->next_buf, 1); + + count -= size; + userbuf += size; + + spin_lock_irq (&card->lock); + sg_begin (chan); + spin_unlock_irq (&card->lock); + + continue; + } + + nextbuf = NEXTBUF; + if (nextbuf) + prevbuf = nextbuf - 1; + else + prevbuf = VIA_DMA_BUFFERS - 1; + + /* case 2: if final buffer is (a) a fragment, and (b) not + * currently being consumed by the SGD engine, then append + * as much data as possible to the fragment. */ + + realcount = sgcount(prevbuf); + if (STATE_STARTED && (prevbuf != BUF_IN_USE) && + (realcount < VIA_DMA_BUF_SIZE)) { + DPRINTK ("case 2\n"); + DPRINTK ("st=%d, fb=%d -- nb=%d, pb=%d, n=%d, rc=%d\n", + atomic_read (state), + BUF_IN_USE, + nextbuf, + prevbuf, + prevbuf /* n */, + realcount); + + n = prevbuf; + + if ((VIA_DMA_BUF_SIZE - realcount) < size) + size = VIA_DMA_BUF_SIZE - realcount; + + if (copy_from_user ((void*)(chan->sgbuf[n].cpuaddr + + realcount), + userbuf, size)) + return -EFAULT; + + /* slack way to try and prevent races */ + if (prevbuf == BUF_IN_USE || !STATE_STARTED) + continue; + + assert (sgtable[n].addr == cpu_to_le32 (chan->sgbuf[n].handle)); + if (n == (VIA_DMA_BUFFERS - 1)) + sgtable[n].count = (realcount + size) | VIA_EOL; + else + sgtable[n].count = (realcount + size) | VIA_FLAG; + + count -= size; + userbuf += size; + continue; + } + + /* case 3: if there are buffers left, use one + * XXX needs more review for possible races */ + + else if (STATE_STARTED && !via_chan_full (chan)) { + DPRINTK ("case 3\n"); + DPRINTK ("st=%d, fb=%d -- nb=%d, pb=%d, n=%d\n", + atomic_read (state), + BUF_IN_USE, + nextbuf, + prevbuf, + nextbuf /* n */); + + n = nextbuf; + + if (copy_from_user ((void*)chan->sgbuf[n].cpuaddr, + userbuf, size)) + return -EFAULT; + + if (n == (VIA_DMA_BUFFERS - 1)) + sgtable[n].count = size | VIA_EOL; + else + sgtable[n].count = size | VIA_FLAG; + + /* if SGD stopped during data copy or SG table update, + * then loop back to the beginning without updating + * any pointers. + * ie. slack way to prevent race */ + if (!STATE_STARTED) + continue; + + atomic_inc (&chan->next_buf); + + count -= size; + userbuf += size; + continue; + } + + /* case 4, final SGT active case: no free buffers, wait for one */ + + else { + DPRINTK ("case 4\n"); + DPRINTK ("st=%d, fb=%d -- nb=%d, pb=%d\n", + atomic_read (state), + BUF_IN_USE, + nextbuf, + prevbuf); + + /* if playback stopped, no need to sleep */ + if (!STATE_STARTED) + continue; + + /* if buffer free, no need to sleep */ + if (!via_chan_full (chan)) + continue; + + if (non_blocking) { + rc = userbuf - orig_userbuf; + if (rc == 0) + rc = -EAGAIN; + return rc; + } + + DPRINTK ("sleeping\n"); + interruptible_sleep_on (&chan->wait); + if (signal_pending (current)) + return -ERESTARTSYS; + } + } + +#if 0 + { + u8 r40,r41,r42,r43,r44,r48; + pci_read_config_byte (card->pdev, 0x40, &r40); + pci_read_config_byte (card->pdev, 0x41, &r41); + pci_read_config_byte (card->pdev, 0x42, &r42); + pci_read_config_byte (card->pdev, 0x43, &r43); + pci_read_config_byte (card->pdev, 0x44, &r44); + pci_read_config_byte (card->pdev, 0x48, &r48); + DPRINTK("PCI config: %02X %02X %02X %02X %02X %02X\n", + r40,r41,r42,r43,r44,r48); + } +#endif + + DPRINTK ("EXIT, returning %d\n", + userbuf - orig_userbuf); + return userbuf - orig_userbuf; +} +#undef sgcount +#undef NEXTBUF +#undef BUF_IN_USE +#undef STATE_STOPPED +#undef STATE_STARTED + + +static ssize_t via_dsp_write(struct file *file, const char *buffer, size_t count, loff_t *ppos) { - int mixer; - struct ac97_hwint *mdev; + struct via_info *card; + ssize_t rc; + + DPRINTK ("ENTER, file=%p, buffer=%p, count=%u, ppos=%lu\n", + file, buffer, count, ppos ? ((unsigned long)*ppos) : 0); + + assert (file != NULL); + assert (buffer != NULL); + card = file->private_data; + assert (card != NULL); + + if (ppos != &file->f_pos) { + DPRINTK ("EXIT, returning -ESPIPE\n"); + return -ESPIPE; + } + + rc = via_dsp_do_write (card, buffer, count, (file->f_flags & O_NONBLOCK)); + + DPRINTK("EXIT, returning %ld\n",(long) rc); + return rc; +} + + +static unsigned int via_dsp_poll(struct file *file, struct poll_table_struct *wait) +{ + struct via_info *card; + unsigned int mask = 0; DPRINTK ("ENTER\n"); + assert (file != NULL); + assert (wait != NULL); + card = file->private_data; assert (card != NULL); - mdev = &card->ac97; + if ((file->f_mode & FMODE_WRITE) && + (atomic_read (&card->ch_out.state) != sgd_stopped)) { + poll_wait(file, &card->ch_out.wait, wait); + + /* XXX is this correct */ + if (atomic_read (&card->ch_out.buf_in_use) < + atomic_read (&card->ch_out.next_buf)) + mask |= POLLOUT | POLLWRNORM; + } + + DPRINTK("EXIT, returning %u\n", mask); + return mask; +} + - memset (mdev, 0, sizeof (*mdev)); - mdev->reset_device = via_ac97_reset; - mdev->read_reg = via_ac97_read_reg; - mdev->write_reg = via_ac97_write_reg; - mdev->driver_private = (void *) card; +static int via_dsp_drain_dac (struct via_info *card, int non_block) +{ + DPRINTK ("ENTER, non_block = %d\n", non_block); - if (ac97_init (mdev)) { - printk (KERN_ERR PFX "Unable to init AC97\n"); - DPRINTK ("EXIT, returning -1\n"); - return -1; + while (!via_chan_empty (&card->ch_out)) { + if (non_block) { + DPRINTK ("EXIT, returning -EBUSY\n"); + return -EBUSY; + } + if (signal_pending (current)) { + DPRINTK ("EXIT, returning -ERESTARTSYS\n"); + return -ERESTARTSYS; + } + +#ifndef NDEBUG + { + u8 r40,r41,r42,r43,r44,r48; + pci_read_config_byte (card->pdev, 0x40, &r40); + pci_read_config_byte (card->pdev, 0x41, &r41); + pci_read_config_byte (card->pdev, 0x42, &r42); + pci_read_config_byte (card->pdev, 0x43, &r43); + pci_read_config_byte (card->pdev, 0x44, &r44); + pci_read_config_byte (card->pdev, 0x48, &r48); + DPRINTK("PCI config: %02X %02X %02X %02X %02X %02X\n", + r40,r41,r42,r43,r44,r48); + + spin_lock_irq (&card->lock); + DPRINTK ("regs==%02X %02X %02X %08X %08X %08X %08X\n", + inb (card->baseaddr + 0x00), + inb (card->baseaddr + 0x01), + inb (card->baseaddr + 0x02), + inl (card->baseaddr + 0x04), + inl (card->baseaddr + 0x0C), + inl (card->baseaddr + 0x80), + inl (card->baseaddr + 0x84)); + spin_unlock_irq (&card->lock); + } - mixer = sound_alloc_mixerdev (); - if (mixer < 0 || num_mixers >= MAX_MIXER_DEV) { - printk (KERN_ERR PFX "Unable to alloc mixerdev\n"); - DPRINTK ("EXIT, returning -1\n"); - return -1; +#endif + + DPRINTK ("sleeping\n"); + interruptible_sleep_on (&card->ch_out.wait); } - mixer_devs[mixer] = &via_ac97_mixer_operations; - card->mixer_oss_dev = mixer; + + DPRINTK ("EXIT\n"); + return 0; +} + + +static int via_dsp_ioctl_space (struct via_info *card, + struct via_channel *chan, + void *arg) +{ + audio_buf_info info; + int n; + + info.fragstotal = VIA_DMA_BUFFERS; + info.fragsize = VIA_DMA_BUF_SIZE; + + /* number of full fragments we can read without blocking */ + n = atomic_read (&chan->next_buf) - atomic_read (&chan->buf_in_use); + info.fragments = VIA_DMA_BUFFERS - n; + + /* number of bytes that can be read or written immediately + * without blocking. FIXME: we are lazy and ignore partially-full + * buffers. + */ + info.bytes = info.fragments * VIA_DMA_BUF_SIZE; + + DPRINTK ("EXIT, returning fragstotal=%d, fragsize=%d, fragments=%d, bytes=%d\n", + info.fragstotal, + info.fragsize, + info.fragments, + info.bytes); + + return copy_to_user (arg, &info, sizeof (info)); +} + + - /* Some reasonable default values. */ - ac97_set_mixer (mdev, SOUND_MIXER_VOLUME, (85 << 8) | 85); - ac97_set_mixer (mdev, SOUND_MIXER_SPEAKER, 100); - ac97_set_mixer (mdev, SOUND_MIXER_PCM, (65 << 8) | 65); - ac97_set_mixer (mdev, SOUND_MIXER_CD, (65 << 8) | 65); +static int via_dsp_ioctl (struct inode *inode, struct file *file, + unsigned int cmd, unsigned long arg) +{ + int rc = -EINVAL, rd=0, wr=0, val=0; + struct via_info *card; - printk (KERN_INFO PFX "Initialized AC97 mixer\n"); + DPRINTK ("ENTER, cmd = 0x%08X\n", cmd); + + assert (file != NULL); + card = file->private_data; + assert (card != NULL); + + if (file->f_mode & FMODE_WRITE) + wr = 1; + if (file->f_mode & FMODE_READ) + rd = 1; - card->have_ac97 = mixer; + switch (cmd) { + + /* OSS API version. XXX unverified */ + case OSS_GETVERSION: + DPRINTK("EXIT, returning SOUND_VERSION\n"); + return put_user (SOUND_VERSION, (int *)arg); + + /* list of supported PCM data formats */ + case SNDCTL_DSP_GETFMTS: + DPRINTK("EXIT, returning AFMT U8|S16_LE\n"); + return put_user (AFMT_U8 | AFMT_S16_LE, (int *)arg); + + /* query or set current channel's PCM data format */ + case SNDCTL_DSP_SETFMT: + get_user_ret(val, (int *)arg, -EFAULT); + if (val != AFMT_QUERY) { + rc = 0; + + spin_lock_irq (&card->lock); + if (rc == 0 && rd) + rc = via_chan_set_fmt (card, &card->ch_in, val); + if (rc == 0 && wr) + rc = via_chan_set_fmt (card, &card->ch_out, val); + spin_unlock_irq (&card->lock); + + if (rc <= 0) + return rc ? rc : -EINVAL; + val = rc; + } else { + spin_lock_irq (&card->lock); + if ((rd && (card->ch_in.pcm_fmt & VIA_PCM_FMT_16BIT)) || + (wr && (card->ch_out.pcm_fmt & VIA_PCM_FMT_16BIT))) + val = AFMT_S16_LE; + else + val = AFMT_U8; + spin_unlock_irq (&card->lock); + } + DPRINTK("SETFMT EXIT, returning %d\n", val); + return put_user (val, (int *)arg); + + /* query or set number of channels (1=mono, 2=stereo) */ + case SNDCTL_DSP_CHANNELS: + get_user_ret(val, (int *)arg, -EFAULT); + if (val != 0) { + rc = 0; + spin_lock_irq (&card->lock); + if (rc == 0 && rd) + rc = via_chan_set_stereo (card, &card->ch_in, val); + if (rc == 0 && wr) + rc = via_chan_set_stereo (card, &card->ch_out, val); + spin_unlock_irq (&card->lock); + if (rc <= 0) + return rc ? rc : -EINVAL; + val = rc; + } else { + spin_lock_irq (&card->lock); + if ((rd && (card->ch_in.pcm_fmt & VIA_PCM_FMT_STEREO)) || + (wr && (card->ch_out.pcm_fmt & VIA_PCM_FMT_STEREO))) + val = 2; + else + val = 1; + spin_unlock_irq (&card->lock); + } + DPRINTK("CHANNELS EXIT, returning %d\n", val); + return put_user (val, (int *)arg); + /* enable (val is not zero) or disable (val == 0) stereo */ + case SNDCTL_DSP_STEREO: + get_user_ret(val, (int *)arg, -EFAULT); + rc = 0; + spin_lock_irq (&card->lock); + if (rc == 0 && rd) + rc = via_chan_set_stereo (card, &card->ch_in, val ? 2 : 1); + if (rc == 0 && wr) + rc = via_chan_set_stereo (card, &card->ch_out, val ? 2 : 1); + spin_unlock_irq (&card->lock); + if (rc <= 0) + return rc ? rc : -EINVAL; + DPRINTK("STEREO EXIT, returning %d\n", val); + return 0; + + /* query or set sampling rate */ + case SNDCTL_DSP_SPEED: + get_user_ret(val, (int *)arg, -EFAULT); + if (val < 0) + return -EINVAL; + if (val > 0) { + rc = 0; + spin_lock_irqsave (&card->lock, flags); + if (rc == 0 && rd) + rc = via_chan_set_speed (card, &card->ch_in, val); + if (rc == 0 && wr) + rc = via_chan_set_speed (card, &card->ch_out, val); + spin_unlock_irqrestore (&card->lock, flags); + if (rc <= 0) + return rc ? rc : -EINVAL; + val = rc; + } else { + spin_lock_irqsave (&card->lock, flags); + if (rd) + val = card->ch_in.rate; + else if (wr) + val = card->ch_out.rate; + else + val = 0; + spin_unlock_irqrestore (&card->lock, flags); + } + DPRINTK("SPEED EXIT, returning %d\n", val); + return put_user (val, (int *)arg); + + /* wait until all buffers have been played, and then stop device */ + case SNDCTL_DSP_SYNC: + if (wr) { + DPRINTK("SYNC EXIT (after calling via_dsp_drain_dac)\n"); + return via_dsp_drain_dac (card, file->f_flags & O_NONBLOCK); + } + break; + + /* stop recording/playback immediately */ + case SNDCTL_DSP_RESET: + if (rd) { + spin_lock_irqsave (&card->lock, flags); + via_chan_clear (&card->ch_in); + via_chan_pcm_fmt (card, &card->ch_in, 1); + spin_unlock_irqrestore (&card->lock, flags); + } + if (wr) { + spin_lock_irqsave (&card->lock, flags); + via_chan_clear (&card->ch_out); + via_chan_pcm_fmt (card, &card->ch_out, 1); + spin_unlock_irqrestore (&card->lock, flags); + } + DPRINTK("RESET EXIT, returning 0\n"); + return 0; + + /* obtain bitmask of device capabilities, such as mmap, full duplex, etc. */ + case SNDCTL_DSP_GETCAPS: + DPRINTK("GETCAPS EXIT\n"); + return put_user(DSP_CAP_REVISION, (int *)arg); + + /* obtain bitmask of device capabilities, such as mmap, full duplex, etc. */ + case SNDCTL_DSP_GETBLKSIZE: + DPRINTK("GETBLKSIZE EXIT\n"); + return put_user(VIA_DMA_BUF_SIZE, (int *)arg); + + /* obtain information about input buffering */ + case SNDCTL_DSP_GETISPACE: + DPRINTK("GETISPACE EXIT\n"); + return via_dsp_ioctl_space (card, &card->ch_in, (void*) arg); + + /* obtain information about output buffering */ + case SNDCTL_DSP_GETOSPACE: + DPRINTK("GETOSPACE EXIT\n"); + return via_dsp_ioctl_space (card, &card->ch_out, (void*) arg); + + /* return number of bytes remaining to be played by DMA engine */ + case SNDCTL_DSP_GETODELAY: + { + int n; + + n = atomic_read (&card->ch_out.next_buf) - + atomic_read (&card->ch_out.buf_in_use); + assert (n >= 0); + + if (n == 0) + val = 0; + else { + val = (n - 1) * VIA_DMA_BUF_SIZE; + val += inl (card->ch_out.iobase + VIA_BASE0_PCM_OUT_BLOCK_COUNT); + } + + DPRINTK("GETODELAY EXIT, val = %d bytes\n", val); + return put_user (val, (int *)arg); + } + + /* set fragment size. implemented as a successful no-op for now */ + case SNDCTL_DSP_SETFRAGMENT: + get_user_ret(val, (int *)arg, -EFAULT); + + DPRINTK ("SNDCTL_DSP_SETFRAGMENT (fragshift==0x%04X (%d), maxfrags==0x%04X (%d))\n", + val & 0xFFFF, + val & 0xFFFF, + (val >> 16) & 0xFFFF, + (val >> 16) & 0xFFFF); + + /* just to shut up some programs */ + return 0; + + /* inform device of an upcoming pause in input (or output). not implemented */ + case SNDCTL_DSP_POST: + DPRINTK("POST EXIT (null ioctl, returning -EINVAL)\n"); + return -EINVAL; + + /* not implemented */ + default: + DPRINTK ("unhandled ioctl\n"); + break; + } + + DPRINTK("EXIT, returning %d\n", rc); + return rc; +} + + +static int via_dsp_open (struct inode *inode, struct file *file) +{ + int open_mode, rc = -EINVAL, minor = MINOR(inode->i_rdev); + int got_read_chan = 0, is_busy; + struct via_info *card; + struct pci_dev *pdev; + struct pci_driver *drvr; + unsigned long flags; + + DPRINTK ("ENTER, minor=%d, file->f_mode=0x%x\n", minor, file->f_mode); + + MOD_INC_USE_COUNT; + + if (file->f_mode & FMODE_READ) /* no input ATM */ + goto err_out; + + card = NULL; + pci_for_each_dev(pdev) { + drvr = pci_dev_driver (pdev); + if (drvr == &via_driver) { + assert (pdev->driver_data != NULL); + + card = pdev->driver_data; + DPRINTK ("dev_dsp = %d, minor = %d, assn = %d\n", + card->dev_dsp, minor, + (card->dev_dsp ^ minor) & ~0xf); + + if (((card->dev_dsp ^ minor) & ~0xf) == 0) + goto match; + } + } + + DPRINTK ("no matching %s found\n", card ? "minor" : "driver"); + rc = -ENODEV; + goto err_out; + +match: + file->private_data = card; + + /* wait for device to become free */ + spin_lock_irqsave (&card->lock, flags); + open_mode = card->open_mode; + if (open_mode & file->f_mode) + is_busy = 1; + else { + is_busy = 0; + card->open_mode |= file->f_mode; + open_mode = card->open_mode; + } + spin_unlock_irqrestore (&card->lock, flags); + if (is_busy) { + rc = -EBUSY; + goto err_out; + } + + DPRINTK("open_mode now 0x%x\n", open_mode); + + /* handle input from analog source */ + if (file->f_mode & FMODE_READ) { + rc = via_chan_init (card, &card->ch_in, 0x10); + if (rc) + goto err_out_clear_mode; + + got_read_chan = 1; + + /* why is this forced to 16-bit stereo in all drivers? */ + card->ch_in.pcm_fmt = + VIA_PCM_FMT_16BIT | VIA_PCM_FMT_STEREO; + + spin_lock_irqsave (&card->lock, flags); + via_chan_pcm_fmt (card, &card->ch_out, 0); + spin_unlock_irqrestore (&card->lock, flags); + + via_set_adc_rate (card, 8000); + } + + /* handle output to analog source */ + if (file->f_mode & FMODE_WRITE) { + rc = via_chan_init (card, &card->ch_out, 0x00); + if (rc) + goto err_out_clear_mode; + + if ((minor & 0xf) == SND_DEV_DSP16) + card->ch_out.pcm_fmt |= VIA_PCM_FMT_16BIT; + + spin_lock_irqsave (&card->lock, flags); + via_chan_pcm_fmt (card, &card->ch_out, 0); + spin_unlock_irqrestore (&card->lock, flags); + + via_set_dac_rate (card, 8000); + } + DPRINTK ("EXIT, returning 0\n"); return 0; + +err_out_clear_mode: + if (got_read_chan) + via_chan_free (card, &card->ch_in); + spin_lock_irqsave (&card->lock, flags); + card->open_mode &= ~file->f_mode; + spin_unlock_irqrestore (&card->lock, flags); +err_out: + MOD_DEC_USE_COUNT; + DPRINTK("ERROR EXIT, returning %d\n", rc); + return rc; } -static void via_unload_ac97 (struct via_info *card) +static int via_dsp_release(struct inode *inode, struct file *file) { - DPRINTK ("ENTER\n"); + struct via_info *card; + unsigned long flags; + DPRINTK ("ENTER\n"); + + assert (file != NULL); + card = file->private_data; assert (card != NULL); + + if (file->f_mode & FMODE_READ) + via_chan_free (card, &card->ch_in); + + if (file->f_mode & FMODE_WRITE) { + via_dsp_drain_dac (card, file->f_flags & O_NONBLOCK); + via_chan_free (card, &card->ch_out); + } + + spin_lock_irqsave (&card->lock, flags); + card->open_mode &= ~(file->f_mode); + spin_unlock_irqrestore (&card->lock, flags); - if (card->have_ac97 >= 0) - sound_unload_mixerdev (card->have_ac97); + wake_up (&card->open_wait); + MOD_DEC_USE_COUNT; - DPRINTK ("EXIT\n"); + DPRINTK("EXIT, returning 0\n"); + return 0; } -#ifdef CONFIG_PROC_FS +#ifdef VIA_PROC_FS /**************************************************************** * - * /proc/driver/via82cxxx/info + * /proc/driver/via/info * * */ @@ -365,64 +2104,84 @@ static int via_info_read_proc (char *page, char **start, off_t off, int count, int *eof, void *data) { #define YN(val,bit) (((val) & (bit)) ? "yes" : "no") +#define ED(val,bit) (((val) & (bit)) ? "enable" : "disable") - int len = 0, i; + int len = 0; u8 r40, r41, r42, r44; + struct via_info *card = data; + u16 tmp16; DPRINTK ("ENTER\n"); + assert (card != NULL); + len += sprintf (page+len, VIA_CARD_NAME "\n\n"); - for (i = 0; i < num_cards; i++) { - pci_read_config_byte (cards[i].pdev, 0x40, &r40); - pci_read_config_byte (cards[i].pdev, 0x42, &r41); - pci_read_config_byte (cards[i].pdev, 0x42, &r42); - pci_read_config_byte (cards[i].pdev, 0x44, &r44); + pci_read_config_byte (card->pdev, 0x40, &r40); + pci_read_config_byte (card->pdev, 0x41, &r41); + pci_read_config_byte (card->pdev, 0x42, &r42); + pci_read_config_byte (card->pdev, 0x44, &r44); - len += sprintf (page+len, - "40 AC97 Codec Ready: %s\n" - " AC97 Codec Low-power: %s\n" - " Secondary Codec Ready: %s\n" - - "41 AC-Link Interface Enable: %s\n" - - "42 Game port enabled: %s\n" - " SoundBlaster enabled: %s\n" - " FM enabled: %s\n" - " MIDI enabled: %s\n" + len += sprintf (page+len, + "Via 82Cxxx PCI registers:\n" + "\n" + "40 Codec Ready: %s\n" + " Codec Low-power: %s\n" + " Secondary Codec Ready: %s\n" + "\n" + "41 Interface Enable: %s\n" + " De-Assert Reset: %s\n" + " Force SYNC high: %s\n" + " Force SDO high: %s\n" + " Variable Sample Rate On-Demand Mode: %s\n" + " SGD Read Channel PCM Data Out: %s\n" + " FM Channel PCM Data Out: %s\n" + " SB PCM Data Out: %s\n" + "\n" + "42 Game port enabled: %s\n" + " SoundBlaster enabled: %s\n" + " FM enabled: %s\n" + " MIDI enabled: %s\n" + "\n" + "44 AC-Link Interface Access: %s\n" + " Secondary Codec Support: %s\n" - "44 AC-Link Interface Access: %s\n" - " Secondary Codec Support: %s\n" + "\n", - "\n", + YN (r40, VIA_CR40_AC97_READY), + YN (r40, VIA_CR40_AC97_LOW_POWER), + YN (r40, VIA_CR40_SECONDARY_READY), + + ED (r41, VIA_CR41_AC97_ENABLE), + YN (r41, (1 << 6)), + YN (r41, (1 << 5)), + YN (r41, (1 << 4)), + ED (r41, (1 << 3)), + ED (r41, (1 << 2)), + ED (r41, (1 << 1)), + ED (r41, (1 << 0)), + + YN (r42, VIA_CR42_GAME_ENABLE), + YN (r42, VIA_CR42_SB_ENABLE), + YN (r42, VIA_CR42_FM_ENABLE), + YN (r42, VIA_CR42_MIDI_ENABLE), + + YN (r44, VIA_CR44_AC_LINK_ACCESS), + YN (r44, VIA_CR44_SECOND_CODEC_SUPPORT) - YN (r40, VIA_CR40_AC97_READY), - YN (r40, VIA_CR40_AC97_LOW_POWER), - YN (r40, VIA_CR40_SECONDARY_READY), - - YN (r41, VIA_CR41_ACLINK_ENABLE), + ); - YN (r42, VIA_CR42_GAME_ENABLE), - YN (r42, VIA_CR42_SB_ENABLE), - YN (r42, VIA_CR42_FM_ENABLE), - YN (r42, VIA_CR42_MIDI_ENABLE), - - YN (r44, VIA_CR44_AC_LINK_ACCESS), - YN (r44, VIA_CR44_SECOND_CODEC_SUPPORT) - - ); - } - DPRINTK("EXIT, returning %d\n", len); return len; #undef YN +#undef ED } /**************************************************************** * - * /proc/driver/via82cxxx + * /proc/driver/via/... setup and cleanup * * */ @@ -431,87 +2190,93 @@ static int __init via_init_proc (void) { DPRINTK ("ENTER\n"); - proc_mkdir ("driver/via_audio", 0); - create_proc_read_entry ("driver/via_audio/info", 0, 0, via_info_read_proc, NULL); - - DPRINTK("EXIT\n"); + if (!proc_mkdir ("driver/via", 0)) + return -EIO; + + DPRINTK ("EXIT, returning 0\n"); return 0; } - -static void __exit via_cleanup_proc (void) +static void via_cleanup_proc (void) { DPRINTK ("ENTER\n"); - remove_proc_entry ("driver/via_audio/info", NULL); - remove_proc_entry ("driver/via_audio", NULL); - DPRINTK("EXIT\n"); -} - -#else - -static inline int via_init_proc (void) { return 0; } -static inline void via_cleanup_proc (void) {} - -#endif /* CONFIG_PROC_FS */ + remove_proc_entry ("driver/via", NULL); + DPRINTK ("EXIT\n"); +} -/**************************************************************** - * - * Legacy SoundBlaster Pro, FM support via OSS - * - * - */ -static void __init via_attach_sb(struct address_info *hw_config) +static int __init via_card_init_proc (struct via_info *card) { + char s[32]; + int rc; + DPRINTK ("ENTER\n"); - if(!sb_dsp_init(hw_config)) - hw_config->slots[0] = -1; + sprintf (s, "driver/via/%d", card->card_num); + if (!proc_mkdir (s, 0)) { + rc = -EIO; + goto err_out_none; + } + + sprintf (s, "driver/via/%d/info", card->card_num); + if (!create_proc_read_entry (s, 0, 0, via_info_read_proc, card)) { + rc = -EIO; + goto err_out_dir; + } - DPRINTK("EXIT\n"); -} + sprintf (s, "driver/via/%d/ac97", card->card_num); + if (!create_proc_read_entry (s, 0, 0, ac97_read_proc, &card->ac97)) { + rc = -EIO; + goto err_out_info; + } + DPRINTK ("EXIT, returning 0\n"); + return 0; -static int __init via_probe_sb(struct address_info *hw_config) -{ - DPRINTK ("ENTER\n"); +err_out_info: + sprintf (s, "driver/via/%d/info", card->card_num); + remove_proc_entry (s, NULL); - if (check_region(hw_config->io_base, 16)) - { - printk(KERN_DEBUG PFX "SBPro port 0x%x is already in use\n", - hw_config->io_base); - return 0; - } - DPRINTK("EXIT after sb_dsp_detect\n"); - return sb_dsp_detect(hw_config, 0, 0, NULL); +err_out_dir: + sprintf (s, "driver/via/%d", card->card_num); + remove_proc_entry (s, NULL); + +err_out_none: + DPRINTK ("EXIT, returning %d\n", rc); + return rc; } -static void __exit via_unload_sb(struct address_info *hw_config) +static void via_card_cleanup_proc (struct via_info *card) { + char s[32]; + DPRINTK ("ENTER\n"); - if(hw_config->slots[0] != -1) - sb_dsp_unload(hw_config, 1); + sprintf (s, "driver/via/%d/ac97", card->card_num); + remove_proc_entry (s, NULL); - DPRINTK("EXIT\n"); + sprintf (s, "driver/via/%d/info", card->card_num); + remove_proc_entry (s, NULL); + + sprintf (s, "driver/via/%d", card->card_num); + remove_proc_entry (s, NULL); + + DPRINTK ("EXIT\n"); } -static const struct { - int sb_irq, - sb_dma, - midi_base, - sb_io_base; -} via_pnp_data[] __initdata = { - { 5, 0, 0x300, 0x220 }, - { 7, 1, 0x310, 0x240 }, - { 9, 2, 0x320, 0x260 }, - { 10,3, 0x330, 0x280 }, -}; +#else + +static inline int via_init_proc (void) { return 0; } +static inline void via_cleanup_proc (void) {} +static inline int via_card_init_proc (struct via_info *card) { return 0; } +static inline void via_card_cleanup_proc (struct via_info *card) {} + +#endif /* VIA_PROC_FS */ /**************************************************************** @@ -521,202 +2286,251 @@ static const struct { * */ -static int __init via82cxxx_install (struct pci_dev *pcidev) +static int __init via_init_one (struct pci_dev *pdev, const struct pci_device_id *id) { - int sb_io_base; - int sb_irq; - int sb_dma; - int midi_base, rc; - u8 tmp8; - struct via_info *card = &cards[num_cards]; + int rc; + struct via_info *card; + u8 tmp; + static int printed_version = 0; DPRINTK ("ENTER\n"); + + if (printed_version++ == 0) + printk (KERN_INFO "Via 686a audio driver " VIA_VERSION "\n"); + + if (!request_region (pci_resource_start (pdev, 0), + pci_resource_len (pdev, 0), + VIA_MODULE_NAME)) { + printk (KERN_ERR PFX "unable to obtain I/O resources, aborting\n"); + rc = -EBUSY; + goto err_out; + } - card->pdev = pcidev; - card->have_ac97 = -1; +#if 0 + /* chipset init copied from via */ + pci_write_config_byte(pdev, 0x41,(0xc0)); + udelay(10); + pci_read_config_byte(pdev, 0x41, &tmp); + udelay(10); + pci_write_config_byte(pdev, 0x41,(tmp | 0x0f)); + udelay(10); + pci_read_config_byte(pdev, 0x42, &tmp); + udelay(10); + pci_write_config_byte(pdev, 0x42,(tmp | 0x3f)); +#endif + + if (pci_enable_device (pdev)) { + rc = -EIO; + goto err_out_none; + } - /* turn off legacy features, if not already */ - pci_read_config_byte (pcidev, VIA_FUNC_ENABLE, &tmp8); - tmp8 &= ~(VIA_CR42_SB_ENABLE | VIA_CR42_MIDI_ENABLE | - VIA_CR42_FM_ENABLE); - pci_write_config_byte (pcidev, VIA_FUNC_ENABLE, tmp8); +#if 0 + /* chipset init copied from ALSA */ + pci_write_config_byte(pdev, 0x42, 0); + pci_write_config_byte(pdev, 0x41, 0x40); + udelay(100); + pci_write_config_byte(pdev, 0x41, 0x60); + udelay(10); + pci_write_config_byte(pdev, 0x41, 0xCC); + udelay(10); + + { + u32 data = ((AC97_POWER_CONTROL & 0x7F) << 16) | 0x0000; + udelay(100); + outl (data, pci_resource_start (pdev, 0) + VIA_BASE0_AC97_CTRL); + } +#endif + + card = kmalloc (sizeof (*card), GFP_KERNEL); + if (!card) { + printk (KERN_ERR PFX "out of memory, aborting\n"); + rc = -ENOMEM; + goto err_out_none; + } + + pdev->driver_data = card; + + memset (card, 0, sizeof (*card)); + card->pdev = pdev; + card->baseaddr = pci_resource_start (pdev, 0); + card->card_num = via_num_cards++; + spin_lock_init (&card->lock); + init_waitqueue_head(&card->open_wait); + + /* if BAR 2 is present, chip is Rev H or later, + * which means it has a few extra features */ + if (pci_resource_start (pdev, 2) > 0) + card->rev_h = 1; + + if (pdev->irq < 1) { + printk (KERN_ERR PFX "invalid PCI IRQ %d, aborting\n", pdev->irq); + rc = -ENODEV; + goto err_out_kfree; + } + if (!(pci_resource_flags (pdev, 0) & IORESOURCE_IO)) { + printk (KERN_ERR PFX "unable to locate I/O resources, aborting\n"); + rc = -ENODEV; + goto err_out_kfree; + } + /* - * try to init AC97 mixer device + * init AC97 mixer and codec */ - rc = via_attach_ac97 (card); + rc = via_ac97_init (card); if (rc) { - printk (KERN_WARNING PFX - "AC97 init failed, SB legacy mode only\n"); + printk (KERN_ERR PFX "AC97 init failed, aborting\n"); + goto err_out_kfree; } - - /* turn on legacy features */ - pci_read_config_byte (pcidev, VIA_FUNC_ENABLE, &tmp8); - tmp8 |= VIA_CR42_SB_ENABLE | VIA_CR42_MIDI_ENABLE | - VIA_CR42_FM_ENABLE; - pci_write_config_byte (pcidev, VIA_FUNC_ENABLE, tmp8); - /* read legacy PNP info byte */ - pci_read_config_byte (pcidev, VIA_PNP_CONTROL, &tmp8); - pci_write_config_byte (pcidev, VIA_PNP_CONTROL, tmp8); + /* + * init DSP device + */ + rc = via_dsp_init (card); + if (rc) { + printk (KERN_ERR PFX "DSP device init failed, aborting\n"); + goto err_out_have_mixer; + } - sb_irq = via_pnp_data[((tmp8 >> 6) & 0x03)].sb_irq; - sb_dma = via_pnp_data[((tmp8 >> 4) & 0x03)].sb_dma; - midi_base = via_pnp_data[((tmp8 >> 2) & 0x03)].midi_base; - sb_io_base = via_pnp_data[(tmp8 & 0x03)].sb_io_base; + /* + * per-card /proc info + */ + rc = via_card_init_proc (card); + if (rc) { + printk (KERN_ERR PFX "card-specific /proc init failed, aborting\n"); + goto err_out_have_dsp; + } - udelay(100); + /* + * init and turn on interrupts, as the last thing we do + */ + rc = via_interrupt_init (card); + if (rc) { + printk (KERN_ERR PFX "interrupt init failed, aborting\n"); + goto err_out_have_proc; + } - printk(KERN_INFO PFX "legacy " - "MIDI: 0x%X, SB: 0x%X / %d IRQ / %d DMA\n", - midi_base, sb_io_base, sb_irq, sb_dma); - - card->sb_data.name = VIA_CARD_NAME; - card->sb_data.card_subtype = MDL_SBPRO; - card->sb_data.io_base = sb_io_base; - card->sb_data.irq = sb_irq; - card->sb_data.dma = sb_dma; - - /* register legacy SoundBlaster Pro */ - if (!via_probe_sb (&card->sb_data)) { - printk (KERN_ERR PFX - "SB probe @ 0x%X failed, aborting\n", - sb_io_base); - DPRINTK ("EXIT, returning -1\n"); - return -1; - } - via_attach_sb (&card->sb_data); - - card->opl3_data.name = card->sb_data.name; - card->opl3_data.io_base = midi_base; - card->opl3_data.irq = -1; - - /* register legacy MIDI */ - if (!probe_uart401 (&card->opl3_data)) { - printk (KERN_WARNING PFX - "MIDI probe @ 0x%X failed, continuing\n", - midi_base); - card->opl3_data.io_base = 0; + pci_read_config_byte (pdev, 0x3C, &tmp); + if ((tmp & 0x0F) != pdev->irq) { + printk (KERN_WARNING PFX "IRQ fixup, 0x3C==0x%02X\n", tmp); + tmp &= 0xF0; + tmp |= pdev->irq; + pci_write_config_byte (pdev, 0x3C, tmp); + DPRINTK("new 0x3c==0x%02x\n", tmp); } else { - attach_uart401 (&card->opl3_data); + DPRINTK("IRQ reg 0x3c==0x%02x, irq==%d\n", + tmp, tmp & 0x0F); } - num_cards++; + printk (KERN_INFO PFX "board #%d at 0x%04lX, IRQ %d\n", + card->card_num + 1, card->baseaddr, pdev->irq); + DPRINTK ("EXIT, returning 0\n"); return 0; + +err_out_have_proc: + via_card_cleanup_proc (card); + +err_out_have_dsp: + via_dsp_cleanup (card); + +err_out_have_mixer: + via_ac97_cleanup (card); + +err_out_kfree: +#ifndef VIA_NDEBUG + memset (card, 0xAB, sizeof (*card)); /* poison memory */ +#endif + kfree (card); + +err_out_none: + release_region (pci_resource_start (pdev, 0), pci_resource_len (pdev, 0)); +err_out: + pdev->driver_data = NULL; + DPRINTK ("EXIT - returning %d\n", rc); + return rc; } -/* - * This loop walks the PCI configuration database and finds where - * the sound cards are. - * - * Note - only a single PCI scan occurs, eliminating possibility - * of multiple audio chips - * - */ - -static int __init probe_via82cxxx (void) +static void __exit via_remove_one (struct pci_dev *pdev) { - struct pci_dev *pcidev = NULL; - + struct via_info *card; + DPRINTK ("ENTER\n"); + + assert (pdev != NULL); + card = pdev->driver_data; + assert (card != NULL); + + via_interrupt_cleanup (card); + via_card_cleanup_proc (card); + via_dsp_cleanup (card); - pcidev = pci_find_device (PCI_VENDOR_ID_VIA, - PCI_DEVICE_ID_VIA_82C686_5, NULL); + release_region (pci_resource_start (pdev, 0), pci_resource_len (pdev, 0)); - if (!pcidev || via82cxxx_install (pcidev) != 0) { - printk (KERN_ERR PFX "audio init failed\n"); - DPRINTK ("EXIT, returning -1\n"); - return -1; - } +#ifndef VIA_NDEBUG + memset (card, 0xAB, sizeof (*card)); /* poison memory */ +#endif + kfree (card); - DPRINTK ("EXIT, returning 0\n"); - return 0; + pdev->driver_data = NULL; + + pci_set_power_state (pdev, 3); /* ...zzzzzz */ + + DPRINTK ("EXIT\n"); + return; } -/* - * This function is called when the user or kernel loads the - * module into memory. +/**************************************************************** + * + * Driver initialization and cleanup + * + * */ - -static int __init init_via82cxxx_module(void) +static int __init init_via82cxxx_audio(void) { - u8 tmp; - int i; - const char *rev = "unknown!"; - - memset (cards, 0, sizeof (cards)); - + int rc; + DPRINTK ("ENTER\n"); + + MOD_INC_USE_COUNT; - if (!pci_present ()) { - printk (KERN_DEBUG PFX "PCI not present, exiting\n"); - DPRINTK ("EXIT, returning -ENODEV\n"); - return -ENODEV; + rc = via_init_proc (); + if (rc) { + MOD_DEC_USE_COUNT; + DPRINTK ("EXIT, returning %d\n", rc); + return rc; } - if (probe_via82cxxx() != 0) { - printk(KERN_ERR PFX "probe failed, aborting\n"); - /* XXX unload cards registered so far, if any */ + rc = pci_register_driver (&via_driver); + if (rc < 1) { + if (rc == 0) + pci_unregister_driver (&via_driver); + via_cleanup_proc (); + MOD_DEC_USE_COUNT; DPRINTK ("EXIT, returning -ENODEV\n"); return -ENODEV; } - pci_read_config_byte (cards[0].pdev, PCI_REVISION_ID, &tmp); - for (i = 0; i < arraysize(via_chip_revs); i++) - if (via_chip_revs[i].revision == tmp) { - rev = via_chip_revs[i].rev_name; - break; - } - printk (KERN_INFO PFX VIA_CARD_NAME " loaded\n"); - printk (KERN_INFO PFX "Chip rev %s. Features: SBPro compat%s%s\n", - rev, - cards[0].opl3_data.io_base == 0 ? "" : ", MPU-401 MIDI", - cards[0].have_ac97 == -1 ? "" : ", AC97 mixer"); - - if (via_init_proc () != 0) { - printk (KERN_WARNING PFX - "Unable to init experimental /proc, ignoring\n"); - } + MOD_DEC_USE_COUNT; - /* - * Binds us to the sound subsystem - */ - SOUND_LOCK; DPRINTK ("EXIT, returning 0\n"); return 0; } -/* - * This is called when it is removed. It will only be removed - * when its use count is 0. For sound the SOUND_LOCK/SOUND_UNLOCK - * macros hide the entire work for this. - */ -static void __exit cleanup_via82cxxx_module(void) +static void __exit cleanup_via82cxxx_audio(void) { DPRINTK("ENTER\n"); - if (cards[0].opl3_data.io_base) - unload_uart401 (&cards[0].opl3_data); - - via_unload_sb (&cards[0].sb_data); - - via_unload_ac97 (&cards[0]); - + pci_unregister_driver (&via_driver); via_cleanup_proc (); - - /* - * Final clean up with the sound layer - */ - SOUND_LOCK_END; DPRINTK("EXIT\n"); } -module_init(init_via82cxxx_module); -module_exit(cleanup_via82cxxx_module); +module_init(init_via82cxxx_audio); +module_exit(cleanup_via82cxxx_audio); |