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 (ncr5380,
  ufs, lpfc, be2iscsi, hisi_sas, storvsc, cxlflash, aacraid,
  megaraid_sas, ...).

  There's also an assortment of minor fixes and the major update of
  switching a bunch of drivers to pci_alloc_irq_vectors from Christoph"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (188 commits)
  scsi: megaraid_sas: handle dma_addr_t right on 32-bit
  scsi: megaraid_sas: array overflow in megasas_dump_frame()
  scsi: snic: switch to pci_irq_alloc_vectors
  scsi: megaraid_sas: driver version upgrade
  scsi: megaraid_sas: Change RAID_1_10_RMW_CMDS to RAID_1_PEER_CMDS and set value to 2
  scsi: megaraid_sas: Indentation and smatch warning fixes
  scsi: megaraid_sas: Cleanup VD_EXT_DEBUG and SPAN_DEBUG related debug prints
  scsi: megaraid_sas: Increase internal command pool
  scsi: megaraid_sas: Use synchronize_irq to wait for IRQs to complete
  scsi: megaraid_sas: Bail out the driver load if ld_list_query fails
  scsi: megaraid_sas: Change build_mpt_mfi_pass_thru to return void
  scsi: megaraid_sas: During OCR, if get_ctrl_info fails do not continue with OCR
  scsi: megaraid_sas: Do not set fp_possible if TM capable for non-RW syspdIO, change fp_possible to bool
  scsi: megaraid_sas: Remove unused pd_index from megasas_build_ld_nonrw_fusion
  scsi: megaraid_sas: megasas_return_cmd does not memset IO frame to zero
  scsi: megaraid_sas: max_fw_cmds are decremented twice, remove duplicate
  scsi: megaraid_sas: update can_queue only if the new value is less
  scsi: megaraid_sas: Change max_cmd from u32 to u16 in all functions
  scsi: megaraid_sas: set pd_after_lb from MR_BuildRaidContext and initialize pDevHandle to MR_DEVHANDLE_INVALID
  scsi: megaraid_sas: latest controller OCR capability from FW before sending shutdown DCMD
  ...

8 files changed, 269 insertions, 40 deletions

diff --git a/include/linux/libata.h b/include/linux/libata.h
index c170be548b7f..46e18c0619c6 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -1130,6 +1130,7 @@ extern int ata_sas_port_start(struct ata_port *ap);
 extern void ata_sas_port_stop(struct ata_port *ap);
 extern int ata_sas_slave_configure(struct scsi_device *, struct ata_port *);
 extern int ata_sas_queuecmd(struct scsi_cmnd *cmd, struct ata_port *ap);
+extern enum blk_eh_timer_return ata_scsi_timed_out(struct scsi_cmnd *cmd);
 extern int sata_scr_valid(struct ata_link *link);
 extern int sata_scr_read(struct ata_link *link, int reg, u32 *val);
 extern int sata_scr_write(struct ata_link *link, int reg, u32 val);
@@ -1355,6 +1356,7 @@ extern struct device_attribute *ata_common_sdev_attrs[];
         .proc_name              = drv_name,                     \
         .slave_configure        = ata_scsi_slave_config,        \
         .slave_destroy          = ata_scsi_slave_destroy,       \
+        .eh_timed_out           = ata_scsi_timed_out,           \
         .bios_param             = ata_std_bios_param,           \
         .unlock_native_capacity = ata_scsi_unlock_native_capacity, \
         .sdev_attrs             = ata_common_sdev_attrs
diff --git a/include/scsi/libiscsi.h b/include/scsi/libiscsi.h
index 4d1c46aac331..b0e275de6dec 100644
--- a/include/scsi/libiscsi.h
+++ b/include/scsi/libiscsi.h
@@ -383,6 +383,7 @@ extern int iscsi_eh_recover_target(struct scsi_cmnd *sc);
 extern int iscsi_eh_session_reset(struct scsi_cmnd *sc);
 extern int iscsi_eh_device_reset(struct scsi_cmnd *sc);
 extern int iscsi_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *sc);
+extern enum blk_eh_timer_return iscsi_eh_cmd_timed_out(struct scsi_cmnd *sc);
 
 /*
  * iSCSI host helpers.
diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
index 8ec7c30e35af..a1e1930b7a87 100644
--- a/include/scsi/scsi.h
+++ b/include/scsi/scsi.h
@@ -29,16 +29,6 @@ enum scsi_timeouts {
  */
 #define SCAN_WILD_CARD  ~0
 
