2 files changed, 5 insertions, 4 deletions

diff --git a/drivers/target/target_core_alua.c b/drivers/target/target_core_alua.c
index c39ae7cd9895..be7251ee8b3a 100644
--- a/drivers/target/target_core_alua.c
+++ b/drivers/target/target_core_alua.c
@@ -387,7 +387,7 @@ static inline int core_alua_state_standby(
         case RECEIVE_DIAGNOSTIC:
         case SEND_DIAGNOSTIC:
         case MAINTENANCE_IN:
-                switch (cdb[1]) {
+                switch (cdb[1] & 0x1f) {
                 case MI_REPORT_TARGET_PGS:
                         return 0;
                 default:
@@ -429,7 +429,7 @@ static inline int core_alua_state_unavailable(
         case INQUIRY:
         case REPORT_LUNS:
         case MAINTENANCE_IN:
-                switch (cdb[1]) {
+                switch (cdb[1] & 0x1f) {
                 case MI_REPORT_TARGET_PGS:
                         return 0;
                 default:
@@ -469,7 +469,7 @@ static inline int core_alua_state_transition(
         case INQUIRY:
         case REPORT_LUNS:
         case MAINTENANCE_IN:
-                switch (cdb[1]) {
+                switch (cdb[1] & 0x1f) {
                 case MI_REPORT_TARGET_PGS:
                         return 0;
                 default:
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index 2a34d0e4c24c..f95a74da4d40 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -1329,6 +1329,7 @@ static inline void transport_generic_prepare_cdb(
         case VERIFY_16: /* SBC - VRProtect */
         case WRITE_VERIFY: /* SBC - VRProtect */
         case WRITE_VERIFY_12: /* SBC - VRProtect */
+        case MAINTENANCE_IN: /* SPC - Parameter Data Format for SA RTPG */
                 break;
         default:
                 cdb[1] &= 0x1f; /* clear logical unit number */
@@ -2597,7 +2598,7 @@ static int transport_generic_cmd_sequencer(
                         /*
                          * Check for emulated MI_REPORT_TARGET_PGS.
                          */
-                        if (cdb[1] == 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;