Changeset 290 for GPL/branches/alsa-resync1/alsa-kernel/pci

Timestamp:

Feb 16, 2008, 7:40:20 AM (18 years ago)

Author:

Brendan Oakley

Message:

Merged to ALSA 1.0.2

Location:

GPL/branches/alsa-resync1/alsa-kernel/pci

Files:

• ac97/ac97_patch.c (modified) (2 diffs)
• ali5451/ali5451.c (modified) (1 diff)
• als4000.c (modified) (3 diffs)
• cmipci.c (modified) (4 diffs)
• cs4281.c (modified) (1 diff)
• emu10k1/memory.c (modified) (1 diff)
• es1968.c (modified) (3 diffs)
• ice1712/ak4xxx.c (modified) (1 diff)
• ice1712/ice1712.c (modified) (2 diffs)
• ice1712/ice1724.c (modified) (2 diffs)
• intel8x0.c (modified) (6 diffs)
• korg1212/korg1212.c (modified) (1 diff)
• maestro3.c (modified) (2 diffs)
• rme96.c (modified) (1 diff)
• rme9652/hdsp.c (modified) (2 diffs)
• rme9652/rme9652.c (modified) (1 diff)
• sonicvibes.c (modified) (4 diffs)
• trident/trident_main.c (modified) (2 diffs)
• ymfpci/ymfpci.c (modified) (1 diff)

GPL/branches/alsa-resync1/alsa-kernel/pci/ac97/ac97_patch.c

@@ -2161 +2161 @@
         unsigned short misc;
 
-        patch_ad1881(ac97);
         ac97->build_ops = &patch_ad1985_build_ops;
         misc = snd_ac97_read(ac97, AC97_AD_MISC);
@@ -2167 +2166 @@
         /* AD-compatible mode */
         /* Stereo mutes enabled */
+        /* in accordance with ADI driver: misc | 0x5c28 */
         snd_ac97_write_cache(ac97, AC97_AD_MISC, misc |
                              AC97_AD198X_LOSEL |

GPL/branches/alsa-resync1/alsa-kernel/pci/ali5451/ali5451.c

@@ -2116 +2116 @@
         return err;
     /* check, if we can restrict PCI DMA transfers to 31 bits */
-    if (!pci_dma_supported(pci, 0x7fffffff)) {
+        if (pci_set_dma_mask(pci, 0x7fffffff) < 0 ||
+            pci_set_consistent_dma_mask(pci, 0x7fffffff) < 0) {
         snd_printk("architecture does not support 31bit PCI busmaster DMA\n");
         return -ENXIO;
     }
-    pci_set_dma_mask(pci, 0x7fffffff);
 
     if ((codec = kcalloc(1, sizeof(*codec), GFP_KERNEL)) == NULL)

GPL/branches/alsa-resync1/alsa-kernel/pci/als4000.c

@@ -626 +626 @@
     }
     /* check, if we can restrict PCI DMA transfers to 24 bits */
-    if (!pci_dma_supported(pci, 0x00ffffff)) {
+        if (pci_set_dma_mask(pci, 0x00ffffff) < 0 ||
+            pci_set_consistent_dma_mask(pci, 0x00ffffff) < 0) {
         snd_printk("architecture does not support 24bit PCI busmaster DMA\n");
         return -ENXIO;
     }
-    pci_set_dma_mask(pci, 0x00ffffff);
 
     if ((err = pci_request_regions(pci, "ALS4000")) < 0)
@@ -686 +686 @@
     chip->pci = pci;
     chip->alt_port = gcr;
+        snd_card_set_dev(card, &pci->dev);
 
     snd_als4000_configure(chip);
+
+        strcpy(card->driver, "ALS4000");
+        strcpy(card->shortname, "Avance Logic ALS4000");
+        sprintf(card->longname, "%s at 0x%lx, irq %i",
+                card->shortname, chip->alt_port, chip->irq);
 
     if ((err = snd_mpu401_uart_new( card, 0, MPU401_HW_ALS4000,
@@ -723 +729 @@
         }
 #endif
-    strcpy(card->driver, "ALS4000");
-    strcpy(card->shortname, "Avance Logic ALS4000");
-    sprintf(card->longname, "%s at 0x%lx, irq %i",
-            card->shortname, chip->alt_port, chip->irq);
 
     if ((err = snd_card_register(card)) < 0) {

GPL/branches/alsa-resync1/alsa-kernel/pci/cmipci.c

@@ -1549 +1549 @@
     runtime->hw.channels_max = cm->max_channels;
     snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_SIZE, 0, 0x10000);
+        cm->dig_pcm_status = cm->dig_status;
     return 0;
 }
@@ -3005 +3006 @@
         }
 #endif
+        snd_card_set_dev(card, &pci->dev);
+
     *rcmipci = cm;
     return 0;
@@ -3206 +3209 @@
 
 /* format is: snd-cmipci=enable,index,id,
-                         mpu_port,fm_port,soft_ac3,joystick */
+                         mpu_port,fm_port,soft_ac3,joystick_port */
 
 static int __init alsa_card_cmipci_setup(char *str)
@@ -3223 +3226 @@
 #endif
 #ifdef SUPPORT_JOYSTICK
-               && get_option(&str,&joystick[nr_dev]) == 2
+               && get_option(&str,&joystick_port[nr_dev]) == 2
 #endif
                );

GPL/branches/alsa-resync1/alsa-kernel/pci/cs4281.c

@@ -1447 +1447 @@
     }
 
