[src/netbsd-8]: src/sys/dev/scsipi Pull up following revision(s) (requested b...

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

details:   https://anonhg.NetBSD.org/src/rev/33bdd19ee4ee
branches:  netbsd-8
changeset: 460813:33bdd19ee4ee
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Nov 04 14:22:13 2019 +0000

description:
Pull up following revision(s) (requested by jnemeth in ticket #1421):

        sys/dev/scsipi/st.c: revision 1.238

Add simple position recovery when positioning to EOM by reading
the position with READ_POSITION.
this allows for

        mt eom
        mt st

to return the correct file position.

diffstat:

 sys/dev/scsipi/st.c |  56 +++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 52 insertions(+), 4 deletions(-)

diffs (91 lines):

diff -r c42ceb339269 -r 33bdd19ee4ee sys/dev/scsipi/st.c
--- a/sys/dev/scsipi/st.c       Sun Nov 03 11:39:47 2019 +0000
+++ b/sys/dev/scsipi/st.c       Mon Nov 04 14:22:13 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: st.c,v 1.230.8.3 2019/03/01 17:29:32 martin Exp $ */
+/*     $NetBSD: st.c,v 1.230.8.4 2019/11/04 14:22:13 martin Exp $ */
 
 /*-
  * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: st.c,v 1.230.8.3 2019/03/01 17:29:32 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: st.c,v 1.230.8.4 2019/11/04 14:22:13 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_scsi.h"
@@ -355,6 +355,7 @@
 static int     st_interpret_sense(struct scsipi_xfer *);
 static int     st_touch_tape(struct st_softc *);
 static int     st_erase(struct st_softc *, int full, int flags);
+static void     st_updatefilepos(struct st_softc *);
 static int     st_rdpos(struct st_softc *, int, uint32_t *);
 static int     st_setpos(struct st_softc *, int, uint32_t *);
 
@@ -1821,8 +1822,7 @@
                                        st->blkno = -1;
                        }
                } else if (what == SP_EOM) {
-                       /* This loses us relative position. */
-                       st->fileno = st->blkno = -1;
+                        st_updatefilepos(st);
                }
        }
        return error;
@@ -1995,6 +1995,54 @@
        return error;
 }
 
+static void
+st_updatefilepos(struct st_softc *st)
+{
+        int error;
+        uint8_t posdata[32];
+        struct scsi_tape_read_position cmd;
+
+        memset(&cmd, 0, sizeof(cmd));
+        memset(&posdata, 0, sizeof(posdata));
+        cmd.opcode = READ_POSITION;
+        cmd.byte1 = 6;  /* service action: LONG FORM */
+
+        error = scsipi_command(st->sc_periph, (void *)&cmd, sizeof(cmd),
+            (void *)&posdata, sizeof(posdata), ST_RETRIES, ST_CTL_TIME, NULL,
+            XS_CTL_SILENT | XS_CTL_DATA_IN);
+
+        if (error == 0) {
+#ifdef SCSIPI_DEBUG
+                if (st->sc_periph->periph_dbflags & SCSIPI_DB3) {
+                        int hard;
+
+                        printf("posdata: ");
+                        for (hard = 0; hard < sizeof(posdata); hard++)
+                                printf("%02x ", posdata[hard] & 0xff);
+                        printf("\n");
+                }
+#endif
+                if (posdata[0] & 0xC) { /* Block|Mark Position Unknown */
+                        SC_DEBUG(st->sc_periph, SCSIPI_DB3,
+                                 ("st_updatefilepos block/mark position unknown (0x%02x)\n",
+                                  posdata[0]));
+                } else {
+                        st->fileno = _8btol(&posdata[16]);
+                        st->blkno = 0;
+                        SC_DEBUG(st->sc_periph, SCSIPI_DB3,
+                                 ("st_updatefilepos file position %"PRId64"\n",
+                                  st->fileno));
+                        return;
+                }
+        } else {
+                SC_DEBUG(st->sc_periph, SCSIPI_DB3,
+                         ("st_updatefilepos READ POSITION(LONG_FORM) failed (error=%d)\n",
+                          error));
+        }
+        st->fileno = -1;
+        st->blkno = -1;
+}
+
 static int
 st_rdpos(struct st_softc *st, int hard, uint32_t *blkptr)
 {