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 update of the usual drivers: qla2xxx, qedf, smartpqi, hpsa, lpfc, ufs, mpt3sas, ibmvfc and hisi_sas. Plus number of minor changes, spelling fixes and other trivia" * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (298 commits) scsi: qla2xxx: Avoid that lockdep complains about unsafe locking in tcm_qla2xxx_close_session() scsi: qla2xxx: Avoid that qlt_send_resp_ctio() corrupts memory scsi: qla2xxx: Fix hardirq-unsafe locking scsi: qla2xxx: Complain loudly about reference count underflow scsi: qla2xxx: Use __le64 instead of uint32_t[2] for sending DMA addresses to firmware scsi: qla2xxx: Introduce the dsd32 and dsd64 data structures scsi: qla2xxx: Check the size of firmware data structures at compile time scsi: qla2xxx: Pass little-endian values to the firmware scsi: qla2xxx: Fix race conditions in the code for aborting SCSI commands scsi: qla2xxx: Use an on-stack completion in qla24xx_control_vp() scsi: qla2xxx: Make qla24xx_async_abort_cmd() static scsi: qla2xxx: Remove unnecessary locking from the target code scsi: qla2xxx: Remove qla_tgt_cmd.released scsi: qla2xxx: Complain if a command is released that is owned by the firmware scsi: qla2xxx: target: Fix offline port handling and host reset handling scsi: qla2xxx: Fix abort handling in tcm_qla2xxx_write_pending() scsi: qla2xxx: Fix error handling in qlt_alloc_qfull_cmd() scsi: qla2xxx: Simplify qlt_send_term_imm_notif() scsi: qla2xxx: Fix use-after-free issues in qla2xxx_qpair_sp_free_dma() scsi: qla2xxx: Fix a qla24xx_enable_msix() error path ...

Linus Torvalds committed 7 years ago

Commit d1cd7c82 parents b3a5e64 d4023db158 files · +7544 −6432Browse files

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

Unified · Split

include/uapi/scsi/fc/fc_els.h+33−0
@@ -52,6 +52,7 @@ enum fc_els_cmd { · 51 unmodified lines
5252 ELS_RRQ = 0x12, /* reinstate recovery qualifier */
5353 ELS_REC = 0x13, /* read exchange concise */
5454 ELS_SRR = 0x14, /* sequence retransmission request */
55+ ELS_FPIN = 0x16, /* Fabric Performance Impact Notification */
5556 ELS_PRLI = 0x20, /* process login */
5657 ELS_PRLO = 0x21, /* process logout */
5758 ELS_SCN = 0x22, /* state change notification */
@@ -119,6 +120,7 @@ enum fc_els_cmd { · 61 unmodified lines
119120 [ELS_RRQ] = "RRQ", \
120121 [ELS_REC] = "REC", \
121122 [ELS_SRR] = "SRR", \
123+ [ELS_FPIN] = "FPIN", \
122124 [ELS_PRLI] = "PRLI", \
123125 [ELS_PRLO] = "PRLO", \
124126 [ELS_SCN] = "SCN", \
@@ -829,4 +831,35 @@ enum fc_els_clid_ic { · 704 unmodified lines
829831 ELS_CLID_IC_LIP = 8, /* receiving LIP */
830832 };
831833
834+
835+/*
836+ * Fabric Notification Descriptor Tag values
837+ */
838+enum fc_fn_dtag {
839+ ELS_FN_DTAG_LNK_INTEGRITY = 0x00020001, /* Link Integrity */
840+ ELS_FN_DTAG_PEER_CONGEST = 0x00020003, /* Peer Congestion */
841+ ELS_FN_DTAG_CONGESTION = 0x00020004, /* Congestion */
842+};
843+
844+/*
845+ * Fabric Notification Descriptor
846+ */
847+struct fc_fn_desc {
848+ __be32 fn_desc_tag; /* Notification Descriptor Tag */
849+ __be32 fn_desc_value_len; /* Length of Descriptor Value field
850+ * (in bytes)
851+ */
852+ __u8 fn_desc_value[0]; /* Descriptor Value */
853+};
854+
855+/*
856+ * ELS_FPIN - Fabric Performance Impact Notification
857+ */
858+struct fc_els_fpin {
859+ __u8 fpin_cmd; /* command (0x16) */
860+ __u8 fpin_zero[3]; /* specified as zero - part of cmd */
861+ __be32 fpin_desc_cnt; /* count of descriptors */
862+ struct fc_fn_desc fpin_desc[0]; /* Descriptor list */
863+};
864+
832865 #endif /* _FC_ELS_H_ */