Changeset 732

Timestamp:

Sep 11, 2022, 3:09:04 AM (3 years ago)

Author:

Paul Smedley

Message:

Code cleanups

Location:

GPL/branches/uniaud32-next

Files:

• alsa-kernel/core/control.c (modified) (1 diff)
• alsa-kernel/core/init.c (modified) (1 diff)
• alsa-kernel/pci/ens1370.c (modified) (2 diffs)
• alsa-kernel/pci/hda/hda_intel.c (modified) (1 diff)
• alsa-kernel/pci/maestro3.c (modified) (3 diffs)
• include/linux/pci.h (modified) (4 diffs)
• lib32/pci.c (modified) (1 diff)

GPL/branches/uniaud32-next/alsa-kernel/core/control.c

@@ -1433 +1433 @@
         size_t buf_len, name_len;
         unsigned int i;
-//      const
-uintptr_t user_ptrval = ue->info.value.enumerated.names_ptr;
+        const uintptr_t user_ptrval = ue->info.value.enumerated.names_ptr;
 
         buf_len = ue->info.value.enumerated.names_length;

GPL/branches/uniaud32-next/alsa-kernel/core/init.c

@@ -239 +239 @@
                 return err;
         }
+
         devres_add(parent, card);
-
         *card_ret = card;
         return 0;

GPL/branches/uniaud32-next/alsa-kernel/pci/ens1370.c

@@ -2043 +2043 @@
                 return err;
         ensoniq->port = pci_resource_start(pci, 0);
-#ifndef TARGET_OS2
         if (devm_request_irq(&pci->dev, pci->irq, snd_audiopci_interrupt,
                              IRQF_SHARED, KBUILD_MODNAME, ensoniq)) {
@@ -2049 +2048 @@
                 return -EBUSY;
         }
-#else
-        if (request_irq(pci->irq, snd_audiopci_interrupt, IRQF_SHARED,
-                        KBUILD_MODNAME, ensoniq)) {
-                dev_err(card->dev, "unable to grab IRQ %d\n", pci->irq);
-                snd_ensoniq_free(card);
-                return -EBUSY;
-        }
-#endif
         ensoniq->irq = pci->irq;
         card->sync_irq = ensoniq->irq;

GPL/branches/uniaud32-next/alsa-kernel/pci/hda/hda_intel.c

@@ -1802 +1802 @@
         *rchip = NULL;
 
-        err = pci_enable_device(pci);
+        err = pcim_enable_device(pci);
         if (err < 0)
                 return err;
 
-#ifndef TARGET_OS2
         hda = devm_kzalloc(&pci->dev, sizeof(*hda), GFP_KERNEL);
-#else
-        hda = kzalloc(sizeof(*hda), GFP_KERNEL);
-#endif
         if (!hda)
                 return -ENOMEM;

GPL/branches/uniaud32-next/alsa-kernel/pci/maestro3.c

@@ -2565 +2565 @@
 
         chip->num_substreams = NR_DSPS;
-#ifndef TARGET_OS2
         chip->substreams = devm_kcalloc(&pci->dev, chip->num_substreams,
                                         sizeof(struct m3_dma), GFP_KERNEL);
-#else
-        chip->substreams = kcalloc(chip->num_substreams, sizeof(struct m3_dma),
-                                   GFP_KERNEL);
-#endif
         if (!chip->substreams)
                 return -ENOMEM;
@@ -2603 +2598 @@
         snd_m3_hv_init(chip);
 
-#ifndef TARGET_OS2
         if (devm_request_irq(&pci->dev, pci->irq, snd_m3_interrupt, IRQF_SHARED,
                              KBUILD_MODNAME, chip)) {
@@ -2609 +2603 @@
                 return -ENOMEM;
         }
-#else
-        if (request_irq(pci->irq, snd_m3_interrupt, IRQF_SHARED,
-                        KBUILD_MODNAME, chip)) {
-                dev_err(card->dev, "unable to grab IRQ %d\n", pci->irq);
-                return -ENOMEM;
-        }
-#endif
         chip->irq = pci->irq;
         card->sync_irq = chip->irq;

GPL/branches/uniaud32-next/include/linux/pci.h

@@ -43 +43 @@
 #define  PCI_COMMAND_SERR 0x100 /* Enable SERR */
 #define  PCI_COMMAND_FAST_BACK  0x200 /* Enable back-to-back writes */
+#define  PCI_COMMAND_INTX_DISABLE 0x400 /* INTx Emulation Disable */
 
 #define PCI_STATUS    0x06  /* 16 bits */
@@ -363 +364 @@
   struct resource dma_resource[DEVICE_COUNT_DMA];
   struct resource irq_resource[DEVICE_COUNT_IRQ];
+        unsigned int    is_managed:1;
 
   char    name[48]; /* Device name */
@@ -692 +694 @@
 }
 
-/* pci_intx() wrapper */
-#define pci_intx(pci,x)
-
 /* MSI */
 extern int snd_pci_enable_msi(struct pci_dev *dev);
@@ -784 +783 @@
 #define pcim_iomap pci_iomap
 int pcim_iomap_regions(struct pci_dev *pdev, int mask, const char *name);
+
+static inline int pci_is_managed(struct pci_dev *pdev)
+{
+        return pdev->is_managed;
+}
+void pci_intx(struct pci_dev *pdev, int enable);
+
 #endif /* LINUX_PCI_H */

GPL/branches/uniaud32-next/lib32/pci.c

@@ -1156 +1156 @@
 }
 EXPORT_SYMBOL(__devm_request_region);
+
+/*
+ * Managed PCI resources.  This manages device on/off, INTx/MSI/MSI-X
+ * on/off and BAR regions.  pci_dev itself records MSI/MSI-X status, so
+ * there's no need to track it separately.  pci_devres is initialized
+ * when a device is enabled using managed PCI device enable interface.
+ */
+struct pci_devres {
+        unsigned int enabled:1;
+        unsigned int pinned:1;
+        unsigned int orig_intx:1;
+        unsigned int restore_intx:1;
+        unsigned int mwi:1;
+        u32 region_mask;
+};
+
+static void pcim_release(struct device *gendev, void *res)
+{
+}
+
+static struct pci_devres *find_pci_dr(struct pci_dev *pdev)
+{
+        if (pci_is_managed(pdev))
+                return devres_find(&pdev->dev, pcim_release, NULL, NULL);
+        return NULL;
+}
+
+/**
+ * pci_intx - enables/disables PCI INTx for device dev
+ * @pdev: the PCI device to operate on
+ * @enable: boolean: whether to enable or disable PCI INTx
+ *
+ * Enables/disables PCI INTx for device @pdev
+ */
+void pci_intx(struct pci_dev *pdev, int enable)
+{
+        u16 pci_command, new;
+
+        pci_read_config_word(pdev, PCI_COMMAND, &pci_command);
+
+        if (enable)
+                new = pci_command & ~PCI_COMMAND_INTX_DISABLE;
+        else
+                new = pci_command | PCI_COMMAND_INTX_DISABLE;
+
+        if (new != pci_command) {
+                struct pci_devres *dr;
+
+                pci_write_config_word(pdev, PCI_COMMAND, new);
+
+                dr = find_pci_dr(pdev);
+                if (dr && !dr->restore_intx) {
+                        dr->restore_intx = 1;
+                        dr->orig_intx = !enable;
+                }
+        }
+}
+EXPORT_SYMBOL_GPL(pci_intx);