+        snd_card_set_dev(card, &pci->dev);
+
     *rchip = chip;
     return 0;

GPL/branches/alsa-resync1/alsa-kernel/pci/emu10k1/memory.c

@@ -539 +539 @@
  * copy_from_user(blk + offset, data, size)
  */
-int snd_emu10k1_synth_copy_from_user(struct snd_emu10k1 *emu, snd_util_memblk_t *blk, int offset, const char *data, int size)
+int snd_emu10k1_synth_copy_from_user(struct snd_emu10k1 *emu, snd_util_memblk_t *blk, int offset, const char __user *data, int size)
 {
         int page, nextofs, end_offset, temp, temp1;

GPL/branches/alsa-resync1/alsa-kernel/pci/es1968.c

@@ -2573 +2573 @@
                                        es1968_t **chip_ret)
 {
-#ifdef TARGET_OS2
     static snd_device_ops_t ops = {
                 .dev_free =     snd_es1968_dev_free,
     };
-#else
-    static snd_device_ops_t ops = {
-    dev_free:       snd_es1968_dev_free,
-    };
-#endif
     es1968_t *chip;
     int i, err;
@@ -2591 +2585 @@
         return err;
     /* check, if we can restrict PCI DMA transfers to 28 bits */
-    if (!pci_dma_supported(pci, 0x0fffffff)) {
+        if (pci_set_dma_mask(pci, 0x0fffffff) < 0 ||
+            pci_set_consistent_dma_mask(pci, 0x0fffffff) < 0) {
         snd_printk("architecture does not support 28bit PCI busmaster DMA\n");
         return -ENXIO;
     }
-    pci_set_consistent_dma_mask(pci, 0x0fffffff);
 
     chip = kcalloc(1, sizeof(*chip), GFP_KERNEL);
@@ -2669 +2663 @@
         return err;
     }
+
+        snd_card_set_dev(card, &pci->dev);
 
     *chip_ret = chip;

GPL/branches/alsa-resync1/alsa-kernel/pci/ice1712/ak4xxx.c

@@ -176 +176 @@
 }
 
+static int __init alsa_ice1712_akm4xxx_module_init(void)
+{
+        return 0;
+}
+        
+static void __exit alsa_ice1712_akm4xxx_module_exit(void)
+{
+}
+        
+module_init(alsa_ice1712_akm4xxx_module_init)
+module_exit(alsa_ice1712_akm4xxx_module_exit)
+
 EXPORT_SYMBOL(snd_ice1712_akm4xxx_init);
 EXPORT_SYMBOL(snd_ice1712_akm4xxx_free);

