Changeset 679 for GPL/trunk/alsa-kernel/pci/bt87x.c

Timestamp:

Mar 18, 2021, 8:57:36 PM (4 years ago)

Author:

David Azarewicz

Message:

Merge changes from Paul's uniaud32next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/pci/bt87x.c (modified) (36 diffs)

GPL/trunk/alsa-kernel/pci/bt87x.c

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * bt87x.c - Brooktree Bt878/Bt879 driver for ALSA
@@ -5 +6 @@
  *
  * based on btaudio.c by Gerd Knorr <kraxel@bytesex.org>
- *
- *
- *  This driver is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This driver is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
+
+#ifdef TARGET_OS2
+#define KBUILD_MODNAME "bt87x"
+#endif
 
 #include <linux/init.h>
@@ -26 +16 @@
 #include <linux/pci.h>
 #include <linux/slab.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <linux/bitops.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
@@ -48 +38 @@
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
 #endif
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;      /* Enable this card */
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;     /* Enable this card */
 static int digital_rate[SNDRV_CARDS];   /* digital input rate */
-static int load_all;    /* allow to load the non-whitelisted cards */
+static bool load_all;   /* allow to load cards not the allowlist */
 
 module_param_array(index, int, NULL, 0444);
@@ -61 +51 @@
 MODULE_PARM_DESC(digital_rate, "Digital input rate for Bt87x soundcard");
 module_param(load_all, bool, 0444);
-MODULE_PARM_DESC(load_all, "Allow to load the non-whitelisted cards");
+MODULE_PARM_DESC(load_all, "Allow to load cards not on the allowlist");
 
 
@@ -170 +160 @@
 };
 
