 @@ -1,14 +1,14 @@
-/*	$NetBSD: st.c,v 1.235 2019/02/03 03:19:28 mrg Exp $ */
+/*	$NetBSD: st.c,v 1.236 2019/02/12 13:43:40 kardel Exp $ */
 /*-
  * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -40,27 +40,27 @@
  * organisations permission to use or modify this software.
+ *
  * TFS supplies this software to be publicly redistributed
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
+ *
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  * major changes by Julian Elischer (julian@jules.dialix.oz.au) May 1993
+ *
  * A lot of rewhacking done by mjacob (mjacob@nas.nasa.gov).
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: st.c,v 1.235 2019/02/03 03:19:28 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: st.c,v 1.236 2019/02/12 13:43:40 kardel Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_scsi.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/fcntl.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/malloc.h>
 #include <sys/buf.h>
 #include <sys/bufq.h>
 @@ -605,28 +605,50 @@ stopen(dev_t dev, int flags, int mode, s
 		error = scsipi_test_unit_ready(periph, sflags);
 		if (error == 0 || stmode == CTRL_MODE)
 			break;
 		/*
 		 * We had an error.
+		 *
 		 * If we're already mounted or we aren't configured for
 		 * a mount delay, or the error isn't a NOT READY error,
 		 * skip to the error exit now.
 		 */
 		if ((st->flags & ST_MOUNTED) || ST_MOUNT_DELAY == 0 ||
 		    (st->mt_key != SKEY_NOT_READY)) {
-			device_printf(st->sc_dev, "mount error (key=%d)\n",
+			device_printf(st->sc_dev,
-				st->mt_key);
+				      "mount error (sense key=%d) - "
 				      "terminating mount session\n",
 				      st->mt_key);
 			/*
 			 * the following should not trigger unless
 			 * something serious happened while the device
 			 * was open (PREVENT MEDIUM REMOVAL in effect)
 			 */
 			if (st->flags & ST_WRITTEN &&
 			    st->mt_key == SKEY_UNIT_ATTENTION) {
 				/*
 				 * device / media state may have changed
 				 * refrain from writing missing file marks
 				 * onto potentially newly inserted/formatted
 				 * media (e. g. emergency EJECT/RESET/etc.)
 				 */
 				st->flags &= ~(ST_WRITTEN|ST_FM_WRITTEN);
 				device_printf(st->sc_dev,
                                     "CAUTION: file marks/data may be missing"
                                     " - ASC = 0x%02x, ASCQ = 0x%02x\n",
 					      st->asc, st->ascq);
+			}
 			goto bad;
+		}
 		/* clear any latched errors. */
 		st->mt_resid = 0;
 		st->mt_erreg = 0;
 		st->asc = 0;
 		st->ascq = 0;
 		/*
 		 * Fake that we have the device open so
 		 * we block other apps from getting in.
 		 */
 @@ -717,35 +739,50 @@ stclose(dev_t dev, int flags, int mode,
+	 *
 	 * This is for SUN compatibility. Actually, the Sun way of
 	 * things is to:
+	 *
 	 *	only write filemarks if there are fmks to be written and
 	 *   		- open for write (possibly read/write)
 	 *		- the last operation was a write
 	 * 	or:
 	 *		- opened for wronly
 	 *		- no data was written (including filemarks)
 	 */
 	stxx = st->flags & (ST_WRITTEN | ST_FM_WRITTEN);
-	if (((flags & FWRITE) && stxx == ST_WRITTEN) ||
+	if ((flags & FWRITE) != 0) {
-	    ((flags & O_ACCMODE) == FWRITE && stxx == 0)) {
+		int nm = 0;
-		int nm;
+#ifdef ST_SUNCOMPAT
 		/*
 		 * on request only
 		 * original compat code has not been working
 		 * since ~1998
 		 */
 		if ((flags & O_ACCMODE) == FWRITE && (stxx == 0)) {
 			st->flags |= ST_WRITTEN;
 			SC_DEBUG(st->sc_periph, SCSIPI_DB3,
 				 ("SUN compatibility: write FM(s) at close\n"));
+	        }
 #endif
 		error = st_check_eod(st, FALSE, &nm, 0);
 		SC_DEBUG(st->sc_periph, SCSIPI_DB3,
 			 ("wrote %d FM(s) at close error=%d\n", nm, error));
+	}
 	/* Allow robots to eject tape if needed.  */
-	scsipi_prevent(periph, SPAMR_ALLOW,
+	if (!(st->quirks & ST_Q_NOPREVENT)) {
-	    XS_CTL_IGNORE_ILLEGAL_REQUEST | XS_CTL_IGNORE_NOT_READY);
+		scsipi_prevent(periph, SPAMR_ALLOW,
 		    XS_CTL_IGNORE_ILLEGAL_REQUEST | XS_CTL_IGNORE_NOT_READY);
+	}
 	switch (STMODE(dev)) {
 	case NORMAL_MODE:
 		st_unmount(st, NOEJECT);
 		break;
 	case NOREW_MODE:
 	case CTRL_MODE:
 		/*
 		 * Leave mounted unless media seems to have been removed.
+		 *
 		 * Otherwise, if we're to terminate a tape with more than one
 		 * filemark [ and because we're not rewinding here ], backspace
 		 * one filemark so that later appends will see an unbroken
 @@ -759,38 +796,48 @@ stclose(dev_t dev, int flags, int mode,
 			/*
 			 * ST_WRITTEN was preserved from above.
+			 *
 			 * All we need to know here is:
+			 *
 			 *	Were we writing this tape and was the last
 			 *	operation a write?
+			 *
 			 *	Are there supposed to be 2FM at EOD?
+			 *
 			 * If both statements are true, then we backspace
 			 * one filemark.
 			 */
 			stxx &= ~ST_FM_WRITTEN;
 			stxx |= (st->flags & ST_2FM_AT_EOD);
 			if ((flags & FWRITE) != 0 &&
 			    (stxx == (ST_2FM_AT_EOD|ST_WRITTEN))) {
 				error = st_space(st, -1, SP_FILEMARKS, 0);
 				SC_DEBUG(st->sc_periph, SCSIPI_DB3, ("st_space(-1) error=%d\n", error));
 			} else {
 				SC_DEBUG(st->sc_periph, SCSIPI_DB3, ("no backspacing - flags = 0x%x, stxx=0x%x, st->flags=0x%x\n", flags, stxx, st->flags));
+			}
 		} else {
 			SC_DEBUG(st->sc_periph, SCSIPI_DB3, ("error %d from st_check_eod\n", error));
+		}
 		break;
 	case EJECT_MODE:
 		st_unmount(st, EJECT);
 		break;
+	}
 	KASSERTMSG((st->flags & ST_WRITTEN) == 0,
 		   "pending ST_WRITTEN flag NOT cleared (flags=0x%x)", st->flags);
 	scsipi_wait_drain(periph);
 	scsipi_adapter_delref(adapt);
 	periph->periph_flags &= ~PERIPH_OPEN;
 	return error;
+}
 /*
  * Start a new mount session.
  * Copy in all the default parameters from the selected device mode.
  * and try guess any that seem to be defaulted.
  */
 @@ -898,27 +945,27 @@ static void
 st_unmount(struct st_softc *st, boolean eject)
