Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 8 May 2019 17:12:46 +0000 (10:12 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 8 May 2019 17:12:46 +0000 (10:12 -0700)
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
  ...

12 files changed:
1  2 
Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt
MAINTAINERS
drivers/nvme/host/fc.c
drivers/scsi/aic7xxx/aic7xxx_core.c
drivers/scsi/megaraid/megaraid_sas_base.c
drivers/scsi/megaraid/megaraid_sas_fusion.c
drivers/scsi/mpt3sas/mpt3sas_base.c
drivers/scsi/qedi/qedi_fw.c
drivers/scsi/scsi_lib.c
drivers/scsi/ufs/Kconfig
drivers/scsi/ufs/ufs-qcom.c
drivers/scsi/virtio_scsi.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -558,126 -578,23 +558,28 @@@ static int ufs_qcom_resume(struct ufs_h
        struct phy *phy = host->generic_phy;
        int err;
  
 -      err = phy_power_on(phy);
 -      if (err) {
 -              dev_err(hba->dev, "%s: failed enabling regs, err = %d\n",
 -                      __func__, err);
 -              goto out;
 -      }
 +      if (ufs_qcom_is_link_off(hba)) {
 +              err = phy_power_on(phy);
 +              if (err) {
 +                      dev_err(hba->dev, "%s: failed PHY power on: %d\n",
 +                              __func__, err);
 +                      return err;
 +              }
  
 -      err = ufs_qcom_enable_lane_clks(host);
 -      if (err)
 -              goto out;
 +              err = ufs_qcom_enable_lane_clks(host);
 +              if (err)
 +                      return err;
  
 -      hba->is_sys_suspended = false;
 +      } else if (!ufs_qcom_is_link_active(hba)) {
 +              err = ufs_qcom_enable_lane_clks(host);
 +              if (err)
 +                      return err;
 +      }
  
 -out:
 -      return err;
 +      hba->is_sys_suspended = false;
 +      return 0;
  }
  
- struct ufs_qcom_dev_params {
-       u32 pwm_rx_gear;        /* pwm rx gear to work in */
-       u32 pwm_tx_gear;        /* pwm tx gear to work in */
-       u32 hs_rx_gear;         /* hs rx gear to work in */
-       u32 hs_tx_gear;         /* hs tx gear to work in */
-       u32 rx_lanes;           /* number of rx lanes */
-       u32 tx_lanes;           /* number of tx lanes */
-       u32 rx_pwr_pwm;         /* rx pwm working pwr */
-       u32 tx_pwr_pwm;         /* tx pwm working pwr */
-       u32 rx_pwr_hs;          /* rx hs working pwr */
-       u32 tx_pwr_hs;          /* tx hs working pwr */
-       u32 hs_rate;            /* rate A/B to work in HS */
-       u32 desired_working_mode;
- };
- static int ufs_qcom_get_pwr_dev_param(struct ufs_qcom_dev_params *qcom_param,
-                                     struct ufs_pa_layer_attr *dev_max,
-                                     struct ufs_pa_layer_attr *agreed_pwr)
- {
-       int min_qcom_gear;
-       int min_dev_gear;
-       bool is_dev_sup_hs = false;
-       bool is_qcom_max_hs = false;
-       if (dev_max->pwr_rx == FAST_MODE)
-               is_dev_sup_hs = true;
-       if (qcom_param->desired_working_mode == FAST) {
-               is_qcom_max_hs = true;
-               min_qcom_gear = min_t(u32, qcom_param->hs_rx_gear,
-                                     qcom_param->hs_tx_gear);
-       } else {
-               min_qcom_gear = min_t(u32, qcom_param->pwm_rx_gear,
-                                     qcom_param->pwm_tx_gear);
-       }
-       /*
-        * device doesn't support HS but qcom_param->desired_working_mode is
-        * HS, thus device and qcom_param don't agree
-        */
-       if (!is_dev_sup_hs && is_qcom_max_hs) {
-               pr_err("%s: failed to agree on power mode (device doesn't support HS but requested power is HS)\n",
-                       __func__);
-               return -ENOTSUPP;
-       } else if (is_dev_sup_hs && is_qcom_max_hs) {
-               /*
-                * since device supports HS, it supports FAST_MODE.
-                * since qcom_param->desired_working_mode is also HS
-                * then final decision (FAST/FASTAUTO) is done according
-                * to qcom_params as it is the restricting factor
-                */
-               agreed_pwr->pwr_rx = agreed_pwr->pwr_tx =
-                                               qcom_param->rx_pwr_hs;
-       } else {
-               /*
-                * here qcom_param->desired_working_mode is PWM.
-                * it doesn't matter whether device supports HS or PWM,
-                * in both cases qcom_param->desired_working_mode will
-                * determine the mode
-                */
-                agreed_pwr->pwr_rx = agreed_pwr->pwr_tx =
-                                               qcom_param->rx_pwr_pwm;
-       }
-       /*
-        * we would like tx to work in the minimum number of lanes
-        * between device capability and vendor preferences.
-        * the same decision will be made for rx
-        */
-       agreed_pwr->lane_tx = min_t(u32, dev_max->lane_tx,
-                                               qcom_param->tx_lanes);
-       agreed_pwr->lane_rx = min_t(u32, dev_max->lane_rx,
-                                               qcom_param->rx_lanes);
-       /* device maximum gear is the minimum between device rx and tx gears */
-       min_dev_gear = min_t(u32, dev_max->gear_rx, dev_max->gear_tx);
-       /*
-        * if both device capabilities and vendor pre-defined preferences are
-        * both HS or both PWM then set the minimum gear to be the chosen
-        * working gear.
-        * if one is PWM and one is HS then the one that is PWM get to decide
-        * what is the gear, as it is the one that also decided previously what
-        * pwr the device will be configured to.
-        */
-       if ((is_dev_sup_hs && is_qcom_max_hs) ||
-           (!is_dev_sup_hs && !is_qcom_max_hs))
-               agreed_pwr->gear_rx = agreed_pwr->gear_tx =
-                       min_t(u32, min_dev_gear, min_qcom_gear);
-       else if (!is_dev_sup_hs)
-               agreed_pwr->gear_rx = agreed_pwr->gear_tx = min_dev_gear;
-       else
-               agreed_pwr->gear_rx = agreed_pwr->gear_tx = min_qcom_gear;
-       agreed_pwr->hs_rate = qcom_param->hs_rate;
-       return 0;
- }
  #ifdef CONFIG_MSM_BUS_SCALING
  static int ufs_qcom_get_bus_vote(struct ufs_qcom_host *host,
                const char *speed_mode)
Simple merge