#include <sound/initval.h>
MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
-MODULE_DESCRIPTION("Intel 82801AA,82901AB,i810,i820,i830,i840,i845,MX440 modem");
+MODULE_DESCRIPTION("Intel 82801AA,82901AB,i810,i820,i830,i840,i845,MX440; SiS 7013; NVidia MCP/2/2S/3 modems");
MODULE_LICENSE("GPL");
-MODULE_CLASSES("{sound}");
-MODULE_DEVICES("{{Intel,82801AA-ICH},"
+MODULE_SUPPORTED_DEVICE("{{Intel,82801AA-ICH},"
"{Intel,82901AB-ICH0},"
"{Intel,82801BA-ICH2},"
"{Intel,82801CA-ICH3},"
module_param_array(index, int, boot_devs, 0444);
MODULE_PARM_DESC(index, "Index value for Intel i8x0 modemcard.");
-MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
module_param_array(id, charp, boot_devs, 0444);
MODULE_PARM_DESC(id, "ID string for Intel i8x0 modemcard.");
-MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
module_param_array(enable, bool, boot_devs, 0444);
MODULE_PARM_DESC(enable, "Enable Intel i8x0 modemcard.");
-MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
module_param_array(ac97_clock, int, boot_devs, 0444);
MODULE_PARM_DESC(ac97_clock, "AC'97 codec clock (0 = auto-detect).");
-MODULE_PARM_SYNTAX(ac97_clock, SNDRV_ENABLED ",default:0");
/*
* Direct registers
#ifndef PCI_DEVICE_ID_SI_7013
#define PCI_DEVICE_ID_SI_7013 0x7013
#endif
-#if 0
-#ifndef PCI_DEVICE_ID_NVIDIA_MCP_AUDIO
-#define PCI_DEVICE_ID_NVIDIA_MCP_AUDIO 0x01b1
+#ifndef PCI_DEVICE_ID_NVIDIA_MCP_MODEM
+#define PCI_DEVICE_ID_NVIDIA_MCP_MODEM 0x01c1
#endif
-#ifndef PCI_DEVICE_ID_NVIDIA_MCP2_AUDIO
-#define PCI_DEVICE_ID_NVIDIA_MCP2_AUDIO 0x006a
+#ifndef PCI_DEVICE_ID_NVIDIA_MCP2_MODEM
+#define PCI_DEVICE_ID_NVIDIA_MCP2_MODEM 0x0069
#endif
-#ifndef PCI_DEVICE_ID_NVIDIA_MCP3_AUDIO
-#define PCI_DEVICE_ID_NVIDIA_MCP3_AUDIO 0x00da
+#ifndef PCI_DEVICE_ID_NVIDIA_MCP2S_MODEM
+#define PCI_DEVICE_ID_NVIDIA_MCP2S_MODEM 0x0089
#endif
+#ifndef PCI_DEVICE_ID_NVIDIA_MCP3_MODEM
+#define PCI_DEVICE_ID_NVIDIA_MCP3_MODEM 0x00d9
#endif
+
enum { DEVICE_INTEL, DEVICE_SIS, DEVICE_ALI, DEVICE_NFORCE };
#define ICHREG(x) ICH_REG_##x
} ichdev_t;
typedef struct _snd_intel8x0m intel8x0_t;
-#define chip_t intel8x0_t
struct _snd_intel8x0m {
unsigned int device_type;
- char ac97_name[64];
- char ctrl_name[64];
int irq;
unsigned int mmio;
unsigned long addr;
unsigned long remap_addr;
- struct resource *res;
unsigned int bm_mmio;
unsigned long bmaddr;
unsigned long remap_bmaddr;
- struct resource *res_bm;
struct pci_dev *pci;
snd_card_t *card;
spinlock_t reg_lock;
spinlock_t ac97_lock;
- struct snd_dma_device dma_dev;
struct snd_dma_buffer bdbars;
u32 bdbars_count;
u32 int_sta_reg; /* interrupt status register */
{ 0x8086, 0x24d6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* ICH5 */
{ 0x8086, 0x7196, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* 440MX */
{ 0x1022, 0x7446, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* AMD768 */
-#if 0
- /* TODO: support needed */
{ 0x1039, 0x7013, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_SIS }, /* SI7013 */
- { 0x10de, 0x01b1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* NFORCE */
- { 0x10de, 0x006a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* NFORCE2 */
- { 0x10de, 0x00da, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* NFORCE3 */
+ { 0x10de, 0x01c1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* NFORCE */
+ { 0x10de, 0x0069, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* NFORCE2 */
+ { 0x10de, 0x0089, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* NFORCE2s */
+ { 0x10de, 0x00d9, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* NFORCE3 */
+#if 0
{ 0x1022, 0x746d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* AMD8111 */
{ 0x10b9, 0x5455, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_ALI }, /* Ali5455 */
#endif
outb(val, chip->bmaddr + offset);
}
+static void iputword(intel8x0_t *chip, u32 offset, u16 val)
+{
+ if (chip->bm_mmio)
+ writew(val, chip->remap_bmaddr + offset);
+ else
+ outw(val, chip->bmaddr + offset);
+}
+
static void iputdword(intel8x0_t *chip, u32 offset, u32 val)
{
if (chip->bm_mmio)
unsigned short reg,
unsigned short val)
{
- intel8x0_t *chip = snd_magic_cast(intel8x0_t, ac97->private_data, return);
+ intel8x0_t *chip = ac97->private_data;
spin_lock(&chip->ac97_lock);
if (snd_intel8x0m_codec_semaphore(chip, ac97->num) < 0) {
static unsigned short snd_intel8x0_codec_read(ac97_t *ac97,
unsigned short reg)
{
- intel8x0_t *chip = snd_magic_cast(intel8x0_t, ac97->private_data, return ~0);
+ intel8x0_t *chip = ac97->private_data;
unsigned short res;
unsigned int tmp;
static irqreturn_t snd_intel8x0_interrupt(int irq, void *dev_id, struct pt_regs *regs)
{
- intel8x0_t *chip = snd_magic_cast(intel8x0_t, dev_id, return IRQ_NONE);
+ intel8x0_t *chip = dev_id;
ichdev_t *ichdev;
unsigned int status;
unsigned int i;
spin_lock(&chip->reg_lock);
status = igetdword(chip, chip->int_sta_reg);
+ if (status == 0xffffffff) { /* we are not yet resumed */
+ spin_unlock(&chip->reg_lock);
+ return IRQ_NONE;
+ }
if ((status & chip->int_sta_mask) == 0) {
if (status)
iputdword(chip, chip->int_sta_reg, status);
.rate_max = 16000,
.channels_min = 1,
.channels_max = 1,
- .buffer_bytes_max = 32 * 1024,
+ .buffer_bytes_max = 64 * 1024,
.period_bytes_min = 32,
- .period_bytes_max = 32 * 1024,
+ .period_bytes_max = 64 * 1024,
.periods_min = 1,
.periods_max = 1024,
.fifo_size = 0,
.suffix = "Modem",
.playback_ops = &snd_intel8x0m_playback_ops,
.capture_ops = &snd_intel8x0m_capture_ops,
- .prealloc_size = 4 * 1024,
- .prealloc_max_size = 16 * 1024,
+ .prealloc_size = 32 * 1024,
+ .prealloc_max_size = 64 * 1024,
},
};
static void snd_intel8x0_mixer_free_ac97_bus(ac97_bus_t *bus)
{
- intel8x0_t *chip = snd_magic_cast(intel8x0_t, bus->private_data, return);
+ intel8x0_t *chip = bus->private_data;
chip->ac97_bus = NULL;
}
static void snd_intel8x0_mixer_free_ac97(ac97_t *ac97)
{
- intel8x0_t *chip = snd_magic_cast(intel8x0_t, ac97->private_data, return);
+ intel8x0_t *chip = ac97->private_data;
chip->ac97 = NULL;
}
static int __devinit snd_intel8x0_mixer(intel8x0_t *chip, int ac97_clock)
{
- ac97_bus_t bus, *pbus;
- ac97_t ac97, *x97;
+ ac97_bus_t *pbus;
+ ac97_template_t ac97;
+ ac97_t *x97;
int err;
unsigned int glob_sta = 0;
+ static ac97_bus_ops_t ops = {
+ .write = snd_intel8x0_codec_write,
+ .read = snd_intel8x0_codec_read,
+ };
chip->in_ac97_init = 1;
- memset(&bus, 0, sizeof(bus));
- bus.private_data = chip;
- bus.private_free = snd_intel8x0_mixer_free_ac97_bus;
- if (ac97_clock >= 8000 && ac97_clock <= 48000)
- bus.clock = ac97_clock;
- else
- bus.clock = 48000;
memset(&ac97, 0, sizeof(ac97));
ac97.private_data = chip;
ac97.scaps = AC97_SCAP_SKIP_AUDIO;
glob_sta = igetdword(chip, ICHREG(GLOB_STA));
- bus.write = snd_intel8x0_codec_write;
- bus.read = snd_intel8x0_codec_read;
- bus.vra = 1;
- if ((err = snd_ac97_bus(chip->card, &bus, &pbus)) < 0)
+ if ((err = snd_ac97_bus(chip->card, 0, &ops, chip, &pbus)) < 0)
goto __err;
+ pbus->private_free = snd_intel8x0_mixer_free_ac97_bus;
+ pbus->shared_type = AC97_SHARED_TYPE_ICH; /* shared with audio driver */
+ if (ac97_clock >= 8000 && ac97_clock <= 48000)
+ pbus->clock = ac97_clock;
chip->ac97_bus = pbus;
+
ac97.pci = chip->pci;
ac97.num = glob_sta & ICH_SCR ? 1 : 0;
if ((err = snd_ac97_mixer(pbus, &ac97, &x97)) < 0) {
} while (time_after_eq(end_time, jiffies));
}
+ if (chip->device_type == DEVICE_SIS) {
+ /* unmute the output on SIS7012 */
+ iputword(chip, 0x4c, igetword(chip, 0x4c) | 1);
+ }
+
return 0;
}
synchronize_irq(chip->irq);
__hw_end:
if (chip->bdbars.area)
- snd_dma_free_pages(&chip->dma_dev, &chip->bdbars);
+ snd_dma_free_pages(&chip->bdbars);
if (chip->remap_addr)
iounmap((void *) chip->remap_addr);
if (chip->remap_bmaddr)
iounmap((void *) chip->remap_bmaddr);
- if (chip->res) {
- release_resource(chip->res);
- kfree_nocheck(chip->res);
- }
- if (chip->res_bm) {
- release_resource(chip->res_bm);
- kfree_nocheck(chip->res_bm);
- }
if (chip->irq >= 0)
free_irq(chip->irq, (void *)chip);
- snd_magic_kfree(chip);
+ pci_release_regions(chip->pci);
+ kfree(chip);
return 0;
}
*/
static int intel8x0m_suspend(snd_card_t *card, unsigned int state)
{
- intel8x0_t *chip = snd_magic_cast(intel8x0_t, card->pm_private_data, return -EINVAL);
+ intel8x0_t *chip = card->pm_private_data;
int i;
for (i = 0; i < chip->pcm_devs; i++)
static int intel8x0m_resume(snd_card_t *card, unsigned int state)
{
- intel8x0_t *chip = snd_magic_cast(intel8x0_t, card->pm_private_data, return -EINVAL);
+ intel8x0_t *chip = card->pm_private_data;
pci_enable_device(chip->pci);
pci_set_master(chip->pci);
snd_intel8x0_chip_init(chip, 0);
static void snd_intel8x0m_proc_read(snd_info_entry_t * entry,
snd_info_buffer_t * buffer)
{
- intel8x0_t *chip = snd_magic_cast(intel8x0_t, entry->private_data, return);
+ intel8x0_t *chip = entry->private_data;
unsigned int tmp;
snd_iprintf(buffer, "Intel8x0m\n\n");
static int snd_intel8x0_dev_free(snd_device_t *device)
{
- intel8x0_t *chip = snd_magic_cast(intel8x0_t, device->device_data, return -ENXIO);
+ intel8x0_t *chip = device->device_data;
return snd_intel8x0_free(chip);
}
if ((err = pci_enable_device(pci)) < 0)
return err;
- chip = snd_magic_kcalloc(intel8x0_t, 0, GFP_KERNEL);
+ chip = kcalloc(1, sizeof(*chip), GFP_KERNEL);
if (chip == NULL)
return -ENOMEM;
spin_lock_init(&chip->reg_lock);
chip->card = card;
chip->pci = pci;
chip->irq = -1;
- snd_intel8x0m_proc_init(chip);
- sprintf(chip->ac97_name, "%s - AC'97", card->shortname);
- sprintf(chip->ctrl_name, "%s - Controller", card->shortname);
+
+ if ((err = pci_request_regions(pci, card->shortname)) < 0) {
+ kfree(chip);
+ return err;
+ }
+
if (device_type == DEVICE_ALI) {
/* ALI5455 has no ac97 region */
chip->bmaddr = pci_resource_start(pci, 0);
- if ((chip->res_bm = request_region(chip->bmaddr, 256, chip->ctrl_name)) == NULL) {
- snd_printk("unable to grab ports 0x%lx-0x%lx\n", chip->bmaddr, chip->bmaddr + 256 - 1);
- snd_intel8x0_free(chip);
- return -EBUSY;
- }
goto port_inited;
}
if (pci_resource_flags(pci, 2) & IORESOURCE_MEM) { /* ICH4 and Nforce */
chip->mmio = 1;
chip->addr = pci_resource_start(pci, 2);
- if ((chip->res = request_mem_region(chip->addr, 512, chip->ac97_name)) == NULL) {
- snd_printk("unable to grab I/O memory 0x%lx-0x%lx\n", chip->addr, chip->addr + 512 - 1);
- snd_intel8x0_free(chip);
- return -EBUSY;
- }
- chip->remap_addr = (unsigned long) ioremap_nocache(chip->addr, 512);
+ chip->remap_addr = (unsigned long) ioremap_nocache(chip->addr,
+ pci_resource_len(pci, 2));
if (chip->remap_addr == 0) {
snd_printk("AC'97 space ioremap problem\n");
snd_intel8x0_free(chip);
}
} else {
chip->addr = pci_resource_start(pci, 0);
- if ((chip->res = request_region(chip->addr, 256, chip->ac97_name)) == NULL) {
- snd_printk("unable to grab ports 0x%lx-0x%lx\n", chip->addr, chip->addr + 256 - 1);
- snd_intel8x0_free(chip);
- return -EBUSY;
- }
}
if (pci_resource_flags(pci, 3) & IORESOURCE_MEM) { /* ICH4 */
chip->bm_mmio = 1;
chip->bmaddr = pci_resource_start(pci, 3);
- if ((chip->res_bm = request_mem_region(chip->bmaddr, 256, chip->ctrl_name)) == NULL) {
- snd_printk("unable to grab I/O memory 0x%lx-0x%lx\n", chip->bmaddr, chip->bmaddr + 512 - 1);
- snd_intel8x0_free(chip);
- return -EBUSY;
- }
- chip->remap_bmaddr = (unsigned long) ioremap_nocache(chip->bmaddr, 256);
+ chip->remap_bmaddr = (unsigned long) ioremap_nocache(chip->bmaddr,
+ pci_resource_len(pci, 3));
if (chip->remap_bmaddr == 0) {
snd_printk("Controller space ioremap problem\n");
snd_intel8x0_free(chip);
}
} else {
chip->bmaddr = pci_resource_start(pci, 1);
- if ((chip->res_bm = request_region(chip->bmaddr, 128, chip->ctrl_name)) == NULL) {
- snd_printk("unable to grab ports 0x%lx-0x%lx\n", chip->bmaddr, chip->bmaddr + 128 - 1);
- snd_intel8x0_free(chip);
- return -EBUSY;
- }
}
port_inited:
/* allocate buffer descriptor lists */
/* the start of each lists must be aligned to 8 bytes */
- memset(&chip->dma_dev, 0, sizeof(chip->dma_dev));
- chip->dma_dev.type = SNDRV_DMA_TYPE_DEV;
- chip->dma_dev.dev = snd_dma_pci_data(pci);
- if (snd_dma_alloc_pages(&chip->dma_dev, chip->bdbars_count * sizeof(u32) * ICH_MAX_FRAGS * 2, &chip->bdbars) < 0) {
+ if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),
+ chip->bdbars_count * sizeof(u32) * ICH_MAX_FRAGS * 2,
+ &chip->bdbars) < 0) {
snd_intel8x0_free(chip);
return -ENOMEM;
}
{ PCI_DEVICE_ID_INTEL_ICH4_6, "Intel 82801DB-ICH4" },
{ PCI_DEVICE_ID_INTEL_ICH5_6, "Intel ICH5" },
{ 0x7446, "AMD AMD768" },
-#if 0
{ PCI_DEVICE_ID_SI_7013, "SiS SI7013" },
- { PCI_DEVICE_ID_NVIDIA_MCP_AUDIO, "NVidia nForce" },
- { PCI_DEVICE_ID_NVIDIA_MCP2_AUDIO, "NVidia nForce2" },
- { PCI_DEVICE_ID_NVIDIA_MCP3_AUDIO, "NVidia nForce3" },
+ { PCI_DEVICE_ID_NVIDIA_MCP_MODEM, "NVidia nForce" },
+ { PCI_DEVICE_ID_NVIDIA_MCP2_MODEM, "NVidia nForce2" },
+ { PCI_DEVICE_ID_NVIDIA_MCP2S_MODEM, "NVidia nForce2s" },
+ { PCI_DEVICE_ID_NVIDIA_MCP3_MODEM, "NVidia nForce3" },
+#if 0
{ 0x5455, "ALi M5455" },
{ 0x746d, "AMD AMD8111" },
#endif
switch (pci_id->driver_data) {
case DEVICE_NFORCE:
- strcpy(card->driver, "NFORCE");
+ strcpy(card->driver, "NFORCE-MODEM");
break;
default:
- strcpy(card->driver, "ICH");
+ strcpy(card->driver, "ICH-MODEM");
break;
}
return err;
}
+ snd_intel8x0m_proc_init(chip);
+
sprintf(card->longname, "%s at 0x%lx, irq %i",
card->shortname, chip->addr, chip->irq);