Backout a bunch of my SCSI commits from c2k11. At least one of these

is causing problems when trying to boot sparc64 from an isp(4).

Verified to fix the sparc64/isp(4) regression by krw@; ok deraadt@

6 files changed, 18 insertions, 15 deletions

diff --git a/sys/arch/mac68k/dev/ncr5380.c b/sys/arch/mac68k/dev/ncr5380.c
index 1bf683c46ba..a7dc3f974c9 100644
--- a/sys/arch/mac68k/dev/ncr5380.c
+++ b/sys/arch/mac68k/dev/ncr5380.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ncr5380.c,v 1.42 2011/07/05 20:34:45 matthew Exp $	*/
+/*	$OpenBSD: ncr5380.c,v 1.43 2011/07/17 22:46:47 matthew Exp $	*/
 /*	$NetBSD: ncr5380.c,v 1.38 1996/12/19 21:48:18 scottr Exp $	*/
 
 /*
@@ -409,7 +409,7 @@ ncr5380_show_scsi_cmd(struct scsi_xfer *xs)
 	int	i  = 0;
 
 	if (!(xs->flags & SCSI_RESET)) {
-		printf("(%d:%d:%d,0x%x)-", xs->sc_link->bus->sc_dev.dv_unit,
+		printf("(%d:%d:%d,0x%x)-", xs->sc_link->scsibus,
 		    xs->sc_link->target, xs->sc_link->lun, xs->sc_link->flags);
 		while (i < xs->cmdlen) {
 			if (i)
@@ -419,8 +419,8 @@ ncr5380_show_scsi_cmd(struct scsi_xfer *xs)
 		printf("-\n");
 	}
 	else {
-		printf("(%d:%d:%d)-RESET-\n", xs->sc_link->bus->sc_dev.dv_unit,
-		    xs->sc_link->target, xs->sc_link->lun);
+		printf("(%d:%d:%d)-RESET-\n",
+		    xs->sc_link->scsibus,xs->sc_link->target, xs->sc_link->lun);
 	}
 }
 
diff --git a/sys/arch/mvme68k/dev/vsbic.c b/sys/arch/mvme68k/dev/vsbic.c
index f1387d69e8d..615d834b7f3 100644
--- a/sys/arch/mvme68k/dev/vsbic.c
+++ b/sys/arch/mvme68k/dev/vsbic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vsbic.c,v 1.7 2011/07/08 22:09:26 matthew Exp $	*/
+/*	$OpenBSD: vsbic.c,v 1.8 2011/07/17 22:46:47 matthew Exp $	*/
 
 /*
  * Copyright (c) 2008, 2009  Miodrag Vallat.
@@ -537,13 +537,13 @@ vsbic_attach(struct device *parent, struct device *self, void *args)
 	vmeintr_establish(sc->sc_vec, &sc->sc_ih, DEVNAME(sc));
 
 	sc->sc_link.adapter = &vsbic_swtch;
+	sc->sc_link.adapter_buswidth = 8;
 	sc->sc_link.adapter_softc = sc;
 	sc->sc_link.adapter_target = sc->sc_id;
 	sc->sc_link.openings = VSBIC_NUMOPENINGS;
 
 	bzero(&saa, sizeof saa);
 	saa.saa_sc_link = &sc->sc_link;
-	saa.saa_targets = 8;
 
 	tmp = bootpart;
 	if (ca->ca_paddr != bootaddr)
diff --git a/sys/arch/mvme88k/dev/vsbic.c b/sys/arch/mvme88k/dev/vsbic.c
index 985ca0ff60a..e9b8826cff0 100644
--- a/sys/arch/mvme88k/dev/vsbic.c
+++ b/sys/arch/mvme88k/dev/vsbic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vsbic.c,v 1.8 2011/07/08 22:09:27 matthew Exp $	*/
+/*	$OpenBSD: vsbic.c,v 1.9 2011/07/17 22:46:47 matthew Exp $	*/
 
 /*
  * Copyright (c) 2008, 2009  Miodrag Vallat.
@@ -537,13 +537,13 @@ vsbic_attach(struct device *parent, struct device *self, void *args)
 	vmeintr_establish(sc->sc_vec, &sc->sc_ih, DEVNAME(sc));
 
 	sc->sc_link.adapter = &vsbic_swtch;
+	sc->sc_link.adapter_buswidth = 8;
 	sc->sc_link.adapter_softc = sc;
 	sc->sc_link.adapter_target = sc->sc_id;
 	sc->sc_link.openings = VSBIC_NUMOPENINGS;
 
 	bzero(&saa, sizeof saa);
 	saa.saa_sc_link = &sc->sc_link;
-	saa.saa_targets = 8;
 
 	tmp = bootpart;
 	if (ca->ca_paddr != bootaddr)
diff --git a/sys/arch/sparc64/dev/vdsk.c b/sys/arch/sparc64/dev/vdsk.c
index d3adc1e0faf..be7af5a9ef8 100644
--- a/sys/arch/sparc64/dev/vdsk.c
+++ b/sys/arch/sparc64/dev/vdsk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vdsk.c,v 1.28 2011/07/08 22:09:27 matthew Exp $	*/
+/*	$OpenBSD: vdsk.c,v 1.29 2011/07/17 22:46:47 matthew Exp $	*/
 /*
  * Copyright (c) 2009, 2011 Mark Kettenis
  *
@@ -342,13 +342,13 @@ vdsk_attach(struct device *parent, struct device *self, void *aux)
 
 	sc->sc_link.adapter = &sc->sc_switch;
 	sc->sc_link.adapter_softc = self;
+	sc->sc_link.adapter_buswidth = 2;
+	sc->sc_link.luns = 1; /* XXX slices should be presented as luns? */
 	sc->sc_link.adapter_target = 2;
 	sc->sc_link.openings = sc->sc_vd->vd_nentries - 1;
 
 	bzero(&saa, sizeof(saa));
 	saa.saa_sc_link = &sc->sc_link;