-#ifdef CONFIG_ACPI
-struct acpi_bus_type;
-
-extern int
-scsi_register_acpi_bus_type(struct acpi_bus_type *bus);
-
-extern void
-scsi_unregister_acpi_bus_type(struct acpi_bus_type *bus);
-#endif
-
 /** scsi_status_is_good - check the status return.
  *
  * @status: the status passed up from the driver (including host and
diff --git a/include/scsi/scsi_transport.h b/include/scsi/scsi_transport.h
index b6e07b56d013..a3dcb1bfb362 100644
--- a/include/scsi/scsi_transport.h
+++ b/include/scsi/scsi_transport.h
@@ -56,29 +56,6 @@ struct scsi_transport_template {
          * Allows a transport to override the default error handler.
          */
         void (* eh_strategy_handler)(struct Scsi_Host *);
-
-        /*
-         * This is an optional routine that allows the transport to become
-         * involved when a scsi io timer fires. The return value tells the
-         * timer routine how to finish the io timeout handling:
-         * EH_HANDLED:          I fixed the error, please complete the command
-         * EH_RESET_TIMER:      I need more time, reset the timer and
-         *                      begin counting again
-         * EH_NOT_HANDLED       Begin normal error recovery
-         */
-        enum blk_eh_timer_return (*eh_timed_out)(struct scsi_cmnd *);
-
-        /*
-         * Used as callback for the completion of i_t_nexus request
-         * for target drivers.
-         */
-        int (* it_nexus_response)(struct Scsi_Host *, u64, int);
-
-        /*
-         * Used as callback for the completion of task management
-         * request for target drivers.
-         */
-        int (* tsk_mgmt_response)(struct Scsi_Host *, u64, u64, int);
 };
 
 #define transport_class_to_shost(tc) \
diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
index 924c8e614b45..b21b8aa58c4d 100644
--- a/include/scsi/scsi_transport_fc.h
+++ b/include/scsi/scsi_transport_fc.h
@@ -808,6 +808,7 @@ struct fc_vport *fc_vport_create(struct Scsi_Host *shost, int channel,
                 struct fc_vport_identifiers *);
 int fc_vport_terminate(struct fc_vport *vport);
 int fc_block_scsi_eh(struct scsi_cmnd *cmnd);
