Changeset a64970e1 in mainline

Timestamp:

2025-03-05T19:25:06Z (18 hours ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

07039850

Parents:

89b5a75

Message:

Implement quiesce in HD Audio and SB16 drivers.

Location:

uspace/drv/audio

Files:

• hdaudio/hdactl.c (modified) (2 diffs)
• hdaudio/hdactl.h (modified) (2 diffs)
• hdaudio/hdaudio.c (modified) (4 diffs)
• sb16/dsp.c (modified) (4 diffs)
• sb16/dsp.h (modified) (3 diffs)
• sb16/main.c (modified) (4 diffs)
• sb16/sb16.c (modified) (2 diffs)
• sb16/sb16.h (modified) (2 diffs)

uspace/drv/audio/hdaudio/hdactl.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -628 +628 @@
 }
 
+void hda_ctl_quiesce(hda_ctl_t *ctl)
+{
+        uint32_t gctl;
+
+        ddf_msg(LVL_DEBUG, "hda_ctl_quiesce(): Resetting controller.");
+        gctl = hda_reg32_read(&ctl->hda->regs->gctl);
+        hda_reg32_write(&ctl->hda->regs->gctl,
+            gctl & ~BIT_V(uint32_t, gctl_crst));
+}
+
 errno_t hda_cmd(hda_t *hda, uint32_t verb, uint32_t *resp)
 {

uspace/drv/audio/hdaudio/hdactl.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2014 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -77 +77 @@
 extern hda_ctl_t *hda_ctl_init(hda_t *);
 extern void hda_ctl_fini(hda_ctl_t *);
+extern void hda_ctl_quiesce(hda_ctl_t *);
 extern void hda_ctl_interrupt(hda_ctl_t *);
 extern errno_t hda_cmd(hda_t *, uint32_t, uint32_t *);

uspace/drv/audio/hdaudio/hdaudio.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -55 +55 @@
 static errno_t hda_dev_remove(ddf_dev_t *dev);
 static errno_t hda_dev_gone(ddf_dev_t *dev);
+static errno_t hda_dev_quiesce(ddf_dev_t *dev);
 static errno_t hda_fun_online(ddf_fun_t *fun);
 static errno_t hda_fun_offline(ddf_fun_t *fun);
@@ -61 +62 @@
 
 static driver_ops_t driver_ops = {
-        .dev_add = &hda_dev_add,
-        .dev_remove = &hda_dev_remove,
-        .dev_gone = &hda_dev_gone,
-        .fun_online = &hda_fun_online,
-        .fun_offline = &hda_fun_offline
+        .dev_add = hda_dev_add,
+        .dev_remove = hda_dev_remove,
+        .dev_gone = hda_dev_gone,
+        .dev_quiesce = hda_dev_quiesce,
+        .fun_online = hda_fun_online,
+        .fun_offline = hda_fun_offline
 };
 
@@ -362 +364 @@
         }
 
+        return EOK;
+}
+
+static errno_t hda_dev_quiesce(ddf_dev_t *dev)
+{
+        hda_t *hda = (hda_t *)ddf_dev_data_get(dev);
+
+        ddf_msg(LVL_DEBUG, "hda_dev_quiesce(%p)", dev);
+
+        hda_ctl_quiesce(hda->ctl);
         return EOK;
 }

uspace/drv/audio/sb16/dsp.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2011 Jan Vesely
  * All rights reserved.
@@ -74 +75 @@
                 [DSP_READY] = "READY",
                 [DSP_NO_BUFFER] = "NO BUFFER",
+                [DSP_QUIESCED] = "QUIESCED"
         };
         if ((size_t)state < ARRAY_SIZE(state_names))
@@ -83 +85 @@
 {
         assert(dsp);
+        if (dsp->state == DSP_QUIESCED)
+                return;
+
         ddf_log_verbose("Changing state from %s to %s",
             dsp_state_to_str(dsp->state), dsp_state_to_str(state));
@@ -230 +235 @@
 
         return ret;
+}
+
+void sb_dsp_quiesce(sb_dsp_t *dsp)
+{
+        dsp->state = DSP_QUIESCED;
+        dsp_reset(dsp);
 }
 

uspace/drv/audio/sb16/dsp.h

@@ -1 +1 @@
 /*
+ * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2011 Jan Vesely
  * All rights reserved.
@@ -51 +52 @@
         DSP_READY,
         DSP_NO_BUFFER,
+        DSP_QUIESCED
 } dsp_state_t;
 
@@ -78 +80 @@
 errno_t sb_dsp_init(sb_dsp_t *dsp, sb16_regs_t *regs, ddf_dev_t *dev,
     int dma8, int dma16);
+void sb_dsp_quiesce(sb_dsp_t *dsp);
 void sb_dsp_interrupt(sb_dsp_t *dsp);
 unsigned sb_dsp_query_cap(sb_dsp_t *dsp, audio_cap_t cap);

uspace/drv/audio/sb16/main.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2011 Jan Vesely
  * Copyright (c) 2011 Vojtech Horky
@@ -48 +49 @@
 
 static errno_t sb_add_device(ddf_dev_t *device);
+static errno_t sb_dev_quiesce(ddf_dev_t *device);
 static errno_t sb_get_res(ddf_dev_t *device, addr_range_t **pp_sb_regs,
     addr_range_t **pp_mpu_regs, int *irq, int *dma8, int *dma16);
@@ -54 +56 @@
 static driver_ops_t sb_driver_ops = {
         .dev_add = sb_add_device,
+        .dev_quiesce = sb_dev_quiesce
 };
 
@@ -178 +181 @@
 }
 
+/** Initialize new SB16 driver instance.
+ *
+ * @param[in] device DDF instance of the device to initialize.
+ * @return Error code.
+ */
+static errno_t sb_dev_quiesce(ddf_dev_t *device)
+{
+        sb16_t *soft_state = (sb16_t *)ddf_dev_data_get(device);
+
+        return sb16_quiesce(soft_state);
+}
+
 static errno_t sb_get_res(ddf_dev_t *device, addr_range_t **pp_sb_regs,
     addr_range_t **pp_mpu_regs, int *irq, int *dma8, int *dma16)

uspace/drv/audio/sb16/sb16.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2011 Jan Vesely
  * All rights reserved.
@@ -191 +192 @@
 }
 
+errno_t sb16_quiesce(sb16_t *sb)
+{
+        sb_dsp_quiesce(&sb->dsp);
+        return EOK;
+}
+
 void sb16_interrupt(sb16_t *sb)
 {

uspace/drv/audio/sb16/sb16.h

@@ -1 +1 @@
 /*
+ * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2011 Jan Vesely
  * All rights reserved.
@@ -55 +56 @@
 errno_t sb16_init_sb16(sb16_t *sb, addr_range_t *regs, ddf_dev_t *dev, int dma8, int dma16);
 errno_t sb16_init_mpu(sb16_t *sb, addr_range_t *regs);
+errno_t sb16_quiesce(sb16_t *sb);
 void sb16_interrupt(sb16_t *sb);