History

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull SCSI updates from James Bottomley: "Updates to the usual drivers (ufs, lpfc, qla2xxx, mpi3mr, libsas). The major update (which causes a conflict with block, see below) is Christoph removing the queue limits and their associated block helpers. The remaining patches are assorted minor fixes and deprecated function updates plus a bit of constification" * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (141 commits) scsi: mpi3mr: Sanitise num_phys scsi: lpfc: Copyright updates for 14.4.0.2 patches scsi: lpfc: Update lpfc version to 14.4.0.2 scsi: lpfc: Add support for 32 byte CDBs scsi: lpfc: Change lpfc_hba hba_flag member into a bitmask scsi: lpfc: Introduce rrq_list_lock to protect active_rrq_list scsi: lpfc: Clear deferred RSCN processing flag when driver is unloading scsi: lpfc: Update logging of protection type for T10 DIF I/O scsi: lpfc: Change default logging level for unsolicited CT MIB commands scsi: target: Remove unused list 'device_list' scsi: iscsi: Remove unused list 'connlist_err' scsi: ufs: exynos: Add support for Tensor gs101 SoC scsi: ufs: exynos: Add some pa_dbg_ register offsets into drvdata scsi: ufs: exynos: Allow max frequencies up to 267Mhz scsi: ufs: exynos: Add EXYNOS_UFS_OPT_TIMER_TICK_SELECT option scsi: ufs: exynos: Add EXYNOS_UFS_OPT_UFSPR_SECURE option scsi: ufs: dt-bindings: exynos: Add gs101 compatible scsi: qla2xxx: Fix debugfs output for fw_resource_count scsi: qedf: Ensure the copied buf is NUL terminated scsi: bfa: Ensure the copied buf is NUL terminated ...

Linus Torvalds committed 2 years ago

Commit 113d1dd2 parents b2665fe 3668651154 files · +2168 −2037Browse files

Showing the changes to include/uapi (2 of 154 files). Show all

Unified · Split

2 files
  1. include/uapi/scsi/scsi_bsg_mpi3mr.h +5 −3
  2. include/uapi/scsi/scsi_bsg_ufs.h +3 −1
include/uapi/scsi/scsi_bsg_mpi3mr.h+5−3
@@ -401,7 +401,7 @@ struct mpi3mr_buf_entry { · 400 unmodified lines
401401 __u32 buf_len;
402402 };
403403 /**
404− * struct mpi3mr_bsg_buf_entry_list - list of user buffer
404+ * struct mpi3mr_buf_entry_list - list of user buffer
405405 * descriptor for MPI Passthrough requests.
406406 *
407407 * @num_of_entries: Number of buffer descriptors
@@ -424,6 +424,7 @@ struct mpi3mr_buf_entry_list { · 16 unmodified lines
424424 * @mrioc_id: Controller ID
425425 * @rsvd1: Reserved
426426 * @timeout: MPI request timeout
427+ * @rsvd2: Reserved
427428 * @buf_entry_list: Buffer descriptor list
428429 */
429430 struct mpi3mr_bsg_mptcmd {
@@ -441,8 +442,9 @@ struct mpi3mr_bsg_mptcmd { · 11 unmodified lines
441442 * @cmd_type: represents drvrcmd or mptcmd
442443 * @rsvd1: Reserved
443444 * @rsvd2: Reserved
444− * @drvrcmd: driver request structure
445− * @mptcmd: mpt request structure
445+ * @rsvd3: Reserved
446+ * @cmd.drvrcmd: driver request structure
447+ * @cmd.mptcmd: mpt request structure
446448 */
447449 struct mpi3mr_bsg_packet {
448450 __u8 cmd_type;
include/uapi/scsi/scsi_bsg_ufs.h+3−1
@@ -123,6 +123,7 @@ struct utp_upiu_query { · 122 unmodified lines
123123 * @idn: a value that indicates the particular type of data B-1
124124 * @index: Index to further identify data B-2
125125 * @selector: Index to further identify data B-3
126+ * @osf3: spec field B-4
126127 * @osf4: spec field B-5
127128 * @osf5: spec field B 6,7
128129 * @osf6: spec field DW 8,9
@@ -138,12 +139,13 @@ struct utp_upiu_query_v4_0 { · 9 unmodified lines
138139 __be16 osf5;
139140 __be32 osf6;
140141 __be32 osf7;
142+ /* private: */
141143 __be32 reserved;
142144 };
143145
144146 /**
145147 * struct utp_upiu_cmd - Command UPIU structure
146− * @data_transfer_len: Data Transfer Length DW-3
148+ * @exp_data_transfer_len: Data Transfer Length DW-3
147149 * @cdb: Command Descriptor Block CDB DW-4 to DW-7
148150 */
149151 struct utp_upiu_cmd {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t