GPL/branches/alsa-resync1/alsa-kernel/pci/ice1712/ice1712.c

@@ -2364 +2364 @@
                 return err;
         /* check, if we can restrict PCI DMA transfers to 28 bits */
-        if (!pci_dma_supported(pci, 0x0fffffff)) {
+        if (pci_set_dma_mask(pci, 0x0fffffff) < 0 ||
+            pci_set_consistent_dma_mask(pci, 0x0fffffff) < 0) {
                 snd_printk("architecture does not support 28bit PCI busmaster DMA\n");
                 return -ENXIO;
         }
-        pci_set_consistent_dma_mask(pci, 0x0fffffff);
 
         ice = snd_magic_kcalloc(ice1712_t, 0, GFP_KERNEL);
@@ -2446 +2446 @@
         }
 
+        snd_card_set_dev(card, &pci->dev);
+
         *r_ice1712 = ice;
         return 0;

GPL/branches/alsa-resync1/alsa-kernel/pci/ice1712/ice1724.c

@@ -1802 +1802 @@
         if ((err = pci_enable_device(pci)) < 0)
                 return err;
-        pci_set_consistent_dma_mask(pci, 0xffffffff); 
 
         ice = snd_magic_kcalloc(ice1712_t, 0, GFP_KERNEL);
@@ -1866 +1865 @@
         }
 
+        snd_card_set_dev(card, &pci->dev);
+
         *r_ice1712 = ice;
         return 0;

GPL/branches/alsa-resync1/alsa-kernel/pci/intel8x0.c

@@ -778 +778 @@
 }
 
+#ifdef __i386__
+/*
+ * Intel 82443MX running a 100MHz processor system bus has a hardware bug,
+ * which aborts PCI busmaster for audio transfer.  A workaround is to set
+ * the pages as non-cached.  For details, see the errata in
+ *      http://www.intel.com/design/chipsets/specupdt/245051.htm
+ */
+static void fill_nocache(void *buf, int size, int nocache)
+{
+        size = (size + PAGE_SIZE - 1) >> PAGE_SHIFT;
+        change_page_attr(virt_to_page(buf), size, nocache ? PAGE_KERNEL_NOCACHE : PAGE_KERNEL);
+        global_flush_tlb();
+}
+#else
+#define fill_nocache(buf,size,nocache)
+#endif
+
 /*
  *  Interrupt handler
@@ -980 +997 @@
     struct intel8x0 *chip = snd_pcm_substream_chip(substream);
     struct ichdev *ichdev = get_ichdev(substream);
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        size_t size = params_buffer_bytes(hw_params);
     int dbl = params_rate(hw_params) > 48000;
     int err;
 
+        if (chip->fix_nocache && runtime->dma_area && runtime->dma_bytes < size)
+                fill_nocache(runtime->dma_area, runtime->dma_bytes, 0); /* clear */
     err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));
     if (err < 0)
         return err;
+        if (chip->fix_nocache && err > 0)
+                fill_nocache(runtime->dma_area, runtime->dma_bytes, 1);
     if (ichdev->pcm_open_flag) {
         snd_ac97_pcm_close(ichdev->pcm);
@@ -1004 +1027 @@
 static int snd_intel8x0_hw_free(snd_pcm_substream_t * substream)
 {
+        struct intel8x0 *chip = snd_pcm_substream_chip(substream);
     struct ichdev *ichdev = get_ichdev(substream);
 
@@ -1010 +1034 @@
         ichdev->pcm_open_flag = 0;
     }
+        if (chip->fix_nocache && substream->runtime->dma_area)
+                fill_nocache(substream->runtime->dma_area, substream->runtime->dma_bytes, 0);
     return snd_pcm_lib_free_pages(substream);
 }
@@ -2958 +2984 @@
     /* tables must be aligned to 8 bytes here, but the kernel pages
      are much bigger, so we don't care (on i386) */
