Module Name: src
Committed By: isaki
Date: Sat Feb 6 09:45:17 UTC 2021
Modified Files:
src/sys/dev/pci: auich.c auvia.c
Log Message:
Hold sc_intr_lock in open()/close().
vtbl->{lock,unlock} (in fact ac97_{lock,unlock}) don't seem to need
releasing an interrupt lock.
Confirmed on auich.
To generate a diff of this commit:
cvs rdiff -u -r1.159 -r1.160 src/sys/dev/pci/auich.c
cvs rdiff -u -r1.86 -r1.87 src/sys/dev/pci/auvia.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/pci/auich.c
diff -u src/sys/dev/pci/auich.c:1.159 src/sys/dev/pci/auich.c:1.160
--- src/sys/dev/pci/auich.c:1.159 Sat Feb 29 06:34:30 2020
+++ src/sys/dev/pci/auich.c Sat Feb 6 09:45:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: auich.c,v 1.159 2020/02/29 06:34:30 isaki Exp $ */
+/* $NetBSD: auich.c,v 1.160 2021/02/06 09:45:17 isaki Exp $ */
/*-
* Copyright (c) 2000, 2004, 2005, 2008 The NetBSD Foundation, Inc.
@@ -111,7 +111,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.159 2020/02/29 06:34:30 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.160 2021/02/06 09:45:17 isaki Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -930,9 +930,7 @@ auich_open(void *addr, int flags)
struct auich_softc *sc;
sc = (struct auich_softc *)addr;
- mutex_spin_exit(&sc->sc_intr_lock);
sc->codec_if->vtbl->lock(sc->codec_if);
- mutex_spin_enter(&sc->sc_intr_lock);
return 0;
}
@@ -942,9 +940,7 @@ auich_close(void *addr)
struct auich_softc *sc;
sc = (struct auich_softc *)addr;
- mutex_spin_exit(&sc->sc_intr_lock);
sc->codec_if->vtbl->unlock(sc->codec_if);
- mutex_spin_enter(&sc->sc_intr_lock);
}
static int
Index: src/sys/dev/pci/auvia.c
diff -u src/sys/dev/pci/auvia.c:1.86 src/sys/dev/pci/auvia.c:1.87
--- src/sys/dev/pci/auvia.c:1.86 Sun Apr 19 08:18:19 2020
+++ src/sys/dev/pci/auvia.c Sat Feb 6 09:45:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: auvia.c,v 1.86 2020/04/19 08:18:19 isaki Exp $ */
+/* $NetBSD: auvia.c,v 1.87 2021/02/06 09:45:17 isaki Exp $ */
/*-
* Copyright (c) 2000, 2008 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auvia.c,v 1.86 2020/04/19 08:18:19 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auvia.c,v 1.87 2021/02/06 09:45:17 isaki Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -614,9 +614,7 @@ auvia_open(void *addr, int flags)
struct auvia_softc *sc;
sc = (struct auvia_softc *)addr;
- mutex_spin_exit(&sc->sc_intr_lock);
sc->codec_if->vtbl->lock(sc->codec_if);
- mutex_spin_enter(&sc->sc_intr_lock);
return 0;
}
@@ -626,9 +624,7 @@ auvia_close(void *addr)
struct auvia_softc *sc;
sc = (struct auvia_softc *)addr;
- mutex_spin_exit(&sc->sc_intr_lock);
sc->codec_if->vtbl->unlock(sc->codec_if);
- mutex_spin_enter(&sc->sc_intr_lock);
}
static int
