svn commit: r310339 - in head/sys/cam: ctl scsi

[Alexander Motin]

Author: mav
Date: Tue Dec 20 21:58:43 2016
New Revision: 310339
URL: https://svnweb.freebsd.org/changeset/base/310339

Log:
  Bump specifications support to SAM-6/SPC-5.

Modified:
  head/sys/cam/ctl/ctl.c
  head/sys/cam/scsi/scsi_all.h

Modified: head/sys/cam/ctl/ctl.c
==============================================================================
--- head/sys/cam/ctl/ctl.c	Tue Dec 20 21:17:07 2016	(r310338)
+++ head/sys/cam/ctl/ctl.c	Tue Dec 20 21:58:43 2016	(r310339)
@@ -10174,7 +10174,7 @@ ctl_inquiry_std(struct ctl_scsiio *ctsio
 		inq_ptr->device = (SID_QUAL_BAD_LU << 5) | T_NODEVICE;
 
 	/* RMB in byte 2 is 0 */
-	inq_ptr->version = SCSI_REV_SPC4;
+	inq_ptr->version = SCSI_REV_SPC5;
 
 	/*
 	 * According to SAM-3, even if a device only supports a single
@@ -10272,10 +10272,10 @@ ctl_inquiry_std(struct ctl_scsiio *ctsio
 		inq_ptr->spi3data = SID_SPI_CLOCK_DT_ST | SID_SPI_QAS |
 				    SID_SPI_IUS;
 
-	/* SAM-5 (no version claimed) */
-	scsi_ulto2b(0x00A0, inq_ptr->version1);
-	/* SPC-4 (no version claimed) */
-	scsi_ulto2b(0x0460, inq_ptr->version2);
+	/* SAM-6 (no version claimed) */
+	scsi_ulto2b(0x00C0, inq_ptr->version1);
+	/* SPC-5 (no version claimed) */
+	scsi_ulto2b(0x05C0, inq_ptr->version2);
 	if (port_type == CTL_PORT_FC) {
 		/* FCP-2 ANSI INCITS.350:2003 */
 		scsi_ulto2b(0x0917, inq_ptr->version3);

Modified: head/sys/cam/scsi/scsi_all.h
==============================================================================
--- head/sys/cam/scsi/scsi_all.h	Tue Dec 20 21:17:07 2016	(r310338)
+++ head/sys/cam/scsi/scsi_all.h	Tue Dec 20 21:58:43 2016	(r310339)
@@ -2156,6 +2156,7 @@ struct scsi_inquiry_data
 #define		SCSI_REV_SPC2		4
 #define		SCSI_REV_SPC3		5
 #define		SCSI_REV_SPC4		6
+#define		SCSI_REV_SPC5		7
 
 #define	SID_ECMA	0x38
 #define	SID_ISO		0xC0