-
+        /* workaround for 440MX */
+        if (chip->fix_nocache)
+                fill_nocache(chip->bdbars, chip->bdbars_count * sizeof(u32) * ICH_MAX_FRAGS * 2, 1);
     int_sta_masks = 0;
     for (i = 0; i < chip->bdbars_count; i++) {
@@ -3018 +3046 @@
         return err;
     }
+
+        snd_card_set_dev(card, &pci->dev);
 
     *r_intel8x0 = chip;

GPL/branches/alsa-resync1/alsa-kernel/pci/korg1212/korg1212.c

@@ -2462 +2462 @@
         }
         
+        snd_card_set_dev(card, &pci->dev);
+
         * rchip = korg1212;
         return 0;

GPL/branches/alsa-resync1/alsa-kernel/pci/maestro3.c

@@ -2706 +2706 @@
 
     /* check, if we can restrict PCI DMA transfers to 28 bits */
-    if (!pci_dma_supported(pci, 0x0fffffff)) {
+        if (pci_set_dma_mask(pci, 0x0fffffff) < 0 ||
+            pci_set_consistent_dma_mask(pci, 0x0fffffff) < 0) {
         snd_printk("architecture does not support 28bit PCI busmaster DMA\n");
         return -ENXIO;
     }
-    pci_set_consistent_dma_mask(pci, 0x0fffffff);
 
     chip = kcalloc(1, sizeof(*chip), GFP_KERNEL);
@@ -2829 +2829 @@
     snd_m3_enable_ints(chip);
     snd_m3_assp_continue(chip);
+
+        snd_card_set_dev(card, &pci->dev);
 
     *chip_ret = chip;

GPL/branches/alsa-resync1/alsa-kernel/pci/rme96.c

@@ -2511 +2511 @@
         rme96->card = card;
         rme96->pci = pci;
+        snd_card_set_dev(card, &pci->dev);
         if ((err = snd_rme96_create(rme96)) < 0) {
                 snd_card_free(card);

GPL/branches/alsa-resync1/alsa-kernel/pci/rme9652/hdsp.c

@@ -4986 +4986 @@
         
         pci_read_config_word(hdsp->pci, PCI_CLASS_REVISION, &hdsp->firmware_rev);
+        
+        /* From Martin Bjoernsen :
+            "It is important that the card's latency timer register in
+            the PCI configuration space is set to a value much larger
+            than 0 by the computer's BIOS or the driver.
+            The windows driver always sets this 8 bit register [...]
+            to its maximum 255 to avoid problems with some computers."
+        */
+        pci_write_config_byte(hdsp->pci, PCI_LATENCY_TIMER, 0xFF);
+        
         strcpy(card->driver, "H-DSP");
         strcpy(card->mixername, "Xilinx FPGA");
@@ -5148 +5158 @@
         hdsp->dev = dev;
         hdsp->pci = pci;
+        snd_card_set_dev(card, &pci->dev);
 
         if ((err = snd_hdsp_create(card, hdsp, precise_ptr[dev])) < 0) {

GPL/branches/alsa-resync1/alsa-kernel/pci/rme9652/rme9652.c

@@ -2706 +2706 @@
         rme9652->dev = dev;
         rme9652->pci = pci;
+        snd_card_set_dev(card, &pci->dev);
 
         if ((err = snd_rme9652_create(card, rme9652, precise_ptr[dev])) < 0) {

GPL/branches/alsa-resync1/alsa-kernel/pci/sonicvibes.c

@@ -1254 +1254 @@
                 return err;
         /* check, if we can restrict PCI DMA transfers to 24 bits */
-        if (!pci_dma_supported(pci, 0x00ffffff)) {
+        if (pci_set_dma_mask(pci, 0x00ffffff) < 0 ||
+            pci_set_consistent_dma_mask(pci, 0x00ffffff) < 0) {
                 snd_printk("architecture does not support 24bit PCI busmaster DMA\n");
                 return -ENXIO;
         }
-        pci_set_consistent_dma_mask(pci, 0x00ffffff);
 
         sonic = snd_magic_kcalloc(sonicvibes_t, 0, GFP_KERNEL);
@@ -1389 +1389 @@
         }
 
+        snd_card_set_dev(card, &pci->dev);
+
         *rsonic = sonic;
         return 0;
@@ -1472 +1474 @@
                 return err;
         }
-        if ((err = snd_sonicvibes_pcm(sonic, 0, NULL)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
-        if ((err = snd_sonicvibes_mixer(sonic)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
-        if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_SONICVIBES,
-                                       sonic->midi_port, 1,
-                                       sonic->irq, 0,
-                                       &midi_uart)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
-        snd_sonicvibes_midi(sonic, midi_uart);
-        if ((err = snd_opl3_create(card, sonic->synth_port,
-                                   sonic->synth_port + 2,
-                                   OPL3_HW_OPL3_SV, 1, &opl3)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
-        if ((err = snd_opl3_hwdep_new(opl3, 0, 1, NULL)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
-#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE))
-        sonic->gameport.io = sonic->game_port;
-        gameport_register_port(&sonic->gameport);
-#endif
+
         strcpy(card->driver, "SonicVibes");
         strcpy(card->shortname, "S3 SonicVibes");
@@ -1509 +1482 @@
                 pci_resource_start(pci, 1),
                 sonic->irq);
+
+        if ((err = snd_sonicvibes_pcm(sonic, 0, NULL)) < 0) {
+                snd_card_free(card);
+                return err;
+        }
+        if ((err = snd_sonicvibes_mixer(sonic)) < 0) {
+                snd_card_free(card);
+                return err;
+        }
+        if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_SONICVIBES,
+                                       sonic->midi_port, 1,
+                                       sonic->irq, 0,
+                                       &midi_uart)) < 0) {
+                snd_card_free(card);
+                return err;
+        }
+        snd_sonicvibes_midi(sonic, midi_uart);
+        if ((err = snd_opl3_create(card, sonic->synth_port,
+                                   sonic->synth_port + 2,
+                                   OPL3_HW_OPL3_SV, 1, &opl3)) < 0) {
+                snd_card_free(card);
+                return err;
+        }
+        if ((err = snd_opl3_hwdep_new(opl3, 0, 1, NULL)) < 0) {
+                snd_card_free(card);
+                return err;
+        }
+#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE))
+        sonic->gameport.io = sonic->game_port;
+        gameport_register_port(&sonic->gameport);
+#endif
 
         if ((err = snd_card_register(card)) < 0) {

GPL/branches/alsa-resync1/alsa-kernel/pci/trident/trident_main.c

@@ -3540 +3540 @@
         return err;
     /* check, if we can restrict PCI DMA transfers to 30 bits */
-    if (!pci_dma_supported(pci, 0x3fffffff)) {
+        if (pci_set_dma_mask(pci, 0x3fffffff) < 0 ||
+            pci_set_consistent_dma_mask(pci, 0x3fffffff) < 0) {
         snd_printk("architecture does not support 30bit PCI busmaster DMA\n");
         return -ENXIO;
     }
-    pci_set_dma_mask(pci, 0x3fffffff);
 
     trident = kcalloc(1, sizeof(*trident), GFP_KERNEL);
@@ -3640 +3640 @@
         return err;
     }
+        snd_card_set_dev(card, &pci->dev);
     *rtrident = trident;
     return 0;

GPL/branches/alsa-resync1/alsa-kernel/pci/ymfpci/ymfpci.c

@@ -316 +316 @@
         }
 #endif
-        strcpy(card->driver, str);
-        sprintf(card->shortname, "Yamaha DS-XG PCI (%s)", str);
-        sprintf(card->longname, "%s at 0x%lx, irq %i",
-                card->shortname,
-                chip->reg_area_phys,
-                chip->irq);
 
         if ((err = snd_card_register(card)) < 0) {