+{
 	struct scsipi_periph *periph = st->sc_periph;
 	int nmarks;
 	if ((st->flags & ST_MOUNTED) == 0)
 		return;
 	SC_DEBUG(periph, SCSIPI_DB1, ("unmounting\n"));
 	st_check_eod(st, FALSE, &nmarks, XS_CTL_IGNORE_NOT_READY);
 	st_rewind(st, 0, XS_CTL_IGNORE_NOT_READY);
 	/*
 	 * Section 9.3.3 of the SCSI specs states that a device shall return
-	 * the density value specified in the last succesfull MODE SELECT
+	 * the density value specified in the last successful MODE SELECT
 	 * after an unload operation, in case it is not able to
 	 * automatically determine the density of the new medium.
+	 *
 	 * So we instruct the device to use the default density, which will
 	 * prevent the use of stale density values (in particular,
 	 * in st_touch_tape().
 	 */
 	st->density = 0;
 	if (st->ops(st, ST_OPS_MODESELECT, 0) != 0) {
 		aprint_error_dev(st->sc_dev,
 		    "WARNING: cannot revert to default density\n");
+	}
 @@ -1056,26 +1103,28 @@ ststrategy(struct buf *bp)
 	struct st_softc *st = device_lookup_private(&st_cd, STUNIT(bp->b_dev));
 	struct scsipi_periph *periph = st->sc_periph;
 	struct scsipi_channel *chan = periph->periph_channel;
 	SC_DEBUG(periph, SCSIPI_DB1,
 	    ("ststrategy %d bytes @ blk %" PRId64 "\n", bp->b_bcount,
 	        bp->b_blkno));
 	/* If it's a null transfer, return immediately */
 	if (bp->b_bcount == 0)
 		goto abort;
 	/* If offset is negative, error */
 	if (bp->b_blkno < 0) {
 		SC_DEBUG(periph, SCSIPI_DB3,
 			 ("EINVAL: ststrategy negative blockcount %ld\n", bp->b_blkno));
 		bp->b_error = EINVAL;
 		goto abort;
+	}
 	/* Odd sized request on fixed drives are verboten */
 	if (st->flags & ST_FIXEDBLOCKS) {
 		if (bp->b_bcount % st->blksize) {
 			aprint_error_dev(st->sc_dev, "bad request, must be multiple of %d\n",
 			    st->blksize);
 			bp->b_error = EIO;
 			goto abort;
+		}
+	}
 @@ -1353,37 +1402,45 @@ stdone(struct scsipi_xfer *xs, int error
 		mutex_exit(&st->sc_iolock);
 		rnd_add_uint32(&st->rnd_source, bp->b_blkno);
 		biodone(bp);
+	}
+}
 static int
 stread(dev_t dev, struct uio *uio, int iomode)
