Changeset 753

Timestamp:

Oct 22, 2022, 9:53:37 AM (3 years ago)

Author:

Paul Smedley

Message:

Code cleanups + disable unsupported HDMI code for now

Location:

GPL/branches/uniaud32-exp

Files:

• alsa-kernel/hda/Makefile (modified) (1 diff)
• alsa-kernel/hda/hdac_i915.c (added)
• alsa-kernel/include/sound/config.h (modified) (2 diffs)
• alsa-kernel/pci/hda/hda_i915.c (deleted)
• include/linux/device.h (modified) (1 diff)
• include/linux/pci.h (modified) (1 diff)
• lib32/component.c (modified) (3 diffs)
• lib32/devres.c (modified) (2 diffs)

GPL/branches/uniaud32-exp/alsa-kernel/hda/Makefile

@@ -13 +13 @@
 #
 #===================================================================
-FILES = hdac_device.obj array.obj hdac_stream.obj hdac_controller.obj hdac_bus.obj hda_bus_type.obj hdac_regmap.obj hdmi_chmap.obj hdac_component.obj
+FILES = hdac_device.obj array.obj hdac_stream.obj hdac_controller.obj hdac_bus.obj hda_bus_type.obj hdac_regmap.obj hdmi_chmap.obj hdac_component.obj 
+# hdac_i915.obj
 
 TARGET = hdac

GPL/branches/uniaud32-exp/alsa-kernel/include/sound/config.h

@@ -32 +32 @@
 #define CONFIG_SND_HDA_CODEC_CONEXANT
 #define CONFIG_SND_HDA_CODEC_CMEDIA
-#define CONFIG_SND_HDA_CODEC_HDMI
+/* #define CONFIG_SND_HDA_CODEC_HDMI not yet supported */
 #define CONFIG_SND_HDA_CODEC_REALTEK
 #define CONFIG_SND_HDA_CODEC_SIGMATEL
@@ -40 +40 @@
 #define CONFIG_SND_HDA_GENERIC
 #define CONFIG_SND_HDA_HWDEP
+/* #define CONFIG_SND_HDA_I915 not yet supported */
 #define CONFIG_SND_HDA_PREALLOC_SIZE  64
 #define CONFIG_SND_OSSEMUL

GPL/branches/uniaud32-exp/include/linux/device.h

@@ -300 +300 @@
                          dr_match_t match, void *match_data);
 
+/* devres group */
+void * __must_check devres_open_group(struct device *dev, void *id, gfp_t gfp);
+void devres_close_group(struct device *dev, void *id);
+void devres_remove_group(struct device *dev, void *id);
+int devres_release_group(struct device *dev, void *id);
+
 /* debugging and troubleshooting/diagnostic helpers. */
 extern const char *dev_driver_string(const struct device *dev);

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

@@ -792 +792 @@
 void pci_release_region(struct pci_dev *, int);
 void __iomem * const *pcim_iomap_table(struct pci_dev *pdev);
+#define for_each_pci_dev(d) while ((d = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, d)) != NULL)
 
 #endif /* LINUX_PCI_H */

GPL/branches/uniaud32-exp/lib32/component.c

@@ -185 +185 @@
                 struct component *c;
 
-                dev_dbg(adev->parent, "Looking for component %zu\n", i);
+                dev_dbg(adev->parent, "Looking for component %lu\n", i);
 
                 if (match->compare[i].component)
@@ -243 +243 @@
         }
 
-#ifndef TARGET_OS2
         if (!devres_open_group(adev->parent, adev, GFP_KERNEL))
                 return -ENOMEM;
-#endif
+
         /* Found all components */
         ret = adev->ops->bind(adev->parent);
         if (ret < 0) {
-#ifndef TARGET_OS2
                 devres_release_group(adev->parent, NULL);
                 if (ret != -EPROBE_DEFER)
                         dev_info(adev->parent, "adev bind failed: %d\n", ret);
-#endif
                 return ret;
         }
@@ -626 +623 @@
          * affecting anything else.
          */
-#ifndef TARGET_OS2
+
         if (!devres_open_group(adev->parent, NULL, GFP_KERNEL))
                 return -ENOMEM;
-#endif
+
         /*
          * Also open a group for the device itself: this allows us

GPL/branches/uniaud32-exp/lib32/devres.c

@@ -221 +221 @@
 }
 
-static int release_nodes(struct device *dev, struct list_head *first,
-                         struct list_head *end, unsigned long flags)
-{
-//      LIST_HEAD(todo);
-        struct list_head todo;
-
-        int cnt;
+static void release_nodes(struct device *dev, struct list_head *todo)
+{
         struct devres *dr, *tmp;
-
-        cnt = remove_nodes(dev, first, end, &todo);
-
-        spin_unlock_irqrestore(&dev->devres_lock, flags);
 
         /* Release.  Note that both devres and devres_group are
          * handled as devres in the following loop.  This is safe.
          */
