Fri Jun 1 18:14:33 2018 UTC ()

set ATACH_DMA_BEFORE_CMD


(macallan)

diff -r1.21 -r1.22 src/sys/dev/pci/svwsata.c

--- src/sys/dev/pci/svwsata.c 2018/06/01 16:12:01	1.21
+++ src/sys/dev/pci/svwsata.c 2018/06/01 18:14:33	1.22

 @@ -1,33 +1,33 @@
-/*	$NetBSD: svwsata.c,v 1.21 2018/06/01 16:12:01 macallan Exp $	*/
+/*	$NetBSD: svwsata.c,v 1.22 2018/06/01 18:14:33 macallan Exp $	*/
 /*
  * Copyright (c) 2005 Mark Kettenis
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svwsata.c,v 1.21 2018/06/01 16:12:01 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svwsata.c,v 1.22 2018/06/01 18:14:33 macallan Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <dev/ata/atareg.h>
 #include <dev/ata/satareg.h>
 #include <dev/ata/satavar.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/pciidereg.h>
 #include <dev/pci/pciidevar.h>
 #include <dev/pci/pciide_svwsata_reg.h>
 @@ -312,29 +312,28 @@ svwsata_mapchan(struct pciide_channel *c
 		goto bad;
+	}
 	bus_space_write_4(sc->sc_ba5_st, sc->sc_ba5_sh,
 	    (wdc_cp->ch_channel << 8) + SVWSATA_SICR1,
 	    bus_space_read_4(sc->sc_ba5_st, sc->sc_ba5_sh,
 	        (wdc_cp->ch_channel << 8) + SVWSATA_SICR1)
 	    & ~0x00040000);
 	bus_space_write_4(sc->sc_ba5_st, sc->sc_ba5_sh,
 	    (wdc_cp->ch_channel << 8) + SVWSATA_SERROR, 0xffffffff);
 	bus_space_write_4(sc->sc_ba5_st, sc->sc_ba5_sh,
 	    (wdc_cp->ch_channel << 8) + SVWSATA_SIM, 0);
 #ifndef notyet
 	cp->ata_channel.ch_flags |= ATACH_DMA_BEFORE_CMD;
 #endif
 	wdcattach(wdc_cp);
 	return;
  bad:
 	cp->ata_channel.ch_flags |= ATACH_DISABLED;
+}
 int
 svwsata_intr(void *arg)
+{
 	struct pciide_softc *sc = arg;
 	struct pciide_channel *cp;
 	struct ata_channel *wdc_cp;