diff options
| author | Matthew Dempsky <matthew@cvs.openbsd.org> | 2011-07-17 22:46:49 +0000 |
|---|---|---|
| committer | Matthew Dempsky <matthew@cvs.openbsd.org> | 2011-07-17 22:46:49 +0000 |
| commit | 45908bcfad1d066ecbb07b0eeadb930912bd0696 (patch) | |
| tree | 47024f3c9b6743f3e1c411175046dcd9f8e21030 /sys/arch/sparc64 | |
| parent | d923b4b88f795933bd6165856e848abc5bbcd161 (diff) | |
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@
Diffstat (limited to 'sys/arch/sparc64')
| -rw-r--r-- | sys/arch/sparc64/dev/vdsk.c | 6 | ||||
| -rw-r--r-- | sys/arch/sparc64/sparc64/autoconf.c | 7 |
2 files changed, 8 insertions, 5 deletions
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); |