-        list_for_each_entry_safe_reverse(dr, tmp, &todo, node.entry, struct devres) {
+        list_for_each_entry_safe_reverse(dr, tmp, todo, node.entry, struct devres) {
                 devres_log(dev, &dr->node, "REL");
                 dr->node.release(dev, dr->data);
                 kfree(dr);
         }
-
-        return cnt;
 }
 
@@ -256 +245 @@
 {
         unsigned long flags;
+        struct list_head todo;
+        int cnt;
 
         /* Looks like an uninitialized device structure */
         if (WARN_ON(dev->devres_head.next == NULL))
                 return -ENODEV;
+
+        /* Nothing to release if list is empty */
+        if (list_empty(&dev->devres_head))
+                return 0;
+
         spin_lock_irqsave(&dev->devres_lock, flags);
-        return release_nodes(dev, dev->devres_head.next, &dev->devres_head,
-                             flags);
-}
+        cnt = remove_nodes(dev, dev->devres_head.next, &dev->devres_head, &todo);
+        spin_unlock_irqrestore(&dev->devres_lock, flags);
+
+        release_nodes(dev, &todo);
+        return cnt;
+}
+
+/**
+ * devres_open_group - Open a new devres group
+ * @dev: Device to open devres group for
+ * @id: Separator ID
+ * @gfp: Allocation flags
+ *
+ * Open a new devres group for @dev with @id.  For @id, using a
+ * pointer to an object which won't be used for another group is
+ * recommended.  If @id is NULL, address-wise unique ID is created.
+ *
+ * RETURNS:
+ * ID of the new group, NULL on failure.
+ */
+void * devres_open_group(struct device *dev, void *id, gfp_t gfp)
+{
+        struct devres_group *grp;
+        unsigned long flags;
+
+        grp = kmalloc(sizeof(*grp), gfp);
+        if (unlikely(!grp))
+                return NULL;
+
+        grp->node[0].release = &group_open_release;
+        grp->node[1].release = &group_close_release;
+        INIT_LIST_HEAD(&grp->node[0].entry);
+        INIT_LIST_HEAD(&grp->node[1].entry);
+        set_node_dbginfo(&grp->node[0], "grp<", 0);
+        set_node_dbginfo(&grp->node[1], "grp>", 0);
+        grp->id = grp;
+        if (id)
+                grp->id = id;
+
+        spin_lock_irqsave(&dev->devres_lock, flags);
+        add_dr(dev, &grp->node[0]);
+        spin_unlock_irqrestore(&dev->devres_lock, flags);
+        return grp->id;
+}
+EXPORT_SYMBOL_GPL(devres_open_group);
+
+/* Find devres group with ID @id.  If @id is NULL, look for the latest. */
+static struct devres_group * find_group(struct device *dev, void *id)
+{
+        struct devres_node *node;
+
+        list_for_each_entry_reverse(node, &dev->devres_head, entry, struct devres_node) {
+                struct devres_group *grp;
+
+                if (node->release != &group_open_release)
+                        continue;
+
+                grp = container_of(node, struct devres_group, node[0]);
+
+                if (id) {
+                        if (grp->id == id)
+                                return grp;
+                } else if (list_empty(&grp->node[1].entry))
+                        return grp;
+        }
+
+        return NULL;
+}
+
+/**
+ * devres_release_group - Release resources in a devres group
+ * @dev: Device to release group for
+ * @id: ID of target group, can be NULL
+ *
+ * Release all resources in the group identified by @id.  If @id is
+ * NULL, the latest open group is selected.  The selected group and
+ * groups properly nested inside the selected group are removed.
+ *
+ * RETURNS:
+ * The number of released non-group resources.
+ */
+int devres_release_group(struct device *dev, void *id)
+{
+        struct devres_group *grp;
+        unsigned long flags;
+        struct list_head todo;
+        int cnt = 0;
+
+        spin_lock_irqsave(&dev->devres_lock, flags);
+
+        grp = find_group(dev, id);
+        if (grp) {
+                struct list_head *first = &grp->node[0].entry;
+                struct list_head *end = &dev->devres_head;
+
+                if (!list_empty(&grp->node[1].entry))
+                        end = grp->node[1].entry.next;
+
+                cnt = remove_nodes(dev, first, end, &todo);
+                spin_unlock_irqrestore(&dev->devres_lock, flags);
+
+                release_nodes(dev, &todo);
+        } else {
+                WARN_ON(1);
+                spin_unlock_irqrestore(&dev->devres_lock, flags);
+        }
+
+        return cnt;
+}
+EXPORT_SYMBOL_GPL(devres_release_group);
 
 static struct devres *find_dr(struct device *dev, dr_release_t release,