History

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

Pull SCSI updates from James Bottomley: "This update includes the usual round of major driver updates (hpsa, be2iscsi, hisi_sas, zfcp, cxlflash). There's a new incarnation of hpsa called smartpqi for which a driver is added, there's some cleanup work of the ibm vscsi target and updates to libfc, plus a whole host of minor fixes and updates and finally the removal of several ISA drivers which seem not to have been used for years" * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (173 commits) scsi: mvsas: Mark symbols static where possible scsi: pm8001: Mark symbols static where possible scsi: arcmsr: Simplify user_len checking scsi: fcoe: fix off by one in eth2fc_speed() scsi: dtc: remove from tree scsi: t128: remove from tree scsi: pas16: remove from tree scsi: u14-34f: remove from tree scsi: ultrastor: remove from tree scsi: in2000: remove from tree scsi: wd7000: remove from tree scsi: scsi_dh_alua: Fix memory leak in alua_rtpg() scsi: lpfc: Mark symbols static where possible scsi: hpsa: correct call to hpsa_do_reset scsi: ufs: Get a TM service response from the correct offset scsi: ibmvfc: Fix I/O hang when port is not mapped scsi: megaraid_sas: clean function declarations in megaraid_sas_base.c up scsi: ipr: Remove redundant messages at adapter init time scsi: ipr: Don't log unnecessary 9084 error details scsi: smartpqi: raid bypass lba calculation fix ...

Linus Torvalds committed 10 years ago

Commit 4dfddf52 parents d4e6547 14bf41d117 files · +12923 −13623Browse files

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

Unified · Split

include/uapi/scsi/cxlflash_ioctl.h+14−5
@@ -39,19 +39,28 @@ struct dk_cxlflash_hdr { · 38 unmodified lines
3939 * at this time, this provides future flexibility.
4040 */
4141 #define DK_CXLFLASH_ALL_PORTS_ACTIVE 0x0000000000000001ULL
42+#define DK_CXLFLASH_APP_CLOSE_ADAP_FD 0x0000000000000002ULL
4243
4344 /*
44− * Notes:
45− * -----
45+ * General Notes:
46+ * -------------
4647 * The 'context_id' field of all ioctl structures contains the context
4748 * identifier for a context in the lower 32-bits (upper 32-bits are not
4849 * to be used when identifying a context to the AFU). That said, the value
4950 * in its entirety (all 64-bits) is to be treated as an opaque cookie and
5051 * should be presented as such when issuing ioctls.
52+ */
53+
54+/*
55+ * DK_CXLFLASH_ATTACH Notes:
56+ * ------------------------
57+ * Read/write access permissions are specified via the O_RDONLY, O_WRONLY,
58+ * and O_RDWR flags defined in the fcntl.h header file.
5159 *
52− * For DK_CXLFLASH_ATTACH ioctl, user specifies read/write access
53− * permissions via the O_RDONLY, O_WRONLY, and O_RDWR flags defined in
54− * the fcntl.h header file.
60+ * A valid adapter file descriptor (fd >= 0) is only returned on the initial
61+ * attach (successful) of a context. When a context is shared(reused), the user
62+ * is expected to already 'know' the adapter file descriptor associated with the
63+ * context.
5564 */
5665 #define DK_CXLFLASH_ATTACH_REUSE_CONTEXT 0x8000000000000000ULL
5766