Changeset 717 for GPL/trunk/alsa-kernel/hda

Timestamp:

Aug 7, 2022, 6:11:12 PM (3 years ago)

Author:

David Azarewicz

Message:

Merge changes from next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/hda/ext/hdac_ext_stream.c (modified) (10 diffs)
• alsa-kernel/hda/hdac_controller.c (modified) (1 diff)
• alsa-kernel/hda/hdac_device.c (modified) (1 diff)
• alsa-kernel/hda/hdac_stream.c (modified) (4 diffs)

GPL/trunk/alsa-kernel/hda/ext/hdac_ext_stream.c

@@ -107 +107 @@
 EXPORT_SYMBOL_GPL(snd_hdac_stream_free_all);
 
-/**
- * snd_hdac_ext_stream_decouple - decouple the hdac stream
- * @bus: HD-audio core bus
- * @stream: HD-audio ext core stream object to initialize
- * @decouple: flag to decouple
- */
-void snd_hdac_ext_stream_decouple(struct hdac_bus *bus,
-                                struct hdac_ext_stream *stream, bool decouple)
+void snd_hdac_ext_stream_decouple_locked(struct hdac_bus *bus,
+                                         struct hdac_ext_stream *stream,
+                                         bool decouple)
 {
         struct hdac_stream *hstream = &stream->hstream;
@@ -120 +115 @@
         int mask = AZX_PPCTL_PROCEN(hstream->index);
 
-        spin_lock_irq(&bus->reg_lock);
         val = readw(bus->ppcap + AZX_REG_PP_PPCTL) & mask;
 
@@ -129 +123 @@
 
         stream->decoupled = decouple;
+}
+EXPORT_SYMBOL_GPL(snd_hdac_ext_stream_decouple_locked);
+
+/**
+ * snd_hdac_ext_stream_decouple - decouple the hdac stream
+ * @bus: HD-audio core bus
+ * @stream: HD-audio ext core stream object to initialize
+ * @decouple: flag to decouple
+ */
+void snd_hdac_ext_stream_decouple(struct hdac_bus *bus,
+                                  struct hdac_ext_stream *stream, bool decouple)
+{
+        spin_lock_irq(&bus->reg_lock);
+        snd_hdac_ext_stream_decouple_locked(bus, stream, decouple);
         spin_unlock_irq(&bus->reg_lock);
 }
@@ -253 +261 @@
         }
 
+        spin_lock_irq(&bus->reg_lock);
         list_for_each_entry(stream, &bus->stream_list, list) {
                 struct hdac_ext_stream *hstream = container_of(stream,
@@ -267 +276 @@
 
                 if (!hstream->link_locked) {
-                        snd_hdac_ext_stream_decouple(bus, hstream, true);
+                        snd_hdac_ext_stream_decouple_locked(bus, hstream, true);
                         res = hstream;
                         break;
@@ -273 +282 @@
         }
         if (res) {
-                spin_lock_irq(&bus->reg_lock);
                 res->link_locked = 1;
                 res->link_substream = substream;
-                spin_unlock_irq(&bus->reg_lock);
-        }
+        }
+        spin_unlock_irq(&bus->reg_lock);
         return res;
 }
@@ -293 +301 @@
         }
 
+        spin_lock_irq(&bus->reg_lock);
         list_for_each_entry(stream, &bus->stream_list, list) {
                 struct hdac_ext_stream *hstream = container_of(stream,
@@ -302 +311 @@
                 if (!stream->opened) {
                         if (!hstream->decoupled)
-                                snd_hdac_ext_stream_decouple(bus, hstream, true);
+                                snd_hdac_ext_stream_decouple_locked(bus, hstream, true);
                         res = hstream;
                         break;
@@ -308 +317 @@
         }
         if (res) {
-                spin_lock_irq(&bus->reg_lock);
                 res->hstream.opened = 1;
                 res->hstream.running = 0;
                 res->hstream.substream = substream;
-                spin_unlock_irq(&bus->reg_lock);
-        }
+        }
+        spin_unlock_irq(&bus->reg_lock);
 
         return res;
@@ -379 +387 @@
 
         case HDAC_EXT_STREAM_TYPE_HOST:
+                spin_lock_irq(&bus->reg_lock);
                 if (stream->decoupled && !stream->link_locked)
-                        snd_hdac_ext_stream_decouple(bus, stream, false);
+                        snd_hdac_ext_stream_decouple_locked(bus, stream, false);
+                spin_unlock_irq(&bus->reg_lock);
                 snd_hdac_stream_release(&stream->hstream);
                 break;
 
         case HDAC_EXT_STREAM_TYPE_LINK:
+                spin_lock_irq(&bus->reg_lock);
                 if (stream->decoupled && !stream->hstream.opened)
-                        snd_hdac_ext_stream_decouple(bus, stream, false);
-                spin_lock_irq(&bus->reg_lock);
+                        snd_hdac_ext_stream_decouple_locked(bus, stream, false);
                 stream->link_locked = 0;
                 stream->link_substream = NULL;

GPL/trunk/alsa-kernel/hda/hdac_controller.c

@@ -428 +428 @@
                 goto skip_reset;
 
-        /* clear STATESTS */
-        snd_hdac_chip_writew(bus, STATESTS, STATESTS_INT_MASK);
+        /* clear STATESTS if not in reset */
+        if (snd_hdac_chip_readb(bus, GCTL) & AZX_GCTL_RESET)
+                snd_hdac_chip_writew(bus, STATESTS, STATESTS_INT_MASK);
 
         /* reset controller */

GPL/trunk/alsa-kernel/hda/hdac_device.c

@@ -675 +675 @@
         { 0x17e8, "Chrontel" },
         { 0x1854, "LG" },
+        { 0x19e5, "Huawei" },
         { 0x1aec, "Wolfson Microelectronics" },
         { 0x1af4, "QEMU" },

GPL/trunk/alsa-kernel/hda/hdac_stream.c

@@ -302 +302 @@
                 (substream->stream + 1);
 
+        spin_lock_irq(&bus->reg_lock);
         list_for_each_entry(azx_dev, &bus->stream_list, list, struct hdac_stream) {
                 if (azx_dev->direction != substream->stream)
@@ -315 +316 @@
         }
         if (res) {
-                spin_lock_irq(&bus->reg_lock);
                 res->opened = 1;
                 res->running = 0;
                 res->assigned_key = key;
                 res->substream = substream;
-                spin_unlock_irq(&bus->reg_lock);
-        }
+        }
+        spin_unlock_irq(&bus->reg_lock);
         return res;
 }
@@ -539 +539 @@
         cc->mask = CLOCKSOURCE_MASK(32);
 
+#ifndef TARGET_OS2
+        /*
+         * Calculate the optimal mult/shift values. The counter wraps
+         * around after ~178.9 seconds.
+         */
+        clocks_calc_mult_shift(&cc->mult, &cc->shift, 24000000,
+                               NSEC_PER_SEC, 178);
+#else
         /*
          * Converting from 24 MHz to ns means applying a 125/3 factor.
@@ -551 +559 @@
         cc->mult = 125; /* saturation after 195 years */
         cc->shift = 0;
-
+#endif
         nsec = 0; /* audio time is elapsed time since trigger */
         timecounter_init(tc, cc, nsec);