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 of the usual suspects: lpfc, qla2xxx, hisi_sas,
  megaraid_sas, pm80xx, mpt3sas, be2iscsi, hpsa. and a host of minor
  updates.

  There's no major behaviour change or additions to the core in all of
  this, so the potential for regressions should be small (biggest
  potential being in the scsi error handler changes)"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (203 commits)
  scsi: lpfc: Fix hard lock up NMI in els timeout handling.
  scsi: mpt3sas: remove a stray KERN_INFO
  scsi: mpt3sas: cleanup _scsih_pcie_enumeration_event()
  scsi: aacraid: use timespec64 instead of timeval
  scsi: scsi_transport_fc: add 64GBIT and 128GBIT port speed definitions
  scsi: qla2xxx: Suppress a kernel complaint in qla_init_base_qpair()
  scsi: mpt3sas: fix dma_addr_t casts
  scsi: be2iscsi: Use kasprintf
  scsi: storvsc: Avoid excessive host scan on controller change
  scsi: lpfc: fix kzalloc-simple.cocci warnings
  scsi: mpt3sas: Update mpt3sas driver version.
  scsi: mpt3sas: Fix sparse warnings
  scsi: mpt3sas: Fix nvme drives checking for tlr.
  scsi: mpt3sas: NVMe drive support for BTDHMAPPING ioctl command and log info
  scsi: mpt3sas: Add-Task-management-debug-info-for-NVMe-drives.
  scsi: mpt3sas: scan and add nvme device after controller reset
  scsi: mpt3sas: Set NVMe device queue depth as 128
  scsi: mpt3sas: Handle NVMe PCIe device related events generated from firmware.
  scsi: mpt3sas: API's to remove nvme drive from sml
  scsi: mpt3sas: API 's to support NVMe drive addition to SML
  ...

1 files changed, 16 insertions, 40 deletions

diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
index 388aaf72b480..0f9cbf96c093 100644
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
@@ -60,38 +60,32 @@ enum sas_phy_type {
  * so when updating/adding events here, please also
  * update the other file too.
  */
-enum ha_event {
-        HAE_RESET             = 0U,
-        HA_NUM_EVENTS         = 1,
-};
-
 enum port_event {
         PORTE_BYTES_DMAED     = 0U,
-        PORTE_BROADCAST_RCVD  = 1,
-        PORTE_LINK_RESET_ERR  = 2,
-        PORTE_TIMER_EVENT     = 3,
-        PORTE_HARD_RESET      = 4,
-        PORT_NUM_EVENTS       = 5,
+        PORTE_BROADCAST_RCVD,
+        PORTE_LINK_RESET_ERR,
+        PORTE_TIMER_EVENT,
+        PORTE_HARD_RESET,
+        PORT_NUM_EVENTS,
 };
 
 enum phy_event {
         PHYE_LOSS_OF_SIGNAL   = 0U,
-        PHYE_OOB_DONE         = 1,
-        PHYE_OOB_ERROR        = 2,
-        PHYE_SPINUP_HOLD      = 3, /* hot plug SATA, no COMWAKE sent */
-        PHYE_RESUME_TIMEOUT   = 4,
-        PHY_NUM_EVENTS        = 5,
+        PHYE_OOB_DONE,
+        PHYE_OOB_ERROR,
+        PHYE_SPINUP_HOLD,             /* hot plug SATA, no COMWAKE sent */
+        PHYE_RESUME_TIMEOUT,
+        PHY_NUM_EVENTS,
 };
 
 enum discover_event {
         DISCE_DISCOVER_DOMAIN   = 0U,
-        DISCE_REVALIDATE_DOMAIN = 1,
-        DISCE_PORT_GONE         = 2,
-        DISCE_PROBE             = 3,
-        DISCE_SUSPEND           = 4,
-        DISCE_RESUME            = 5,
-        DISCE_DESTRUCT          = 6,
-        DISC_NUM_EVENTS         = 7,
+        DISCE_REVALIDATE_DOMAIN,
+        DISCE_PROBE,
+        DISCE_SUSPEND,
+        DISCE_RESUME,
+        DISCE_DESTRUCT,
+        DISC_NUM_EVENTS,
 };
 
 /* ---------- Expander Devices ---------- */
@@ -261,8 +255,6 @@ struct sas_discovery {
 /* The port struct is Class:RW, driver:RO */
 struct asd_sas_port {
 /* private: */
-        struct completion port_gone_completion;
-
         struct sas_discovery disc;
         struct domain_device *port_dev;
         spinlock_t dev_list_lock;
@@ -362,18 +354,6 @@ struct scsi_core {
 
 };
 
-struct sas_ha_event {
-        struct sas_work work;
-        struct sas_ha_struct *ha;
-};
-
-static inline struct sas_ha_event *to_sas_ha_event(struct work_struct *work)
-{
-        struct sas_ha_event *ev = container_of(work, typeof(*ev), work.work);
-
-        return ev;
-}
-
 enum sas_ha_state {
         SAS_HA_REGISTERED,
         SAS_HA_DRAINING,
@@ -383,9 +363,6 @@ enum sas_ha_state {
 
 struct sas_ha_struct {
 /* private: */
-        struct sas_ha_event ha_events[HA_NUM_EVENTS];
-        unsigned long    pending;
-
         struct list_head  defer_q; /* work queued while draining */
         struct mutex      drain_mutex;
         unsigned long     state;
@@ -415,7 +392,6 @@ struct sas_ha_struct {
                                 * their siblings when forming wide ports */
 
         /* LLDD calls these to notify the class of an event. */
-        int (*notify_ha_event)(struct sas_ha_struct *, enum ha_event);
         int (*notify_port_event)(struct asd_sas_phy *, enum port_event);
         int (*notify_phy_event)(struct asd_sas_phy *, enum phy_event);