History

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

Pull SCSI updates from James Bottomley: "This is mostly updates to the usual drivers: ufs, qedf, mpt3sas, lpfc, xfcp, hisi_sas, cxlflash, qla2xxx. In the absence of Nic, we're also taking target updates which are mostly minor except for the tcmu refactor. The only real core change to worry about is the removal of high page bouncing (in sas, storvsc and iscsi). This has been well tested and no problems have shown up so far" * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (268 commits) scsi: lpfc: update driver version to 12.0.0.4 scsi: lpfc: Fix port initialization failure. scsi: lpfc: Fix 16gb hbas failing cq create. scsi: lpfc: Fix crash in blk_mq layer when executing modprobe -r lpfc scsi: lpfc: correct oversubscription of nvme io requests for an adapter scsi: lpfc: Fix MDS diagnostics failure (Rx < Tx) scsi: hisi_sas: Mark PHY as in reset for nexus reset scsi: hisi_sas: Fix return value when get_free_slot() failed scsi: hisi_sas: Terminate STP reject quickly for v2 hw scsi: hisi_sas: Add v2 hw force PHY function for internal ATA command scsi: hisi_sas: Include TMF elements in struct hisi_sas_slot scsi: hisi_sas: Try wait commands before before controller reset scsi: hisi_sas: Init disks after controller reset scsi: hisi_sas: Create a scsi_host_template per HW module scsi: hisi_sas: Reset disks when discovered scsi: hisi_sas: Add LED feature for v3 hw scsi: hisi_sas: Change common allocation mode of device id scsi: hisi_sas: change slot index allocation mode scsi: hisi_sas: Introduce hisi_sas_phy_set_linkrate() scsi: hisi_sas: fix a typo in hisi_sas_task_prep() ...

Linus Torvalds committed 8 years ago

Commit 5f859422 parents 0c14e43 1b5c2cb152 files · +7234 −2017Browse files

Showing the changes to include/uapi/linux (1 of 152 files). Show all

Unified · Split

include/uapi/linux/target_core_user.h+6−5
@@ -9,21 +9,22 @@ · 8 unmodified lines
9 9
10#define TCMU_VERSION "2.0"10#define TCMU_VERSION "2.0"
11 11
12/*12/**
13 * DOC: Ring Design
13 * Ring Design14 * Ring Design
14 * -----------15 * -----------
15 *16 *
16 * The mmaped area is divided into three parts:17 * The mmaped area is divided into three parts:
17 * 1) The mailbox (struct tcmu_mailbox, below)18 * 1) The mailbox (struct tcmu_mailbox, below);
18 * 2) The command ring19 * 2) The command ring;
19 * 3) Everything beyond the command ring (data)20 * 3) Everything beyond the command ring (data).
20 *21 *
21 * The mailbox tells userspace the offset of the command ring from the22 * The mailbox tells userspace the offset of the command ring from the
22 * start of the shared memory region, and how big the command ring is.23 * start of the shared memory region, and how big the command ring is.
23 *24 *
24 * The kernel passes SCSI commands to userspace by putting a struct25 * The kernel passes SCSI commands to userspace by putting a struct
25 * tcmu_cmd_entry in the ring, updating mailbox->cmd_head, and poking26 * tcmu_cmd_entry in the ring, updating mailbox->cmd_head, and poking
26 * userspace via uio's interrupt mechanism.27 * userspace via UIO's interrupt mechanism.
27 *28 *
28 * tcmu_cmd_entry contains a header. If the header type is PAD,29 * tcmu_cmd_entry contains a header. If the header type is PAD,
29 * userspace should skip hdr->length bytes (mod cmdr_size) to find the30 * userspace should skip hdr->length bytes (mod cmdr_size) to find the