+enum blk_eh_timer_return fc_eh_timed_out(struct scsi_cmnd *scmd);
 
 static inline struct Scsi_Host *fc_bsg_to_shost(struct bsg_job *job)
 {
diff --git a/include/scsi/scsi_transport_srp.h b/include/scsi/scsi_transport_srp.h
index d40d3ef25707..dd096330734e 100644
--- a/include/scsi/scsi_transport_srp.h
+++ b/include/scsi/scsi_transport_srp.h
@@ -88,10 +88,6 @@ struct srp_rport {
  * @terminate_rport_io: Callback function for terminating all outstanding I/O
  *     requests for an rport.
  * @rport_delete: Callback function that deletes an rport.
- *
- * Fields that are only relevant for SRP target drivers:
- * @tsk_mgmt_response: Callback function for sending a task management response.
- * @it_nexus_response: Callback function for processing an IT nexus response.
  */
 struct srp_function_template {
         /* for initiator drivers */
@@ -103,9 +99,6 @@ struct srp_function_template {
         int (*reconnect)(struct srp_rport *rport);
         void (*terminate_rport_io)(struct srp_rport *rport);
         void (*rport_delete)(struct srp_rport *rport);
-        /* for target drivers */
-        int (* tsk_mgmt_response)(struct Scsi_Host *, u64, u64, int);
-        int (* it_nexus_response)(struct Scsi_Host *, u64, int);
 };
 
 extern struct scsi_transport_template *
@@ -124,6 +117,7 @@ extern int srp_reconnect_rport(struct srp_rport *rport);
 extern void srp_start_tl_fail_timers(struct srp_rport *rport);
 extern void srp_remove_host(struct Scsi_Host *);
 extern void srp_stop_rport_timers(struct srp_rport *rport);
+enum blk_eh_timer_return srp_timed_out(struct scsi_cmnd *scmd);
 
 /**
  * srp_chkready() - evaluate the transport layer state before I/O
diff --git a/include/trace/events/ufs.h b/include/trace/events/ufs.h
new file mode 100644
index 000000000000..bf6f82673492
--- /dev/null
+++ b/include/trace/events/ufs.h
@@ -0,0 +1,263 @@
+/*
+ * Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM ufs
+
+#if !defined(_TRACE_UFS_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_UFS_H
+
+#include <linux/tracepoint.h>
+
+#define UFS_LINK_STATES                 \
+        EM(UIC_LINK_OFF_STATE)          \
+        EM(UIC_LINK_ACTIVE_STATE)       \
+        EMe(UIC_LINK_HIBERN8_STATE)
+
+#define UFS_PWR_MODES                   \
+        EM(UFS_ACTIVE_PWR_MODE)         \
+        EM(UFS_SLEEP_PWR_MODE)          \
+        EMe(UFS_POWERDOWN_PWR_MODE)
+
+#define UFSCHD_CLK_GATING_STATES        \
+        EM(CLKS_OFF)                    \
+        EM(CLKS_ON)                     \
+        EM(REQ_CLKS_OFF)                \
+        EMe(REQ_CLKS_ON)
+
+/* Enums require being exported to userspace, for user tool parsing */
+#undef EM
+#undef EMe
+#define EM(a)   TRACE_DEFINE_ENUM(a);
+#define EMe(a)  TRACE_DEFINE_ENUM(a);
+
+UFS_LINK_STATES;
+UFS_PWR_MODES;
+UFSCHD_CLK_GATING_STATES;
+
+/*
+ * Now redefine the EM() and EMe() macros to map the enums to the strings
+ * that will be printed in the output.
+ */
+#undef EM
+#undef EMe
+#define EM(a)   { a, #a },
+#define EMe(a)  { a, #a }
+
+TRACE_EVENT(ufshcd_clk_gating,
+
+        TP_PROTO(const char *dev_name, int state),
+
+        TP_ARGS(dev_name, state),
+
+        TP_STRUCT__entry(
+                __string(dev_name, dev_name)
+                __field(int, state)
+        ),
+
+        TP_fast_assign(
+                __assign_str(dev_name, dev_name);
+                __entry->state = state;
+        ),
+
+        TP_printk("%s: gating state changed to %s",
+                __get_str(dev_name),
+                __print_symbolic(__entry->state, UFSCHD_CLK_GATING_STATES))
+);
+
+TRACE_EVENT(ufshcd_clk_scaling,
+
+        TP_PROTO(const char *dev_name, const char *state, const char *clk,
+                u32 prev_state, u32 curr_state),
+
+        TP_ARGS(dev_name, state, clk, prev_state, curr_state),
+
+        TP_STRUCT__entry(
+                __string(dev_name, dev_name)
+                __string(state, state)
+                __string(clk, clk)
+                __field(u32, prev_state)
+                __field(u32, curr_state)
+        ),
+
+        TP_fast_assign(
+                __assign_str(dev_name, dev_name);
+                __assign_str(state, state);
+                __assign_str(clk, clk);
+                __entry->prev_state = prev_state;
+                __entry->curr_state = curr_state;
+        ),
+
+        TP_printk("%s: %s %s from %u to %u Hz",
+                __get_str(dev_name), __get_str(state), __get_str(clk),
+                __entry->prev_state, __entry->curr_state)
+);
+
+TRACE_EVENT(ufshcd_auto_bkops_state,
+
+        TP_PROTO(const char *dev_name, const char *state),
+
+        TP_ARGS(dev_name, state),
+
+        TP_STRUCT__entry(
+                __string(dev_name, dev_name)
+                __string(state, state)
+        ),
+
+        TP_fast_assign(
+                __assign_str(dev_name, dev_name);
+                __assign_str(state, state);
+        ),
+
+        TP_printk("%s: auto bkops - %s",
+                __get_str(dev_name), __get_str(state))
+);
+
+DECLARE_EVENT_CLASS(ufshcd_profiling_template,
+        TP_PROTO(const char *dev_name, const char *profile_info, s64 time_us,
+                 int err),
+
+        TP_ARGS(dev_name, profile_info, time_us, err),
+
+        TP_STRUCT__entry(
+                __string(dev_name, dev_name)
+                __string(profile_info, profile_info)
+                __field(s64, time_us)
+                __field(int, err)
+        ),
+
+        TP_fast_assign(
+                __assign_str(dev_name, dev_name);
+                __assign_str(profile_info, profile_info);
+                __entry->time_us = time_us;
+                __entry->err = err;
+        ),
+
+        TP_printk("%s: %s: took %lld usecs, err %d",
+                __get_str(dev_name), __get_str(profile_info),
+                __entry->time_us, __entry->err)
+);
+
+DEFINE_EVENT(ufshcd_profiling_template, ufshcd_profile_hibern8,
+        TP_PROTO(const char *dev_name, const char *profile_info, s64 time_us,
+                 int err),
+        TP_ARGS(dev_name, profile_info, time_us, err));
+
+DEFINE_EVENT(ufshcd_profiling_template, ufshcd_profile_clk_gating,
+        TP_PROTO(const char *dev_name, const char *profile_info, s64 time_us,
+                 int err),
+        TP_ARGS(dev_name, profile_info, time_us, err));
+
+DEFINE_EVENT(ufshcd_profiling_template, ufshcd_profile_clk_scaling,
+        TP_PROTO(const char *dev_name, const char *profile_info, s64 time_us,
+                 int err),
+        TP_ARGS(dev_name, profile_info, time_us, err));
+
+DECLARE_EVENT_CLASS(ufshcd_template,
+        TP_PROTO(const char *dev_name, int err, s64 usecs,
+                 int dev_state, int link_state),
+
+        TP_ARGS(dev_name, err, usecs, dev_state, link_state),
+
+        TP_STRUCT__entry(
+                __field(s64, usecs)
+                __field(int, err)
+                __string(dev_name, dev_name)
+                __field(int, dev_state)
+                __field(int, link_state)
+        ),
+
+        TP_fast_assign(
+                __entry->usecs = usecs;
+                __entry->err = err;
+                __assign_str(dev_name, dev_name);
+                __entry->dev_state = dev_state;
+                __entry->link_state = link_state;
+        ),
+
+        TP_printk(
+                "%s: took %lld usecs, dev_state: %s, link_state: %s, err %d",
+                __get_str(dev_name),
+                __entry->usecs,
+                __print_symbolic(__entry->dev_state, UFS_PWR_MODES),
+                __print_symbolic(__entry->link_state, UFS_LINK_STATES),
+                __entry->err
+        )
+);
+
+DEFINE_EVENT(ufshcd_template, ufshcd_system_suspend,
+             TP_PROTO(const char *dev_name, int err, s64 usecs,
+                      int dev_state, int link_state),
+             TP_ARGS(dev_name, err, usecs, dev_state, link_state));
+
+DEFINE_EVENT(ufshcd_template, ufshcd_system_resume,
+             TP_PROTO(const char *dev_name, int err, s64 usecs,
+                      int dev_state, int link_state),
+             TP_ARGS(dev_name, err, usecs, dev_state, link_state));
+
+DEFINE_EVENT(ufshcd_template, ufshcd_runtime_suspend,
+             TP_PROTO(const char *dev_name, int err, s64 usecs,
+                      int dev_state, int link_state),
+             TP_ARGS(dev_name, err, usecs, dev_state, link_state));
+
+DEFINE_EVENT(ufshcd_template, ufshcd_runtime_resume,
+             TP_PROTO(const char *dev_name, int err, s64 usecs,
+                      int dev_state, int link_state),
+             TP_ARGS(dev_name, err, usecs, dev_state, link_state));
+
+DEFINE_EVENT(ufshcd_template, ufshcd_init,
+             TP_PROTO(const char *dev_name, int err, s64 usecs,
+                      int dev_state, int link_state),
+             TP_ARGS(dev_name, err, usecs, dev_state, link_state));
+
+TRACE_EVENT(ufshcd_command,
+        TP_PROTO(const char *dev_name, const char *str, unsigned int tag,
+                        u32 doorbell, int transfer_len, u32 intr, u64 lba,
+                        u8 opcode),
+
+        TP_ARGS(dev_name, str, tag, doorbell, transfer_len, intr, lba, opcode),
+
+        TP_STRUCT__entry(
+                __string(dev_name, dev_name)
+                __string(str, str)
+                __field(unsigned int, tag)
+                __field(u32, doorbell)
+                __field(int, transfer_len)
+                __field(u32, intr)
+                __field(u64, lba)
+                __field(u8, opcode)
+        ),
+
+        TP_fast_assign(
+                __assign_str(dev_name, dev_name);
+                __assign_str(str, str);
+                __entry->tag = tag;
+                __entry->doorbell = doorbell;
+                __entry->transfer_len = transfer_len;
+                __entry->intr = intr;
+                __entry->lba = lba;
+                __entry->opcode = opcode;
+        ),
+
+        TP_printk(
+                "%s: %s: tag: %u, DB: 0x%x, size: %d, IS: %u, LBA: %llu, opcode: 0x%x",
+                __get_str(str), __get_str(dev_name), __entry->tag,
+                __entry->doorbell, __entry->transfer_len,
+                __entry->intr, __entry->lba, (u32)__entry->opcode
+        )
+);
+
+#endif /* if !defined(_TRACE_UFS_H) || defined(TRACE_HEADER_MULTI_READ) */
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
diff --git a/include/uapi/scsi/cxlflash_ioctl.h b/include/uapi/scsi/cxlflash_ioctl.h
index 6bf1f8a022b1..e9fdc12ad984 100644
--- a/include/uapi/scsi/cxlflash_ioctl.h
+++ b/include/uapi/scsi/cxlflash_ioctl.h
@@ -40,6 +40,7 @@ struct dk_cxlflash_hdr {
  */
 #define DK_CXLFLASH_ALL_PORTS_ACTIVE    0x0000000000000001ULL
 #define DK_CXLFLASH_APP_CLOSE_ADAP_FD   0x0000000000000002ULL
+#define DK_CXLFLASH_CONTEXT_SQ_CMD_MODE 0x0000000000000004ULL
 
 /*
  * General Notes: