Pull in the fixes tree for a commit that missed 6.5. Also resolve a trivial merge conflict in fnic. * 6.5/scsi-fixes: (36 commits) scsi: storvsc: Handle additional SRB status values scsi: snic: Fix double free in snic_tgt_create() scsi: core: raid_class: Remove raid_component_add() scsi: ufs: ufs-qcom: Clear qunipro_g4_sel for HW major version > 5 scsi: ufs: mcq: Fix the search/wrap around logic scsi: qedf: Fix firmware halt over suspend and resume scsi: qedi: Fix firmware halt over suspend and resume scsi: qedi: Fix potential deadlock on &qedi_percpu->p_work_lock scsi: lpfc: Remove reftag check in DIF paths scsi: ufs: renesas: Fix private allocation scsi: snic: Fix possible memory leak if device_add() fails scsi: core: Fix possible memory leak if device_add() fails scsi: core: Fix legacy /proc parsing buffer overflow scsi: 53c700: Check that command slot is not NULL scsi: fnic: Replace return codes in fnic_clean_pending_aborts() scsi: storvsc: Fix handling of virtual Fibre Channel timeouts scsi: pm80xx: Fix error return code in pm8001_pci_probe() scsi: zfcp: Defer fc_rport blocking until after ADISC response scsi: storvsc: Limit max_sectors for virtual Fibre Channel devices scsi: sg: Fix checking return value of blk_get_queue() ...
Showing the changes to include/uapi (1 of 33 files). Show all
Unified · Split
| @@ -116,6 +116,31 @@ struct utp_upiu_query { · 115 unmodified lines | ||
| 116 | 116 | __be32 reserved[2]; |
| 117 | 117 | }; |
| 118 | 118 | |
| 119 | +/** | |
| 120 | + * struct utp_upiu_query_v4_0 - upiu request buffer structure for | |
| 121 | + * query request >= UFS 4.0 spec. | |
| 122 | + * @opcode: command to perform B-0 | |
| 123 | + * @idn: a value that indicates the particular type of data B-1 | |
| 124 | + * @index: Index to further identify data B-2 | |
| 125 | + * @selector: Index to further identify data B-3 | |
| 126 | + * @osf4: spec field B-5 | |
| 127 | + * @osf5: spec field B 6,7 | |
| 128 | + * @osf6: spec field DW 8,9 | |
| 129 | + * @osf7: spec field DW 10,11 | |
| 130 | + */ | |
| 131 | +struct utp_upiu_query_v4_0 { | |
| 132 | + __u8 opcode; | |
| 133 | + __u8 idn; | |
| 134 | + __u8 index; | |
| 135 | + __u8 selector; | |
| 136 | + __u8 osf3; | |
| 137 | + __u8 osf4; | |
| 138 | + __be16 osf5; | |
| 139 | + __be32 osf6; | |
| 140 | + __be32 osf7; | |
| 141 | + __be32 reserved; | |
| 142 | +}; | |
| 143 | + | |
| 119 | 144 | /** |
| 120 | 145 | * struct utp_upiu_cmd - Command UPIU structure |
| 121 | 146 | * @data_transfer_len: Data Transfer Length DW-3 |