 @@ -1,14 +1,14 @@
-/* $NetBSD: hdaudio.c,v 1.4.10.2 2017/11/24 08:35:34 martin Exp $ */
+/* $NetBSD: hdaudio.c,v 1.4.10.3 2017/11/27 10:21:26 martin Exp $ */
 /*
  * Copyright (c) 2009 Precedence Technologies Ltd <support@precedence.co.uk>
  * Copyright (c) 2009 Jared D. McNeill <jmcneill@invisible.ca>
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Precedence Technologies Ltd
+ *
  * 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
 @@ -20,27 +20,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdaudio.c,v 1.4.10.2 2017/11/24 08:35:34 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdaudio.c,v 1.4.10.3 2017/11/27 10:21:26 martin Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/bus.h>
 #include <sys/kmem.h>
 #include <sys/module.h>
 #include "hdaudiovar.h"
 #include "hdaudioreg.h"
 #include "hdaudioio.h"
 @@ -337,26 +337,29 @@ hdaudio_command(struct hdaudio_codec *co
 uint32_t
 hdaudio_command_unlocked(struct hdaudio_codec *co, int nid, uint32_t control,
     uint32_t param)
+{
 	struct hdaudio_softc *sc = co->co_host;
 	uint32_t result;
 	hda_trace(sc, "cmd  : request %08X %08X (%02X)\n",
 	    control, param, nid);
 	hdaudio_corb_enqueue(sc, co->co_addr, nid, control, param);
 	result = hdaudio_rirb_dequeue(sc, false);
 	/* Clear response interrupt status */
 	hda_write1(sc, HDAUDIO_MMIO_RIRBSTS, hda_read1(sc, HDAUDIO_MMIO_RIRBSTS));
 	return result;
+}
 static int
 hdaudio_corb_setsize(struct hdaudio_softc *sc)
+{
 	uint8_t corbsize;
 	bus_size_t bufsize = 0;
 	/*
 	 * The size of the CORB is programmable to 2, 16, or 256 entries
 	 * by using the CORBSIZE register. Choose a size based on the
 	 * controller capabilities, preferring a larger size when possible.
 @@ -418,54 +421,54 @@ hdaudio_corb_config(struct hdaudio_softc
 	return 0;
+}
 static int
 hdaudio_corb_stop(struct hdaudio_softc *sc)
+{
 	uint8_t corbctl;
 	int retry = HDAUDIO_CORB_TIMEOUT;
 	/* Stop the CORB if necessary */
 	corbctl = hda_read1(sc, HDAUDIO_MMIO_CORBCTL);
 	if (corbctl & HDAUDIO_CORBCTL_RUN) {
 		corbctl &= ~HDAUDIO_CORBCTL_RUN;
-		hda_write4(sc, HDAUDIO_MMIO_CORBCTL, corbctl);
+		hda_write1(sc, HDAUDIO_MMIO_CORBCTL, corbctl);
 		do {
 			hda_delay(10);
-			corbctl = hda_read4(sc, HDAUDIO_MMIO_CORBCTL);
+			corbctl = hda_read1(sc, HDAUDIO_MMIO_CORBCTL);
 		} while (--retry > 0 && (corbctl & HDAUDIO_CORBCTL_RUN) != 0);
 		if (retry == 0) {
 			hda_error(sc, "timeout stopping CORB\n");
 			return ETIME;
+		}
+	}
 	return 0;
+}
 static int
 hdaudio_corb_start(struct hdaudio_softc *sc)
+{
 	uint8_t corbctl;
 	int retry = HDAUDIO_CORB_TIMEOUT;
 	/* Start the CORB if necessary */
 	corbctl = hda_read1(sc, HDAUDIO_MMIO_CORBCTL);
 	if ((corbctl & HDAUDIO_CORBCTL_RUN) == 0) {
 		corbctl |= HDAUDIO_CORBCTL_RUN;
-		hda_write4(sc, HDAUDIO_MMIO_CORBCTL, corbctl);
+		hda_write1(sc, HDAUDIO_MMIO_CORBCTL, corbctl);
 		do {
 			hda_delay(10);
-			corbctl = hda_read4(sc, HDAUDIO_MMIO_CORBCTL);
+			corbctl = hda_read1(sc, HDAUDIO_MMIO_CORBCTL);
 		} while (--retry > 0 && (corbctl & HDAUDIO_CORBCTL_RUN) == 0);
 		if (retry == 0) {
 			hda_error(sc, "timeout starting CORB\n");
 			return ETIME;
+		}
+	}
 	return 0;
+}
 static int
 hdaudio_rirb_stop(struct hdaudio_softc *sc)