-static __devinitdata struct snd_bt87x_board snd_bt87x_boards[] = {
+static const struct snd_bt87x_board snd_bt87x_boards[] = {
         [SND_BT87X_BOARD_UNKNOWN] = {
                 .dig_rate = 32000, /* just a guess */
@@ -234 +224 @@
 {
         unsigned int i, offset;
-        u32 *risc;
+        __le32 *risc;
 
         if (chip->dma_risc.area == NULL) {
-                if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(chip->pci),
+                if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, &chip->pci->dev,
                                         PAGE_ALIGN(MAX_RISC_SIZE), &chip->dma_risc) < 0)
                         return -ENOMEM;
         }
-        risc = (u32 *)chip->dma_risc.area;
+        risc = (__le32 *)chip->dma_risc.area;
         offset = 0;
         *risc++ = cpu_to_le32(RISC_SYNC | RISC_SYNC_FM1);
@@ -291 +281 @@
 static void snd_bt87x_pci_error(struct snd_bt87x *chip, unsigned int status)
 {
-        u16 pci_status;
-
-        pci_read_config_word(chip->pci, PCI_STATUS, &pci_status);
-        pci_status &= PCI_STATUS_PARITY | PCI_STATUS_SIG_TARGET_ABORT |
-                PCI_STATUS_REC_TARGET_ABORT | PCI_STATUS_REC_MASTER_ABORT |
-                PCI_STATUS_SIG_SYSTEM_ERROR | PCI_STATUS_DETECTED_PARITY;
-        pci_write_config_word(chip->pci, PCI_STATUS, pci_status);
+        int pci_status = pci_status_get_and_clear_errors(chip->pci);
+
         if (pci_status != PCI_STATUS_DETECTED_PARITY)
-                snd_printk(KERN_ERR "Aieee - PCI error! status %#08x, PCI status %#04x\n",
+                dev_err(chip->card->dev,
+                        "Aieee - PCI error! status %#08x, PCI status %#04x\n",
                            status & ERROR_INTERRUPTS, pci_status);
         else {
-                snd_printk(KERN_ERR "Aieee - PCI parity error detected!\n");
+                dev_err(chip->card->dev,
+                        "Aieee - PCI parity error detected!\n");
                 /* error 'handling' similar to aic7xxx_pci.c: */
                 chip->pci_parity_errors++;
                 if (chip->pci_parity_errors > 20) {
-                        snd_printk(KERN_ERR "Too many PCI parity errors observed.\n");
-                        snd_printk(KERN_ERR "Some device on this bus is generating bad parity.\n");
-                        snd_printk(KERN_ERR "This is an error *observed by*, not *generated by*, this card.\n");
-                        snd_printk(KERN_ERR "PCI parity error checking has been disabled.\n");
+                        dev_err(chip->card->dev,
+                                "Too many PCI parity errors observed.\n");
+                        dev_err(chip->card->dev,
+                                "Some device on this bus is generating bad parity.\n");
+                        dev_err(chip->card->dev,
+                                "This is an error *observed by*, not *generated by*, this card.\n");
+                        dev_err(chip->card->dev,
+                                "PCI parity error checking has been disabled.\n");
                         chip->interrupt_mask &= ~(INT_PPERR | INT_RIPERR);
                         snd_bt87x_writel(chip, REG_INT_MASK, chip->interrupt_mask);
@@ -329 +320 @@
         if (irq_status & ERROR_INTERRUPTS) {
                 if (irq_status & (INT_FBUS | INT_FTRGT))
-                        snd_printk(KERN_WARNING "FIFO overrun, status %#08x\n", status);
+                        dev_warn(chip->card->dev,
+                                 "FIFO overrun, status %#08x\n", status);
                 if (irq_status & INT_OCERR)
-                        snd_printk(KERN_ERR "internal RISC error, status %#08x\n", status);
+                        dev_err(chip->card->dev,
+                                "internal RISC error, status %#08x\n", status);
                 if (irq_status & (INT_PPERR | INT_RIPERR | INT_PABORT))
                         snd_bt87x_pci_error(chip, irq_status);
@@ -351 +344 @@
 }
 
-static struct snd_pcm_hardware snd_bt87x_digital_hw = {
+static const struct snd_pcm_hardware snd_bt87x_digital_hw = {
         .info = SNDRV_PCM_INFO_MMAP |
                 SNDRV_PCM_INFO_INTERLEAVED |
@@ -368 +361 @@
 };
 
-static struct snd_pcm_hardware snd_bt87x_analog_hw = {
+static const struct snd_pcm_hardware snd_bt87x_analog_hw = {
         .info = SNDRV_PCM_INFO_MMAP |
                 SNDRV_PCM_INFO_INTERLEAVED |
@@ -399 +392 @@
 static int snd_bt87x_set_analog_hw(struct snd_bt87x *chip, struct snd_pcm_runtime *runtime)
 {
-        static struct snd_ratnum analog_clock = {
+        static const struct snd_ratnum analog_clock = {
                 .num = ANALOG_CLOCK,
                 .den_min = CLOCK_DIV_MIN,
@@ -405 +398 @@
                 .den_step = 1
         };
-        static struct snd_pcm_hw_constraint_ratnums constraint_rates = {
+        static const struct snd_pcm_hw_constraint_ratnums constraint_rates = {
                 .nrats = 1,
                 .rats = &analog_clock
@@ -441 +434 @@
 _error:
         clear_bit(0, &chip->opened);
-        smp_mb__after_clear_bit();
+        smp_mb__after_atomic();
         return err;
 }
@@ -456 +449 @@
         chip->substream = NULL;
         clear_bit(0, &chip->opened);
-        smp_mb__after_clear_bit();
+        smp_mb__after_atomic();
         return 0;
 }
@@ -464 +457 @@
 {
         struct snd_bt87x *chip = snd_pcm_substream_chip(substream);
-        int err;
-
-        err = snd_pcm_lib_malloc_pages(substream,
-                                       params_buffer_bytes(hw_params));
-        if (err < 0)
-                return err;
+
         return snd_bt87x_create_risc(chip, substream,
                                      params_periods(hw_params),
@@ -480 +468 @@
 
         snd_bt87x_free_risc(chip);
-        snd_pcm_lib_free_pages(substream);
         return 0;
 }
@@ -548 +535 @@
 }
 
-static struct snd_pcm_ops snd_bt87x_pcm_ops = {
+static const struct snd_pcm_ops snd_bt87x_pcm_ops = {
         .open = snd_bt87x_pcm_open,
         .close = snd_bt87x_close,
-        .ioctl = snd_pcm_lib_ioctl,
         .hw_params = snd_bt87x_hw_params,
         .hw_free = snd_bt87x_hw_free,
@@ -557 +543 @@
         .trigger = snd_bt87x_trigger,
         .pointer = snd_bt87x_pointer,
-        .page = snd_pcm_sgbuf_ops_page,
 };
 
@@ -596 +581 @@
 }
 
-static struct snd_kcontrol_new snd_bt87x_capture_volume = {
+static const struct snd_kcontrol_new snd_bt87x_capture_volume = {
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
         .name = "Capture Volume",
@@ -632 +617 @@
 }
 
-static struct snd_kcontrol_new snd_bt87x_capture_boost = {
+static const struct snd_kcontrol_new snd_bt87x_capture_boost = {
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
         .name = "Capture Boost",
@@ -674 +659 @@
 }
 
-static struct snd_kcontrol_new snd_bt87x_capture_source = {
+static const struct snd_kcontrol_new snd_bt87x_capture_source = {
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
         .name = "Capture Source",
@@ -688 +673 @@
         if (chip->irq >= 0)
                 free_irq(chip->irq, chip);
-        if (chip->mmio)
-                iounmap(chip->mmio);
+        iounmap(chip->mmio);
         pci_release_regions(chip->pci);
         pci_disable_device(chip->pci);
@@ -702 +686 @@
 }
 
-static int __devinit snd_bt87x_pcm(struct snd_bt87x *chip, int device, char *name)
+static int snd_bt87x_pcm(struct snd_bt87x *chip, int device, char *name)
 {
         int err;
@@ -713 +697 @@
         strcpy(pcm->name, name);
         snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_bt87x_pcm_ops);
-        return snd_pcm_lib_preallocate_pages_for_all(pcm,
-                                                     SNDRV_DMA_TYPE_DEV_SG,
-                                                     snd_dma_pci_data(chip->pci),
-                                                        128 * 1024,
-                                                        ALIGN(255 * 4092, 1024));
-}
-
-static int __devinit snd_bt87x_create(struct snd_card *card,
-                                      struct pci_dev *pci,
-                                      struct snd_bt87x **rchip)
+        snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV_SG,
+                                       &chip->pci->dev,
+                                       128 * 1024,
+                                       ALIGN(255 * 4092, 1024));
+        return 0;
+}
+
+static int snd_bt87x_create(struct snd_card *card,
+                            struct pci_dev *pci,
+                            struct snd_bt87x **rchip)
 {
         struct snd_bt87x *chip;
         int err;
-        static struct snd_device_ops ops = {
+        static const struct snd_device_ops ops = {
                 .dev_free = snd_bt87x_dev_free
         };
@@ -753 +737 @@
         chip->mmio = pci_ioremap_bar(pci, 0);
         if (!chip->mmio) {
-                snd_printk(KERN_ERR "cannot remap io memory\n");
+                dev_err(card->dev, "cannot remap io memory\n");
                 err = -ENOMEM;
                 goto fail;
@@ -766 +750 @@
 
         err = request_irq(pci->irq, snd_bt87x_interrupt, IRQF_SHARED,
-                          "Bt87x audio", chip);
+                          KBUILD_MODNAME, chip);
         if (err < 0) {
-                snd_printk(KERN_ERR "cannot grab irq %d\n", pci->irq);
+                dev_err(card->dev, "cannot grab irq %d\n", pci->irq);
                 goto fail;
         }
         chip->irq = pci->irq;
+        card->sync_irq = chip->irq;
         pci_set_master(pci);
-        synchronize_irq(chip->irq);
 
         err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
@@ -779 +763 @@
                 goto fail;
 
-        snd_card_set_dev(card, &pci->dev);
         *rchip = chip;
         return 0;
@@ -795 +778 @@
 /* driver_data is the card id for that device */
 
-static DEFINE_PCI_DEVICE_TABLE(snd_bt87x_ids) = {
+static const struct pci_device_id snd_bt87x_ids[] = {
         /* Hauppauge WinTV series */
         BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x0070, 0x13eb, GENERIC),
@@ -828 +811 @@
 static struct {
         unsigned short subvendor, subdevice;
-} blacklist[] __devinitdata = {
+} denylist[] = {
         {0x0071, 0x0101}, /* Nebula Electronics DigiTV */
         {0x11bd, 0x001c}, /* Pinnacle PCTV Sat */
@@ -844 +827 @@
 static struct pci_driver driver;
 
-/* return the id of the card, or a negative value if it's blacklisted */
-static int __devinit snd_bt87x_detect_card(struct pci_dev *pci)
+/* return the id of the card, or a negative value if it's on the denylist */
+static int snd_bt87x_detect_card(struct pci_dev *pci)
 {
         int i;
         const struct pci_device_id *supported;
-#ifdef TARGET_OS2
-        u16 subsystem_vendor, subsystem_device;
-#endif
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
+
         supported = pci_match_id(snd_bt87x_ids, pci);
-#else
-        supported = pci_match_device(snd_bt87x_ids, pci);
-#endif
         if (supported && supported->driver_data > 0)
                 return supported->driver_data;
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 3, 0)
-        subsystem_vendor = pci->subsystem_vendor;
-        subsystem_device = pci->subsystem_device;
-#else
-        pci_read_config_word(pci, PCI_SUBSYSTEM_VENDOR_ID, &subsystem_vendor);
-        pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &subsystem_device);
-#endif
-        for (i = 0; i < ARRAY_SIZE(blacklist); ++i)
-#ifndef TARGET_OS2
-                if (blacklist[i].subvendor == pci->subsystem_vendor &&
-                    blacklist[i].subdevice == pci->subsystem_device) {
-#else
-                if (blacklist[i].subvendor == subsystem_vendor &&
-                    blacklist[i].subdevice == subsystem_device) {
-#endif
-                        snd_printdd(KERN_INFO "card %#04x-%#04x:%#04x has no audio\n",
-#ifndef TARGET_OS2
+        for (i = 0; i < ARRAY_SIZE(denylist); ++i)
+                if (denylist[i].subvendor == pci->subsystem_vendor &&
+                    denylist[i].subdevice == pci->subsystem_device) {
+                        dev_dbg(&pci->dev,
+                                "card %#04x-%#04x:%#04x has no audio\n",
                                     pci->device, pci->subsystem_vendor, pci->subsystem_device);
-#else
-                                    pci->device, subsystem_vendor, subsystem_device);
-#endif
                         return -EBUSY;
                 }
 
-        snd_printk(KERN_INFO "unknown card %#04x-%#04x:%#04x\n",
-#ifndef TARGET_OS2
+        dev_info(&pci->dev, "unknown card %#04x-%#04x:%#04x\n",
                    pci->device, pci->subsystem_vendor, pci->subsystem_device);
-#else
-                   pci->device, subsystem_vendor, subsystem_device);
-#endif
-        snd_printk(KERN_DEBUG "please mail id, board name, and, "
+        dev_info(&pci->dev, "please mail id, board name, and, "
                    "if it works, the correct digital_rate option to "
                    "<alsa-devel@alsa-project.org>\n");
@@ -897 +854 @@
 }
 
-static int __devinit snd_bt87x_probe(struct pci_dev *pci,
-                                     const struct pci_device_id *pci_id)
+static int snd_bt87x_probe(struct pci_dev *pci,
+                           const struct pci_device_id *pci_id)
 {
         static int dev;
@@ -921 +878 @@
         }
 
-        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
+        err = snd_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE,
+                           0, &card);
         if (err < 0)
                 return err;
@@ -958 +916 @@
                         goto _error;
         }
-        snd_printk(KERN_INFO "bt87x%d: Using board %d, %sanalog, %sdigital "
+        dev_info(card->dev, "bt87x%d: Using board %d, %sanalog, %sdigital "
                    "(rate %d Hz)\n", dev, boardid,
                    chip->board.no_analog ? "no " : "",
@@ -983 +941 @@
 }
 
-static void __devexit snd_bt87x_remove(struct pci_dev *pci)
+static void snd_bt87x_remove(struct pci_dev *pci)
 {
         snd_card_free(pci_get_drvdata(pci));
-        pci_set_drvdata(pci, NULL);
 }
 
 /* default entries for all Bt87x cards - it's not exported */
 /* driver_data is set to 0 to call detection */
-static DEFINE_PCI_DEVICE_TABLE(snd_bt87x_default_ids) = {
+static const struct pci_device_id snd_bt87x_default_ids[] = {
         BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, PCI_ANY_ID, PCI_ANY_ID, UNKNOWN),
         BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_879, PCI_ANY_ID, PCI_ANY_ID, UNKNOWN),
@@ -998 +955 @@
 
 static struct pci_driver driver = {
-        .name = "Bt87x",
+        .name = KBUILD_MODNAME,
         .id_table = snd_bt87x_ids,
         .probe = snd_bt87x_probe,
-        .remove = __devexit_p(snd_bt87x_remove),
+        .remove = snd_bt87x_remove,
 };