diff options
| author |   krw <krw@openbsd.org> | 2020-07-01 00:02:08 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2020-07-01 00:02:08 +0000 |
| commit | 56332b02304b252ce9f7aaa920f0c13aa7f881bd (patch) | |
| tree | c5622f7052dc2218ceedacff646be5a28d637f04 /sys/dev/ic/iha.c | |
| parent | Fix two places where carp backup state is misspelled in comments. (diff) | |
| download | wireguard-openbsd-56332b02304b252ce9f7aaa920f0c13aa7f881bd.tar.xz wireguard-openbsd-56332b02304b252ce9f7aaa920f0c13aa7f881bd.zip | |
If the adapter card needs to keep track of its own id on the bus, or
the width of the bus it is providing, it should rely on info in its
softc. i.e. not on info in the prototype scsi_link that is passed out
for other bits of the kernel to fiddle with.
Most drivers already do this. Make it so for the laggards iha(4) and
siop(4). Actually use the existing softc value in wd33c93.c.
No intentional functional change.
Diffstat (limited to 'sys/dev/ic/iha.c')
| -rw-r--r-- | sys/dev/ic/iha.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/dev/ic/iha.c b/sys/dev/ic/iha.c index bd531055a3c..ac1d0a19cce 100644 --- a/sys/dev/ic/iha.c +++ b/sys/dev/ic/iha.c @@ -1,4 +1,4 @@ -/* $OpenBSD: iha.c,v 1.48 2020/02/18 17:08:35 krw Exp $ */ +/* $OpenBSD: iha.c,v 1.49 2020/07/01 00:02:08 krw Exp $ */ /*------------------------------------------------------------------------- * * Device driver for the INI-9XXXU/UW or INIC-940/950 PCI SCSI Controller. @@ -366,6 +366,7 @@ iha_init_tulip(struct iha_softc *sc) sc->HCS_Semaph = ~SEMAPH_IN_MAIN; sc->HCS_JSStatus0 = 0; sc->HCS_ActScb = NULL; + sc->sc_id = pScsi->NVM_SCSI_Id; error = iha_alloc_scbs(sc); if (error != 0) @@ -407,7 +408,7 @@ iha_init_tulip(struct iha_softc *sc) bus_space_write_1(iot, ioh, TUL_SCTRL0, RSMOD); /* Program HBA's SCSI ID */ - bus_space_write_1(iot, ioh, TUL_SID, sc->sc_link.adapter_target << 4); + bus_space_write_1(iot, ioh, TUL_SID, sc->sc_id << 4); /* * Configure the channel as requested by the NVRAM settings read @@ -941,7 +942,7 @@ iha_scsi(struct iha_softc *sc, bus_space_tag_t iot, bus_space_handle_t ioh) /* program HBA's SCSI ID & target SCSI ID */ bus_space_write_1(iot, ioh, TUL_SID, - (sc->sc_link.adapter_target << 4) | pScb->SCB_Target); + (sc->sc_id << 4) | pScb->SCB_Target); if ((pScb->SCB_Flags & SCSI_RESET) == 0) { bus_space_write_1(iot, ioh, TUL_SYNCM, pTcs->TCS_JS_Period); |