[src/trunk]: src/sys/dev/scsipi I2O HBAs provide an abstracted view of the bu...

[ad <ad%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6954657246e1
branches:  trunk
changeset: 500009:6954657246e1
user:      ad <ad%NetBSD.org@localhost>
date:      Sun Dec 03 13:30:36 2000 +0000

description:
I2O HBAs provide an abstracted view of the bus; use SCBUSIOLLSCAN to give
them an oppertunity to re-scan it before we do.

diffstat:

 sys/dev/scsipi/scsiconf.c |  18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diffs (53 lines):

diff -r 0a10bd847318 -r 6954657246e1 sys/dev/scsipi/scsiconf.c
--- a/sys/dev/scsipi/scsiconf.c Sun Dec 03 13:24:33 2000 +0000
+++ b/sys/dev/scsipi/scsiconf.c Sun Dec 03 13:30:36 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: scsiconf.c,v 1.152 2000/11/14 08:52:35 pk Exp $        */
+/*     $NetBSD: scsiconf.c,v 1.153 2000/12/03 13:30:36 ad Exp $        */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -322,6 +322,7 @@
        int bus, target, lun;
 {
        struct scsibus_softc *scsi;
+       struct scsipi_link *sc_link;
        int maxtarget, mintarget, maxlun, minlun;
        u_int8_t scsi_addr;
        int error;
@@ -332,7 +333,8 @@
        if (scsi == NULL)
                return (ENXIO);
 
-       scsi_addr = scsi->adapter_link->scsipi_scsi.adapter_target;
+       sc_link = scsi->adapter_link;
+       scsi_addr = sc_link->scsipi_scsi.adapter_target;
 
        if (target == -1) {
                maxtarget = scsi->sc_maxtarget;
@@ -352,7 +354,15 @@
                maxlun = minlun = lun;
        }
 
-       if ((error = scsipi_adapter_addref(scsi->adapter_link)) != 0)
+       /*
+        * Some HBAs provide an abstracted view of the bus; give them an
+        * oppertunity to re-scan it before we do.
+        */
+       if (sc_link->adapter->scsipi_ioctl != NULL)
+               (*sc_link->adapter->scsipi_ioctl)(sc_link, SCBUSIOLLSCAN, NULL,
+                   0, curproc);
+
+       if ((error = scsipi_adapter_addref(sc_link)) != 0)
                return (error);
        for (target = mintarget; target <= maxtarget; target++) {
                if (target == scsi_addr)
@@ -367,7 +377,7 @@
                        /* otherwise something says we should look further */
                }
        }
-       scsipi_adapter_delref(scsi->adapter_link);
+       scsipi_adapter_delref(sc_link);
        return (0);
 }