Changeset 777 for GPL/trunk/alsa-kernel/hda/hdac_controller.c

Timestamp:

Apr 21, 2025, 7:17:25 PM (7 months ago)

Author:

David Azarewicz

Message:

Merge from uniaud32-exp branch

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/hda/hdac_controller.c (modified) (7 diffs)

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

@@ -63 +63 @@
 
         /* enable corb dma */
+        if (!bus->use_pio_for_commands)
         snd_hdac_chip_writeb(bus, CORBCTL, AZX_CORBCTL_RUN);
 
@@ -136 +137 @@
 }
 
-/**
- * snd_hdac_bus_send_cmd - send a command verb via CORB
+/* receive an Immediate Response with PIO */
+static int snd_hdac_bus_wait_for_pio_response(struct hdac_bus *bus,
+                                              unsigned int addr)
+{
+        int timeout = 50;
+
+        while (timeout--) {
+                /* check IRV bit */
+                if (snd_hdac_chip_readw(bus, IRS) & AZX_IRS_VALID) {
+                        /* reuse rirb.res as the response return value */
+                        bus->rirb.res[addr] = snd_hdac_chip_readl(bus, IR);
+                        return 0;
+                }
+                udelay(1);
+        }
+
+        dev_dbg_ratelimited(bus->dev, "get_response_pio timeout: IRS=%#x\n",
+                            snd_hdac_chip_readw(bus, IRS));
+
+        bus->rirb.res[addr] = -1;
+
+        return -EIO;
+}
+
+/**
+ * snd_hdac_bus_send_cmd_pio - send a command verb via Immediate Command
  * @bus: HD-audio core bus
  * @val: encoded verb value to send
@@ -143 +168 @@
  * Returns zero for success or a negative error code.
  */
-int snd_hdac_bus_send_cmd(struct hdac_bus *bus, unsigned int val)
+static int snd_hdac_bus_send_cmd_pio(struct hdac_bus *bus, unsigned int val)
+{
+        unsigned int addr = azx_command_addr(val);
+        int timeout = 50;
+        int ret = -EIO;
+
+        spin_lock_irq(&bus->reg_lock);
+
+        while (timeout--) {
+                /* check ICB bit */
+                if (!((snd_hdac_chip_readw(bus, IRS) & AZX_IRS_BUSY))) {
+                        /* Clear IRV bit */
+                        snd_hdac_chip_updatew(bus, IRS, AZX_IRS_VALID, AZX_IRS_VALID);
+                        snd_hdac_chip_writel(bus, IC, val);
+                        /* Set ICB bit */
+                        snd_hdac_chip_updatew(bus, IRS, AZX_IRS_BUSY, AZX_IRS_BUSY);
+
+                        ret = snd_hdac_bus_wait_for_pio_response(bus, addr);
+                        goto out;
+                }
+                udelay(1);
+        }
+
+        dev_dbg_ratelimited(bus->dev, "send_cmd_pio timeout: IRS=%#x, val=%#x\n",
+                            snd_hdac_chip_readw(bus, IRS), val);
+
+out:
+        spin_unlock_irq(&bus->reg_lock);
+
+        return ret;
+}
+
+/**
+ * snd_hdac_bus_get_response_pio - receive a response via Immediate Response
+ * @bus: HD-audio core bus
+ * @addr: codec address
+ * @res: pointer to store the value, NULL when not needed
+ *
+ * Returns zero if a value is read, or a negative error code.
+ */
+static int snd_hdac_bus_get_response_pio(struct hdac_bus *bus,
+                                         unsigned int addr, unsigned int *res)
+{
+        if (res)
+                *res = bus->rirb.res[addr];
+
+        return 0;
+}
+
+/**
+ * snd_hdac_bus_send_cmd_corb - send a command verb via CORB
+ * @bus: HD-audio core bus
+ * @val: encoded verb value to send
+ *
+ * Returns zero for success or a negative error code.
+ */
+static int snd_hdac_bus_send_cmd_corb(struct hdac_bus *bus, unsigned int val)
 {
         unsigned int addr = azx_command_addr(val);
@@ -177 +258 @@
         return 0;
 }
-EXPORT_SYMBOL_GPL(snd_hdac_bus_send_cmd);
 
 #define AZX_RIRB_EX_UNSOL_EV    (1<<4)
@@ -235 +315 @@
 
 /**
- * snd_hdac_bus_get_response - receive a response via RIRB
+ * snd_hdac_bus_get_response_rirb - receive a response via RIRB
  * @bus: HD-audio core bus
  * @addr: codec address
@@ -242 +322 @@
  * Returns zero if a value is read, or a negative error code.
  */
-int snd_hdac_bus_get_response(struct hdac_bus *bus, unsigned int addr,
-                              unsigned int *res)
+static int snd_hdac_bus_get_response_rirb(struct hdac_bus *bus,
+                                          unsigned int addr, unsigned int *res)
 {
         unsigned long timeout;
@@ -300 +380 @@
         return -EIO;
 }
+
+/**
+ * snd_hdac_bus_send_cmd - send a command verb via CORB or PIO
+ * @bus: HD-audio core bus
+ * @val: encoded verb value to send
+ *
+ * Returns zero for success or a negative error code.
+ */
+int snd_hdac_bus_send_cmd(struct hdac_bus *bus, unsigned int val)
+{
+        if (bus->use_pio_for_commands)
+                return snd_hdac_bus_send_cmd_pio(bus, val);
+
+        return snd_hdac_bus_send_cmd_corb(bus, val);
+}
+EXPORT_SYMBOL_GPL(snd_hdac_bus_send_cmd);
+
+/**
+ * snd_hdac_bus_get_response - receive a response via RIRB or PIO
+ * @bus: HD-audio core bus
+ * @addr: codec address
+ * @res: pointer to store the value, NULL when not needed
+ *
+ * Returns zero if a value is read, or a negative error code.
+ */
+int snd_hdac_bus_get_response(struct hdac_bus *bus, unsigned int addr,
+                              unsigned int *res)
+{
+        if (bus->use_pio_for_commands)
+                return snd_hdac_bus_get_response_pio(bus, addr, res);
+
+        return snd_hdac_bus_get_response_rirb(bus, addr, res);
+}
 EXPORT_SYMBOL_GPL(snd_hdac_bus_get_response);