-	saa.saa_targets = 2;
-	saa.saa_luns = 1; /* XXX slices should be presented as luns? */
 	config_found(self, &saa, scsiprint);
 
 	return;
diff --git a/sys/arch/sparc64/sparc64/autoconf.c b/sys/arch/sparc64/sparc64/autoconf.c
index 8c31f13c07e..1fab3995104 100644
--- a/sys/arch/sparc64/sparc64/autoconf.c
+++ b/sys/arch/sparc64/sparc64/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.113 2011/07/16 16:48:42 matthew Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.114 2011/07/17 22:46:47 matthew Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.51 2001/07/24 19:32:11 eeh Exp $ */
 
 /*
@@ -1361,8 +1361,11 @@ device_register(struct device *dev, void *aux)
 	}
 
 	if (strcmp(devname, "scsibus") == 0) {
+		struct scsibus_attach_args *saa = aux;
+		struct scsi_link *sl = saa->saa_sc_link;
+
 		if (strcmp(bp->name, "fp") == 0 &&
-		    bp->val[0] == dev->dv_unit) {
+		    bp->val[0] == sl->scsibus) {
 			DPRINTF(ACDB_BOOTDEV, ("\t-- matched component %s to %s\n",
 			    bp->name, dev->dv_xname));
 			bootpath_store(1, bp + 1);
diff --git a/sys/arch/vax/dec/sii.c b/sys/arch/vax/dec/sii.c
index 1a7a801d547..75cd717b15c 100644
--- a/sys/arch/vax/dec/sii.c
+++ b/sys/arch/vax/dec/sii.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sii.c,v 1.12 2011/07/08 22:09:27 matthew Exp $	*/
+/*	$OpenBSD: sii.c,v 1.13 2011/07/17 22:46:47 matthew Exp $	*/
 /*	$NetBSD: sii.c,v 1.42 2000/06/02 20:20:29 mhitch Exp $	*/
 /*
  * Copyright (c) 2008 Miodrag Vallat.
@@ -198,6 +198,7 @@ sii_attach(sc)
 	 * fill in the prototype scsi_link.
 	 */
 	sc->sc_link.adapter = &sii_scsiswitch;
+	sc->sc_link.adapter_buswidth = 8;
 	sc->sc_link.adapter_softc = sc;
 	sc->sc_link.adapter_target = sc->sc_regs->id & SII_IDMSK;
 	sc->sc_link.openings = 1;	/* driver can't queue requests yet */
@@ -207,7 +208,6 @@ sii_attach(sc)
 	 */
 	bzero(&saa, sizeof(saa));
 	saa.saa_sc_link = &sc->sc_link;
-	saa.saa_targets = 8;
 	config_found(&sc->sc_dev, &saa, scsiprint);
 }