diff mbox series

[1/2] hw/audio/intel-hda: don't reset codecs twice

Message ID 20221014142632.2092404-2-peter.maydell@linaro.org
State Superseded
Headers show
Series hw/audio/intel-hda: Don't use device_legacy_reset() | expand

Commit Message

Peter Maydell Oct. 14, 2022, 2:26 p.m. UTC 
Currently the intel-hda device has a reset method which manually
resets all the codecs by calling device_legacy_reset() on them.  This
means they get reset twice, once because child devices on a qbus get
reset before the parent device's reset method is called, and then
again because we're manually resetting them.

Drop the manual reset call, and ensure that codecs are still reset
when the guest does a reset via ICH6_GCTL_RESET by using
device_cold_reset() (which resets all the devices on the qbus as well
as the device itself) instead of a direct call to the reset function.

This is a slight ordering change because the (only) codec reset now
happens before the controller registers etc are reset, rather than
once before and then once after, but the codec reset function
hda_audio_reset() doesn't care.

This lets us drop a use of device_legacy_reset(), which is
deprecated.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 hw/audio/intel-hda.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Comments

Philippe Mathieu-Daudé Oct. 17, 2022, 9:05 p.m. UTC | #1 
On 14/10/22 16:26, Peter Maydell wrote:
> Currently the intel-hda device has a reset method which manually
> resets all the codecs by calling device_legacy_reset() on them.  This
> means they get reset twice, once because child devices on a qbus get
> reset before the parent device's reset method is called, and then
> again because we're manually resetting them.
> 
> Drop the manual reset call, and ensure that codecs are still reset
> when the guest does a reset via ICH6_GCTL_RESET by using
> device_cold_reset() (which resets all the devices on the qbus as well
> as the device itself) instead of a direct call to the reset function.
> 
> This is a slight ordering change because the (only) codec reset now
> happens before the controller registers etc are reset, rather than
> once before and then once after, but the codec reset function
> hda_audio_reset() doesn't care.
> 
> This lets us drop a use of device_legacy_reset(), which is
> deprecated.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>   hw/audio/intel-hda.c | 4 +---
>   1 file changed, 1 insertion(+), 3 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
diff mbox series

Patch

diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c
index f38117057b9..38cfa20262e 100644
--- a/hw/audio/intel-hda.c
+++ b/hw/audio/intel-hda.c
@@ -516,7 +516,7 @@  static void intel_hda_notify_codecs(IntelHDAState *d, uint32_t stream, bool runn
 static void intel_hda_set_g_ctl(IntelHDAState *d, const IntelHDAReg *reg, uint32_t old)
 {
     if ((d->g_ctl & ICH6_GCTL_RESET) == 0) {
-        intel_hda_reset(DEVICE(d));
+        device_cold_reset(DEVICE(d));
     }
 }
 
@@ -1083,11 +1083,9 @@  static void intel_hda_reset(DeviceState *dev)
     intel_hda_regs_reset(d);
     d->wall_base_ns = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
 
-    /* reset codecs */
     QTAILQ_FOREACH(kid, &d->codecs.qbus.children, sibling) {
         DeviceState *qdev = kid->child;
         cdev = HDA_CODEC_DEVICE(qdev);
-        device_legacy_reset(DEVICE(cdev));
         d->state_sts |= (1 << cdev->cad);
     }
     intel_hda_update_irq(d);