 @@ -1,14 +1,14 @@
-/*	$NetBSD: audio.c,v 1.29 2019/08/23 09:41:26 maxv Exp $	*/
+/*	$NetBSD: audio.c,v 1.30 2019/08/29 13:01:07 isaki Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -132,27 +132,27 @@
  *   these may be also called after attach, the thread lock is required.
+ *
  * In addition, there is an additional lock.
+ *
  * - track->lock.  This is an atomic variable and is similar to the
  *   "interrupt lock".  This is one for each track.  If any thread context
  *   (and software interrupt context) and hardware interrupt context who
  *   want to access some variables on this track, they must acquire this
  *   lock before.  It protects track's consistency between hardware
  *   interrupt context and others.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.29 2019/08/23 09:41:26 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.30 2019/08/29 13:01:07 isaki Exp $");
 #ifdef _KERNEL_OPT
 #include "audio.h"
 #include "midi.h"
 #endif
 #if NAUDIO > 0
 #ifdef _KERNEL
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/atomic.h>
 @@ -5720,67 +5720,93 @@ audio_track_drain(struct audio_softc *sc
 		if (error)
 			return error;
 		/* XXX call audio_track_play here ? */
+	}
 	track->pstate = AUDIO_STATE_CLEAR;
 	TRACET(3, track, "done trk_inp=%d trk_out=%d",
 		(int)track->inputcounter, (int)track->outputcounter);
 	return 0;
+}
 /*
  * Send signal to process.
  * This is intended to be called only from audio_softintr_{rd,wr}.
  * Must be called with sc_lock && sc_intr_lock held.
  */
 static inline void
 audio_psignal(struct audio_softc *sc, pid_t pid, int signum)
+{
 	proc_t *p;
 	KASSERT(mutex_owned(sc->sc_lock));
 	KASSERT(mutex_owned(sc->sc_intr_lock));
 	KASSERT(pid != 0);
 	/*
 	 * psignal() must be called without spin lock held.
 	 * So leave intr_lock temporarily here.
 	 */
 	mutex_exit(sc->sc_intr_lock);
 	mutex_enter(proc_lock);
 	p = proc_find(pid);
 	if (p)
 		psignal(p, signum);
 	mutex_exit(proc_lock);
 	/* Enter intr_lock again */
 	mutex_enter(sc->sc_intr_lock);
+}
 /*
  * This is software interrupt handler for record.
  * It is called from recording hardware interrupt everytime.
  * It does:
  * - Deliver SIGIO for all async processes.
  * - Notify to audio_read() that data has arrived.
  * - selnotify() for select/poll-ing processes.
  */
 /*
  * XXX If a process issues FIOASYNC between hardware interrupt and
  *     software interrupt, (stray) SIGIO will be sent to the process
  *     despite the fact that it has not receive recorded data yet.
  */
 static void
 audio_softintr_rd(void *cookie)
+{
 	struct audio_softc *sc = cookie;
 	audio_file_t *f;
 	proc_t *p;
 	pid_t pid;
 	mutex_enter(sc->sc_lock);
 	mutex_enter(sc->sc_intr_lock);
 	SLIST_FOREACH(f, &sc->sc_files, entry) {
 		audio_track_t *track = f->rtrack;
 		if (track == NULL)
 			continue;
 		TRACET(4, track, "broadcast; inp=%d/%d/%d",
 		    track->input->head,
 		    track->input->used,
 		    track->input->capacity);
 		pid = f->async_audio;
 		if (pid != 0) {
 			TRACEF(4, f, "sending SIGIO %d", pid);
-			mutex_enter(proc_lock);
+			audio_psignal(sc, pid, SIGIO);
 			if ((p = proc_find(pid)) != NULL)
 				psignal(p, SIGIO);
 			mutex_exit(proc_lock);
+		}
+	}
 	mutex_exit(sc->sc_intr_lock);
 	/* Notify that data has arrived. */
 	selnotify(&sc->sc_rsel, 0, NOTE_SUBMIT);
 	KNOTE(&sc->sc_rsel.sel_klist, 0);
 	cv_broadcast(&sc->sc_rmixer->outcv);
 	mutex_exit(sc->sc_lock);
+}
 /*
 @@ -5789,61 +5815,59 @@ audio_softintr_rd(void *cookie)
  * It does:
  * - Deliver SIGIO for all async and writable (used < lowat) processes.
  * - Notify to audio_write() that outbuf block available.
  * - selnotify() for select/poll-ing processes if there are any writable
  *   (used < lowat) processes.  Checking each descriptor will be done by
  *   filt_audiowrite_event().
  */
 static void
 audio_softintr_wr(void *cookie)
+{
 	struct audio_softc *sc = cookie;
 	audio_file_t *f;
 	bool found;
 	proc_t *p;
 	pid_t pid;
 	TRACE(4, "called");
 	found = false;
 	mutex_enter(sc->sc_lock);
 	mutex_enter(sc->sc_intr_lock);
 	SLIST_FOREACH(f, &sc->sc_files, entry) {
 		audio_track_t *track = f->ptrack;
 		if (track == NULL)
 			continue;
 		TRACET(4, track, "broadcast; trseq=%d out=%d/%d/%d",
 		    (int)track->seq,
 		    track->outbuf.head,
 		    track->outbuf.used,
 		    track->outbuf.capacity);
 		/*
 		 * Send a signal if the process is async mode and
 		 * used is lower than lowat.
 		 */
 		if (track->usrbuf.used <= track->usrbuf_usedlow &&
 		    !track->is_pause) {
 			/* For selnotify */
 			found = true;
 			/* For SIGIO */
 			pid = f->async_audio;
 			if (pid != 0) {
 				TRACEF(4, f, "sending SIGIO %d", pid);
-				mutex_enter(proc_lock);
+				audio_psignal(sc, pid, SIGIO);
 				if ((p = proc_find(pid)) != NULL)
 					psignal(p, SIGIO);
 				mutex_exit(proc_lock);
+			}
+		}
+	}
 	mutex_exit(sc->sc_intr_lock);
 	/*
 	 * Notify for select/poll when someone become writable.
 	 * It needs sc_lock (and not sc_intr_lock).
 	 */
 	if (found) {
 		TRACE(4, "selnotify");
 		selnotify(&sc->sc_wsel, 0, NOTE_SUBMIT);
 		KNOTE(&sc->sc_wsel.sel_klist, 0);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: audiovar.h,v 1.4 2019/06/26 06:57:45 isaki Exp $	*/
+/*	$NetBSD: audiovar.h,v 1.5 2019/08/29 13:01:07 isaki Exp $	*/
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by TAMURA Kent
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -139,27 +139,28 @@ struct audio_softc {
 	 * hw_if == NULL means that the device is (attached but) disabled.
 	 */
 	const struct audio_hw_if *hw_if;
 	void		*hw_hdl;
 	/*
 	 * Properties obtained by get_props().
 	 * No need any locks to read this variable.
 	 */
 	int sc_props;
 	/*
 	 * List of opened descriptors.
-	 * Must be protected by sc_intr_lock.
+	 * Must be protected by sc_lock || sc_intr_lock for traversal(FOREACH).
 	 * Must be protected by sc_lock && sc_intr_lock for insertion/removal.
 	 */
 	SLIST_HEAD(, audio_file) sc_files;
 	/*
 	 * Blocksize in msec.
 	 * Must be protected by sc_lock.
 	 */
 	int sc_blk_ms;
 	/*
 	 * Track mixer for playback and recording.
 	 * If null, the mixer is disabled.
 	 */