Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85686f69 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Christoph Hellwig
Browse files

scsi: add SPC-3 command definitions 



SPC-3 defines SERVICE ACTION IN(12), SERVICE_ACTION OUT(12),
SERVICE ACTION OUT(16), and SERVICE ACTION BIDIRECTIONAL.
And READ MEDIA SERIAL NUMBER has long since been deprecated.
So update callers to refer to the new cdb name.

Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Tested-by: default avatarRobert Elliott <elliott@hp.com>
Reviewed-by: default avatarRobert Elliott <elliott@hp.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent eb846d9f

drivers/scsi/constants.c

+0 −4
Original line number Diff line number Diff line
@@ -21,10 +21,6 @@ 




/* Commands with service actions that change the command name */

#define SERVICE_ACTION_IN_12 0xab

#define SERVICE_ACTION_OUT_12 0xa9

#define SERVICE_ACTION_BIDIRECTIONAL 0x9d

#define SERVICE_ACTION_OUT_16 0x9f

#define THIRD_PARTY_COPY_OUT 0x83

#define THIRD_PARTY_COPY_IN 0x84

drivers/target/target_core_pr.c

+1 −1
Original line number Diff line number Diff line
@@ -459,7 +459,7 @@ static int core_scsi3_pr_seq_non_holder( 
	case ACCESS_CONTROL_OUT:

	case INQUIRY:

	case LOG_SENSE:

	case READ_MEDIA_SERIAL_NUMBER:

	case SERVICE_ACTION_IN_12:

	case REPORT_LUNS:

	case REQUEST_SENSE:

	case PERSISTENT_RESERVE_IN:

include/scsi/scsi.h

+7 −3
Original line number Diff line number Diff line
@@ -128,8 +128,10 @@ enum scsi_timeouts { 
#define MOVE_MEDIUM           0xa5

#define EXCHANGE_MEDIUM       0xa6

#define READ_12               0xa8

#define SERVICE_ACTION_OUT_12 0xa9

#define WRITE_12              0xaa

#define READ_MEDIA_SERIAL_NUMBER 0xab

#define READ_MEDIA_SERIAL_NUMBER 0xab /* Obsolete with SPC-2 */

#define SERVICE_ACTION_IN_12  0xab

#define WRITE_VERIFY_12       0xae

#define VERIFY_12	      0xaf

#define SEARCH_HIGH_12        0xb0
@@ -151,7 +153,9 @@ enum scsi_timeouts { 
#define VERIFY_16	      0x8f

#define SYNCHRONIZE_CACHE_16  0x91

#define WRITE_SAME_16	      0x93

#define SERVICE_ACTION_BIDIRECTIONAL 0x9d

#define SERVICE_ACTION_IN_16  0x9e

#define SERVICE_ACTION_OUT_16 0x9f

/* values for service action in */

#define	SAI_READ_CAPACITY_16  0x10

#define SAI_GET_LBA_STATUS    0x12

tools/lib/traceevent/plugin_scsi.c

+4 −1
Original line number Diff line number Diff line
@@ -85,8 +85,9 @@ typedef unsigned int u32; 
#define MOVE_MEDIUM			0xa5

#define EXCHANGE_MEDIUM			0xa6

#define READ_12				0xa8

#define SERVICE_ACTION_OUT_12		0xa9

#define WRITE_12			0xaa

#define READ_MEDIA_SERIAL_NUMBER	0xab

#define SERVICE_ACTION_IN_12		0xab

#define WRITE_VERIFY_12			0xae

#define VERIFY_12			0xaf

#define SEARCH_HIGH_12			0xb0
@@ -107,7 +108,9 @@ typedef unsigned int u32; 
#define VERIFY_16			0x8f

#define SYNCHRONIZE_CACHE_16		0x91

#define WRITE_SAME_16			0x93

#define SERVICE_ACTION_BIDIRECTIONAL	0x9d

#define SERVICE_ACTION_IN_16		0x9e

#define SERVICE_ACTION_OUT_16		0x9f

/* values for service action in */

#define	SAI_READ_CAPACITY_16		0x10

#define SAI_GET_LBA_STATUS		0x12