+{
 	struct st_softc *st = device_lookup_private(&st_cd, STUNIT(dev));
-	return physio(ststrategy, NULL, dev, B_READ,
+	int r = physio(ststrategy, NULL, dev, B_READ,
-	    st->sc_periph->periph_channel->chan_adapter->adapt_minphys, uio);
+		       st->sc_periph->periph_channel->chan_adapter->adapt_minphys, uio);
 	SC_DEBUG(st->sc_periph, SCSIPI_DB1, ("[stread: result=%d]\n", r));
 	return r;
+}
 static int
 stwrite(dev_t dev, struct uio *uio, int iomode)
+{
 	struct st_softc *st = device_lookup_private(&st_cd, STUNIT(dev));
-	return physio(ststrategy, NULL, dev, B_WRITE,
+	int r = physio(ststrategy, NULL, dev, B_WRITE,
 	    st->sc_periph->periph_channel->chan_adapter->adapt_minphys, uio);
 	SC_DEBUG(st->sc_periph, SCSIPI_DB1, ("[stwrite: result=%d]\n", r));
 	return r;
+}
 /*
  * Perform special action on behalf of the user;
  * knows about the internals of this device
  */
 static int
 stioctl(dev_t dev, u_long cmd, void *arg, int flag, struct lwp *l)
+{
 	int error = 0;
 	int unit;
 	int number, nmarks, dsty;
 	int flags;
 @@ -1776,28 +1833,32 @@ st_space(struct st_softc *st, int number
 /*
  * write N filemarks
  */
 static int
 st_write_filemarks(struct st_softc *st, int number, int flags)
+{
 	int error;
 	struct scsi_write_filemarks cmd;
 	/*
 	 * It's hard to write a negative number of file marks.
 	 * Don't try.
 	 */
-	if (number < 0)
+	if (number < 0) {
 		SC_DEBUG(st->sc_periph, SCSIPI_DB3,
 			 ("EINVAL: st_write_filemarks not writing %d file marks\n", number));
 		return EINVAL;
+	}
 	switch (number) {
 	case 0:		/* really a command to sync the drive's buffers */
 		break;
 	case 1:
 		if (st->flags & ST_FM_WRITTEN)	/* already have one down */
 			st->flags &= ~ST_WRITTEN;
 		else
 			st->flags |= ST_FM_WRITTEN;
 		st->flags &= ~ST_PER_ACTION;
 		break;
 	default:
 		st->flags &= ~(ST_PER_ACTION | ST_WRITTEN);
+	}
 @@ -1972,28 +2033,31 @@ st_rdpos(struct st_softc *st, int hard,
 		cmd.byte1 = 1;
 	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) {
 #if	0
 		printf("posdata:");
 		for (hard = 0; hard < sizeof(posdata); hard++)
 			printf("%02x ", posdata[hard] & 0xff);
 		printf("\n");
 #endif
-		if (posdata[0] & 0x4)	/* Block Position Unknown */
+		if (posdata[0] & 0x4) {	/* Block Position Unknown */
 			SC_DEBUG(st->sc_periph, SCSIPI_DB3,
 				 ("EINVAL: strdpos block position unknown\n"));
 			error = EINVAL;
+		}
 		else
 			*blkptr = _4btol(&posdata[4]);
+	}
 	return error;
+}
 static int
 st_setpos(struct st_softc *st, int hard, uint32_t *blkptr)
+{
 	int error;
 	struct scsi_tape_locate cmd;
 	/*