Pull SCSI updates from James Bottomley: "This consists of the usual driver updates (ufs, qla2xxx, tcmu, lpfc, hpsa, zfcp, scsi_debug) and minor bug fixes. We also have a huge docbook fix update like most other subsystems and no major update to the core (the few non trivial updates are either minor fixes or removing an unused feature [scsi_sdb_cache])" * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (307 commits) scsi: scsi_transport_srp: Sanitize scsi_target_block/unblock sequences scsi: ufs-mediatek: Apply DELAY_AFTER_LPM quirk to Micron devices scsi: ufs: Introduce device quirk "DELAY_AFTER_LPM" scsi: virtio-scsi: Correctly handle the case where all LUNs are unplugged scsi: scsi_debug: Implement tur_ms_to_ready parameter scsi: scsi_debug: Fix request sense scsi: lpfc: Fix typo in comment for ULP scsi: ufs-mediatek: Prevent LPM operation on undeclared VCC scsi: iscsi: Do not put host in iscsi_set_flashnode_param() scsi: hpsa: Correct ctrl queue depth scsi: target: tcmu: Make TMR notification optional scsi: target: tcmu: Implement tmr_notify callback scsi: target: tcmu: Fix and simplify timeout handling scsi: target: tcmu: Factor out new helper ring_insert_padding scsi: target: tcmu: Do not queue aborted commands scsi: target: tcmu: Use priv pointer in se_cmd scsi: target: Add tmr_notify backend function scsi: target: Modify core_tmr_abort_task() scsi: target: iscsi: Fix inconsistent debug message scsi: target: iscsi: Fix login error when receiving ...
Showing the changes to include/uapi (2 of 221 files). Show all
Unified · Split
| @@ -45,6 +45,7 @@ · 44 unmodified lines | |||
| 45 | #define ALIGN_SIZE 64 /* Should be enough for most CPUs */ | 45 | #define ALIGN_SIZE 64 /* Should be enough for most CPUs */ |
| 46 | #define TCMU_MAILBOX_FLAG_CAP_OOOC (1 << 0) /* Out-of-order completions */ | 46 | #define TCMU_MAILBOX_FLAG_CAP_OOOC (1 << 0) /* Out-of-order completions */ |
| 47 | #define TCMU_MAILBOX_FLAG_CAP_READ_LEN (1 << 1) /* Read data length */ | 47 | #define TCMU_MAILBOX_FLAG_CAP_READ_LEN (1 << 1) /* Read data length */ |
| 48 | #define TCMU_MAILBOX_FLAG_CAP_TMR (1 << 2) /* TMR notifications */ | ||
| 48 | 49 | ||
| 49 | struct tcmu_mailbox { | 50 | struct tcmu_mailbox { |
| 50 | __u16 version; | 51 | __u16 version; |
| @@ -62,6 +63,7 @@ struct tcmu_mailbox { · 11 unmodified lines | |||
| 62 | enum tcmu_opcode { | 63 | enum tcmu_opcode { |
| 63 | TCMU_OP_PAD = 0, | 64 | TCMU_OP_PAD = 0, |
| 64 | TCMU_OP_CMD, | 65 | TCMU_OP_CMD, |
| 66 | TCMU_OP_TMR, | ||
| 65 | }; | 67 | }; |
| 66 | 68 | ||
| 67 | /* | 69 | /* |
| @@ -128,6 +130,29 @@ struct tcmu_cmd_entry { · 60 unmodified lines | |||
| 128 | 130 | ||
| 129 | } __packed; | 131 | } __packed; |
| 130 | 132 | ||
| 133 | struct tcmu_tmr_entry { | ||
| 134 | struct tcmu_cmd_entry_hdr hdr; | ||
| 135 | |||
| 136 | #define TCMU_TMR_UNKNOWN 0 | ||
| 137 | #define TCMU_TMR_ABORT_TASK 1 | ||
| 138 | #define TCMU_TMR_ABORT_TASK_SET 2 | ||
| 139 | #define TCMU_TMR_CLEAR_ACA 3 | ||
| 140 | #define TCMU_TMR_CLEAR_TASK_SET 4 | ||
| 141 | #define TCMU_TMR_LUN_RESET 5 | ||
| 142 | #define TCMU_TMR_TARGET_WARM_RESET 6 | ||
| 143 | #define TCMU_TMR_TARGET_COLD_RESET 7 | ||
| 144 | /* Pseudo reset due to received PR OUT */ | ||
| 145 | #define TCMU_TMR_LUN_RESET_PRO 128 | ||
| 146 | __u8 tmr_type; | ||
| 147 | |||
| 148 | __u8 __pad1; | ||
| 149 | __u16 __pad2; | ||
| 150 | __u32 cmd_cnt; | ||
| 151 | __u64 __pad3; | ||
| 152 | __u64 __pad4; | ||
| 153 | __u16 cmd_ids[0]; | ||
| 154 | } __packed; | ||
| 155 | |||
| 131 | #define TCMU_OP_ALIGN_SIZE sizeof(__u64) | 156 | #define TCMU_OP_ALIGN_SIZE sizeof(__u64) |
| 132 | 157 | ||
| 133 | enum tcmu_genl_cmd { | 158 | enum tcmu_genl_cmd { |
| @@ -41,6 +41,7 @@ enum fc_els_cmd { · 40 unmodified lines | |||
| 41 | ELS_REC = 0x13, /* read exchange concise */ | 41 | ELS_REC = 0x13, /* read exchange concise */ |
| 42 | ELS_SRR = 0x14, /* sequence retransmission request */ | 42 | ELS_SRR = 0x14, /* sequence retransmission request */ |
| 43 | ELS_FPIN = 0x16, /* Fabric Performance Impact Notification */ | 43 | ELS_FPIN = 0x16, /* Fabric Performance Impact Notification */ |
| 44 | ELS_RDP = 0x18, /* Read Diagnostic Parameters */ | ||
| 44 | ELS_RDF = 0x19, /* Register Diagnostic Functions */ | 45 | ELS_RDF = 0x19, /* Register Diagnostic Functions */ |
| 45 | ELS_PRLI = 0x20, /* process login */ | 46 | ELS_PRLI = 0x20, /* process login */ |
| 46 | ELS_PRLO = 0x21, /* process logout */ | 47 | ELS_PRLO = 0x21, /* process logout */ |
| @@ -110,6 +111,7 @@ enum fc_els_cmd { · 63 unmodified lines | |||
| 110 | [ELS_REC] = "REC", \ | 111 | [ELS_REC] = "REC", \ |
| 111 | [ELS_SRR] = "SRR", \ | 112 | [ELS_SRR] = "SRR", \ |
| 112 | [ELS_FPIN] = "FPIN", \ | 113 | [ELS_FPIN] = "FPIN", \ |
| 114 | [ELS_RDP] = "RDP", \ | ||
| 113 | [ELS_RDF] = "RDF", \ | 115 | [ELS_RDF] = "RDF", \ |
| 114 | [ELS_PRLI] = "PRLI", \ | 116 | [ELS_PRLI] = "PRLI", \ |
| 115 | [ELS_PRLO] = "PRLO", \ | 117 | [ELS_PRLO] = "PRLO", \ |