diff options
author | Robert Nagy <robert@cvs.openbsd.org> | 2021-08-31 05:29:56 +0000 |
---|---|---|
committer | Robert Nagy <robert@cvs.openbsd.org> | 2021-08-31 05:29:56 +0000 |
commit | 45c224073e1688b739236b2e9a79b0afda2bf654 (patch) | |
tree | 8ba9a09eeebdde2927511b3fbc170dae80da60aa /sys/scsi | |
parent | c667dfd4631414f6c8a2a63fcaa9479740fc5f48 (diff) |
add support for obtaining sense status and source slot of a media
this fixes a bug in bacula where the catalog was not properly kept
up-to-date if a tape was in a drive becuse its source slot was
unknown
based on code from FreeBSD; ok krw@
picker 0: sense: <0x00/0x00> voltag: <:0> avoltag: <:0> source: <>
slot 0: <ACCESS,FULL> sense: <0x00/0x00> voltag: <XX1168L1:0> avoltag: <:0> source: <slot 0>
slot 1: <ACCESS,FULL> sense: <0x00/0x00> voltag: <XX1187L1:0> avoltag: <:0> source: <slot 1>
slot 2: <ACCESS,FULL> sense: <0x00/0x00> voltag: <XX1184L1:0> avoltag: <:0> source: <slot 2>
slot 3: <ACCESS,FULL> sense: <0x00/0x00> voltag: <XX1195L1:0> avoltag: <:0> source: <slot 3>
slot 4: <ACCESS,FULL> sense: <0x00/0x00> voltag: <XX1037L1:0> avoltag: <:0> source: <slot 4>
slot 5: <ACCESS,FULL> sense: <0x00/0x00> voltag: <XX1038L1:0> avoltag: <:0> source: <slot 5>
slot 6: <ACCESS,FULL> sense: <0x00/0x00> voltag: <XX1166L1:0> avoltag: <:0> source: <slot 6>
slot 7: <ACCESS,FULL> sense: <0x00/0x00> voltag: <XX1167L1:0> avoltag: <:0> source: <slot 7>
slot 8: <ACCESS,FULL> sense: <0x00/0x00> voltag: <XX1180L1:0> avoltag: <:0> source: <slot 8>
slot 9: <ACCESS,FULL> sense: <0x00/0x00> voltag: <XX1186L1:0> avoltag: <:0> source: <slot 9>
slot 10: <ACCESS> sense: <0x00/0x00> voltag: <:0> avoltag: <:0> source: <picker 0>
slot 11: <ACCESS,FULL> sense: <0x00/0x00> voltag: <XX1182L1:0> avoltag: <:0> source: <slot 11>
slot 12: <ACCESS,FULL> sense: <0x00/0x00> voltag: <XX1181L1:0> avoltag: <:0> source: <slot 12>
slot 13: <ACCESS,FULL> sense: <0x00/0x00> voltag: <XX1196L1:0> avoltag: <:0> source: <slot 13>
slot 14: <ACCESS,FULL> sense: <0x00/0x00> voltag: <XX1169L1:0> avoltag: <:0> source: <slot 14>
slot 15: <ACCESS,FULL> sense: <0x00/0x00> voltag: <XX1197L1:0> avoltag: <:0> source: <slot 15>
slot 16: <ACCESS,FULL> sense: <0x00/0x00> voltag: <XX1165L1:0> avoltag: <:0> source: <slot 16>
slot 17: <ACCESS,FULL> sense: <0x00/0x00> voltag: <XX1199L1:0> avoltag: <:0> source: <slot 17>
slot 18: <ACCESS,FULL> sense: <0x00/0x00> voltag: <XX1189L1:0> avoltag: <:0> source: <slot 18>
slot 19: <ACCESS,FULL> sense: <0x00/0x00> voltag: <XX1185L1:0> avoltag: <:0> source: <slot 19>
slot 20: <ACCESS,FULL> sense: <0x00/0x00> voltag: <XX1198L1:0> avoltag: <:0> source: <slot 20>
slot 21: <ACCESS,FULL> sense: <0x00/0x00> voltag: <XX1039L1:0> avoltag: <:0> source: <slot 21>
slot 22: <ACCESS,FULL> sense: <0x00/0x00> voltag: <XX1035L1:0> avoltag: <:0> source: <slot 22>
slot 23: <ACCESS,FULL> sense: <0x00/0x00> voltag: <XX1188L1:0> avoltag: <:0> source: <slot 23>
drive 0: <ACCESS,FULL> sense: <0x00/0x00> voltag: <XX1183L1:0> avoltag: <:0> source: <slot 10>
Diffstat (limited to 'sys/scsi')
-rw-r--r-- | sys/scsi/ch.c | 48 |
1 files changed, 45 insertions, 3 deletions
diff --git a/sys/scsi/ch.c b/sys/scsi/ch.c index 672bd9560b2..7672970b5c8 100644 --- a/sys/scsi/ch.c +++ b/sys/scsi/ch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ch.c,v 1.68 2021/03/12 10:22:46 jsg Exp $ */ +/* $OpenBSD: ch.c,v 1.69 2021/08/31 05:29:55 robert Exp $ */ /* $NetBSD: ch.c,v 1.26 1997/02/21 22:06:52 thorpej Exp $ */ /* @@ -514,11 +514,53 @@ copy_voltag(struct changer_voltag *uvoltag, struct volume_tag *voltag) * changer_element_status structure. */ static void -copy_element_status(int flags, struct read_element_status_descriptor *desc, +copy_element_status(struct ch_softc *sc, int flags, + struct read_element_status_descriptor *desc, struct changer_element_status *ces) { + u_int16_t eaddr = _2btol(desc->eaddr); + u_int16_t et; + + for (et = CHET_MT; et <= CHET_DT; et++) { + if ((sc->sc_firsts[et] <= eaddr) + && ((sc->sc_firsts[et] + sc->sc_counts[et]) + > eaddr)) { + ces->ces_addr = eaddr - sc->sc_firsts[et]; + ces->ces_type = et; + break; + } + } + ces->ces_flags = desc->flags1; + ces->ces_sensecode = desc->sense_code; + ces->ces_sensequal = desc->sense_qual; + + if (desc->flags2 & READ_ELEMENT_STATUS_INVERT) + ces->ces_flags |= READ_ELEMENT_STATUS_EXCEPT; + + if (desc->flags2 & READ_ELEMENT_STATUS_SVALID) { + eaddr = _2btol(desc->ssea); + + /* convert source address to logical format */ + for (et = CHET_MT; et <= CHET_DT; et++) { + if ((sc->sc_firsts[et] <= eaddr) + && ((sc->sc_firsts[et] + sc->sc_counts[et]) + > eaddr)) { + ces->ces_source_addr = + eaddr - sc->sc_firsts[et]; + ces->ces_source_type = et; + ces->ces_flags |= READ_ELEMENT_STATUS_ACCESS; + break; + } + } + + if (!(ces->ces_flags & READ_ELEMENT_STATUS_ACCESS)) + printf("ch: warning: could not map element source " + "address %ud to a valid element type\n", + eaddr); + } + if (ISSET(flags, READ_ELEMENT_STATUS_PVOLTAG)) copy_voltag(&ces->ces_pvoltag, &desc->pvoltag); if (ISSET(flags, READ_ELEMENT_STATUS_AVOLTAG)) @@ -604,7 +646,7 @@ ch_usergetelemstatus(struct ch_softc *sc, desc = (caddr_t)(pg_hdr + 1); for (i = 0; i < avail; ++i) { struct changer_element_status *ces = &(user_data[i]); - copy_element_status(pg_hdr->flags, + copy_element_status(sc, pg_hdr->flags, (struct read_element_status_descriptor *)desc, ces); desc += desclen; } |