Module Name: src
Committed By: jmcneill
Date: Fri Jul 26 11:13:46 UTC 2019
Modified Files:
src/sys/dev/hdaudio: hdaudio.c
Log Message:
Even though the spec says SRST should read back as 1 after being set, this
does not appear to be the case with QEMU when using single byte accesses.
Instead of printing an error and giving up, continue and try to leave
stream reset state even if setting SRST times out.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/hdaudio/hdaudio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/hdaudio/hdaudio.c
diff -u src/sys/dev/hdaudio/hdaudio.c:1.8 src/sys/dev/hdaudio/hdaudio.c:1.9
--- src/sys/dev/hdaudio/hdaudio.c:1.8 Fri Nov 24 17:51:10 2017
+++ src/sys/dev/hdaudio/hdaudio.c Fri Jul 26 11:13:46 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: hdaudio.c,v 1.8 2017/11/24 17:51:10 jmcneill Exp $ */
+/* $NetBSD: hdaudio.c,v 1.9 2019/07/26 11:13:46 jmcneill Exp $ */
/*
* Copyright (c) 2009 Precedence Technologies Ltd <supp...@precedence.co.uk>
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdaudio.c,v 1.8 2017/11/24 17:51:10 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdaudio.c,v 1.9 2019/07/26 11:13:46 jmcneill Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -1172,10 +1172,6 @@ hdaudio_stream_reset(struct hdaudio_stre
break;
hda_delay(10);
} while (--retry > 0);
- if (retry == 0) {
- hda_error(sc, "timeout entering stream reset state\n");
- return;
- }
ctl0 &= ~HDAUDIO_CTL_SRST;
hda_write1(sc, HDAUDIO_SD_CTL0(snum), ctl0);
