Author: mav
Date: Sat Jul 27 22:19:34 2013
New Revision: 253721
URL: http://svnweb.freebsd.org/changeset/base/253721
Log:
Detect unsupported PREVENT ALLOW MEDIUM REMOVAL and SYNCHRONIZE CACHE(10)
to not spam devices with useless commands and logs with errors.
Modified:
head/sys/cam/scsi/scsi_da.c
Modified: head/sys/cam/scsi/scsi_da.c
==============================================================================
--- head/sys/cam/scsi/scsi_da.c Sat Jul 27 21:31:48 2013 (r253720)
+++ head/sys/cam/scsi/scsi_da.c Sat Jul 27 22:19:34 2013 (r253721)
@@ -535,6 +535,7 @@ static struct da_quirk_entry da_quirk_ta
{T_DIRECT, SIP_MEDIA_REMOVABLE, "TOSHIBA", "TransMemory",
"*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE
},
+#if 0
{
/*
* PNY USB Flash keys
@@ -543,6 +544,7 @@ static struct da_quirk_entry da_quirk_ta
{T_DIRECT, SIP_MEDIA_REMOVABLE, "*" , "USB DISK*",
"*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE
},
+#endif
{
/*
* Genesys 6-in-1 Card Reader
@@ -2786,6 +2788,28 @@ cmd6workaround(union ccb *ccb)
return (0);
}
+ /* Detect unsupported PREVENT ALLOW MEDIUM REMOVAL. */
+ if ((ccb->ccb_h.flags & CAM_CDB_POINTER) == 0 &&
+ (*cdb == PREVENT_ALLOW) &&
+ (softc->quirks & DA_Q_NO_PREVENT) == 0) {
+ if (bootverbose)
+ xpt_print(ccb->ccb_h.path,
+ "PREVENT ALLOW MEDIUM REMOVAL not supported.\n");
+ softc->quirks |= DA_Q_NO_PREVENT;
+ return (0);
+ }
+
+ /* Detect unsupported SYNCHRONIZE CACHE(10). */
+ if ((ccb->ccb_h.flags & CAM_CDB_POINTER) == 0 &&
+ (*cdb == SYNCHRONIZE_CACHE) &&
+ (softc->quirks & DA_Q_NO_SYNC_CACHE) == 0) {
+ if (bootverbose)
+ xpt_print(ccb->ccb_h.path,
+ "SYNCHRONIZE CACHE(10) not supported.\n");
+ softc->quirks |= DA_Q_NO_SYNC_CACHE;
+ return (0);
+ }
+
/* Translation only possible if CDB is an array and cmd is R/W6 */
if ((ccb->ccb_h.flags & CAM_CDB_POINTER) != 0 ||
(*cdb != READ_6 && *cdb != WRITE_6))
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
