From fa4aa1800b9d9f81121841d584522cbf97ccb3ef Mon Sep 17 00:00:00 2001 From: Nicholas Bellinger Date: Wed, 30 May 2012 14:09:10 -0700 Subject: [PATCH] --- yaml --- r: 312655 b: refs/heads/master c: eba2ca450526c1aaf2bfd363dffd63b024e80ea7 h: refs/heads/master i: 312653: bf0179cdd00d4b8a74be606c9663b19de419b917 312651: 3cb6a26b66a4396579eeb793855fd43e021e110d 312647: 2361dd56d9d487eb439c178a48a5a17b28fb778d 312639: 033095617614590a9d500681ba2f60a9cd7835e3 v: v3 --- [refs] | 2 +- trunk/drivers/target/target_core_spc.c | 42 +++++++++++++++++++++++++- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9558f7bb2850..fdedd6214998 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3d6d72014f16967ca92765040be30f022c5952e6 +refs/heads/master: eba2ca450526c1aaf2bfd363dffd63b024e80ea7 diff --git a/trunk/drivers/target/target_core_spc.c b/trunk/drivers/target/target_core_spc.c index 96dcb57089f7..4c861de538c9 100644 --- a/trunk/drivers/target/target_core_spc.c +++ b/trunk/drivers/target/target_core_spc.c @@ -35,6 +35,7 @@ #include #include "target_core_internal.h" +#include "target_core_alua.h" #include "target_core_pr.h" #include "target_core_ua.h" @@ -940,7 +941,8 @@ static int spc_emulate_testunitready(struct se_cmd *cmd) int spc_parse_cdb(struct se_cmd *cmd, unsigned int *size) { - struct se_subsystem_dev *su_dev = cmd->se_dev->se_sub_dev; + struct se_device *dev = cmd->se_dev; + struct se_subsystem_dev *su_dev = dev->se_sub_dev; unsigned char *cdb = cmd->t_task_cdb; switch (cdb[0]) { @@ -1050,6 +1052,44 @@ int spc_parse_cdb(struct se_cmd *cmd, unsigned int *size) cmd->execute_cmd = spc_emulate_testunitready; *size = 0; break; + case MAINTENANCE_IN: + if (dev->transport->get_device_type(dev) != TYPE_ROM) { + /* + * MAINTENANCE_IN from SCC-2 + * Check for emulated MI_REPORT_TARGET_PGS + */ + if ((cdb[1] & 0x1f) == MI_REPORT_TARGET_PGS && + su_dev->t10_alua.alua_type == SPC3_ALUA_EMULATED) { + cmd->execute_cmd = + target_emulate_report_target_port_groups; + } + *size = get_unaligned_be32(&cdb[6]); + } else { + /* + * GPCMD_SEND_KEY from multi media commands + */ + *size = get_unaligned_be16(&cdb[8]); + } + break; + case MAINTENANCE_OUT: + if (dev->transport->get_device_type(dev) != TYPE_ROM) { + /* + * MAINTENANCE_OUT from SCC-2 + * Check for emulated MO_SET_TARGET_PGS. + */ + if (cdb[1] == MO_SET_TARGET_PGS && + su_dev->t10_alua.alua_type == SPC3_ALUA_EMULATED) { + cmd->execute_cmd = + target_emulate_set_target_port_groups; + } + *size = get_unaligned_be32(&cdb[6]); + } else { + /* + * GPCMD_SEND_KEY from multi media commands + */ + *size = get_unaligned_be16(&cdb[8]); + } + break; default: pr_warn("TARGET_CORE[%s]: Unsupported SCSI Opcode" " 0x%02x, sending CHECK_CONDITION.\n",