+{
 @@ -487,40 +490,41 @@ hdaudio_rirb_stop(struct hdaudio_softc *
 			return ETIME;
+		}
+	}
 	return 0;
+}
 static int
 hdaudio_rirb_start(struct hdaudio_softc *sc)
+{
 	uint8_t rirbctl;
 	int retry = HDAUDIO_RIRB_TIMEOUT;
-	/* Start the RIRB if necessary */
+	/* Set the RIRB interrupt count */
 	hda_write2(sc, HDAUDIO_MMIO_RINTCNT, 1);
 	/* Start the RIRB */
 	rirbctl = hda_read1(sc, HDAUDIO_MMIO_RIRBCTL);
-	if ((rirbctl & (HDAUDIO_RIRBCTL_RUN|HDAUDIO_RIRBCTL_INT_EN)) == 0) {
+	rirbctl |= HDAUDIO_RIRBCTL_RUN;
-		rirbctl |= HDAUDIO_RIRBCTL_RUN;
+	rirbctl |= HDAUDIO_RIRBCTL_INT_EN;
-		rirbctl |= HDAUDIO_RIRBCTL_INT_EN;
+	hda_write1(sc, HDAUDIO_MMIO_RIRBCTL, rirbctl);
-		hda_write1(sc, HDAUDIO_MMIO_RIRBCTL, rirbctl);
+	do {
-		do {
+		hda_delay(10);
-			hda_delay(10);
+		rirbctl = hda_read1(sc, HDAUDIO_MMIO_RIRBCTL);
-			rirbctl = hda_read1(sc, HDAUDIO_MMIO_RIRBCTL);
+	} while (--retry > 0 && (rirbctl & HDAUDIO_RIRBCTL_RUN) == 0);
-		} while (--retry > 0 && (rirbctl & HDAUDIO_RIRBCTL_RUN) == 0);
+	if (retry == 0) {
-		if (retry == 0) {
+		hda_error(sc, "timeout starting RIRB\n");
-			hda_error(sc, "timeout starting RIRB\n");
+		return ETIME;
 			return ETIME;
+	}
 	return 0;
+}
 static int
 hdaudio_rirb_setsize(struct hdaudio_softc *sc)
+{
 	uint8_t rirbsize;
 	bus_size_t bufsize = 0;
 	/*
 	 * The size of the RIRB is programmable to 2, 16, or 256 entries
 @@ -548,47 +552,36 @@ hdaudio_rirb_setsize(struct hdaudio_soft
 	    (int)bufsize, rirbsize >> 4);
 #endif
 	sc->sc_rirb.dma_size = bufsize;
 	sc->sc_rirb.dma_sizereg = rirbsize;
 	return 0;
+}
 static int
 hdaudio_rirb_config(struct hdaudio_softc *sc)
+{
 	uint32_t rirbubase, rirblbase;
 	uint32_t rirbwp;
 	int retry = HDAUDIO_RIRB_TIMEOUT;
 	/* Program command buffer base address and size */
 	rirblbase = (uint32_t)DMA_DMAADDR(&sc->sc_rirb);
 	rirbubase = (uint32_t)(((uint64_t)DMA_DMAADDR(&sc->sc_rirb)) >> 32);
 	hda_write4(sc, HDAUDIO_MMIO_RIRBLBASE, rirblbase);
 	hda_write4(sc, HDAUDIO_MMIO_RIRBUBASE, rirbubase);
 	hda_write1(sc, HDAUDIO_MMIO_RIRBSIZE, sc->sc_rirb.dma_sizereg);
 	/* Clear the write pointer */
 	hda_write2(sc, HDAUDIO_MMIO_RIRBWP, HDAUDIO_RIRBWP_WP_RESET);
 	hda_write2(sc, HDAUDIO_MMIO_RIRBWP, 0);
 	do {
 		hda_delay(10);
 		rirbwp = hda_read2(sc, HDAUDIO_MMIO_RIRBWP);
 	} while (--retry > 0 && (rirbwp & HDAUDIO_RIRBWP_WP_RESET) != 0);
 	if (retry == 0) {
 		hda_error(sc, "timeout resetting RIRB\n");
 		return ETIME;
 	sc->sc_rirbrp = 0;
 	return 0;
+}
 static int
 hdaudio_reset(struct hdaudio_softc *sc)
+{
 	int retry = HDAUDIO_RESET_TIMEOUT;
 	uint32_t gctl;
 	int err;
 	if ((err = hdaudio_rirb_stop(sc)) != 0) {