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: arcmsr, qla2xxx, lpfc,
  hisi_sas, target/iscsi and target/core.

  Additionally Christoph refactored gdth as part of the dma changes. The
  major mid-layer change this time is the removal of bidi commands and
  with them the whole of the osd/exofs driver and filesystem. This is a
  major simplification for block and mq in particular"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (240 commits)
  scsi: cxgb4i: validate tcp sequence number only if chip version <= T5
  scsi: cxgb4i: get pf number from lldi->pf
  scsi: core: replace GFP_ATOMIC with GFP_KERNEL in scsi_scan.c
  scsi: mpt3sas: Add missing breaks in switch statements
  scsi: aacraid: Fix missing break in switch statement
  scsi: kill command serial number
  scsi: csiostor: drop serial_number usage
  scsi: mvumi: use request tag instead of serial_number
  scsi: dpt_i2o: remove serial number usage
  scsi: st: osst: Remove negative constant left-shifts
  scsi: ufs-bsg: Allow reading descriptors
  scsi: ufs: Allow reading descriptor via raw upiu
  scsi: ufs-bsg: Change the calling convention for write descriptor
  scsi: ufs: Remove unused device quirks
  Revert "scsi: ufs: disable vccq if it's not needed by UFS device"
  scsi: megaraid_sas: Remove a bunch of set but not used variables
  scsi: clean obsolete return values of eh_timed_out
  scsi: sd: Optimal I/O size should be a multiple of physical block size
  scsi: MAINTAINERS: SCSI initiator and target tweaks
  scsi: fcoe: make use of fip_mode enum complete
  ...

1 files changed, 33 insertions, 5 deletions

diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c
index f21c93bbb35c..17b45a0c7bc3 100644
--- a/drivers/scsi/libsas/sas_expander.c
+++ b/drivers/scsi/libsas/sas_expander.c
@@ -25,6 +25,7 @@
 #include <linux/scatterlist.h>
 #include <linux/blkdev.h>
 #include <linux/slab.h>
+#include <asm/unaligned.h>
 
 #include "sas_internal.h"
 
@@ -614,7 +615,14 @@ int sas_smp_phy_control(struct domain_device *dev, int phy_id,
         }
 
         res = smp_execute_task(dev, pc_req, PC_REQ_SIZE, pc_resp,PC_RESP_SIZE);
-
+        if (res) {
+                pr_err("ex %016llx phy%02d PHY control failed: %d\n",
+                       SAS_ADDR(dev->sas_addr), phy_id, res);
+        } else if (pc_resp[2] != SMP_RESP_FUNC_ACC) {
+                pr_err("ex %016llx phy%02d PHY control failed: function result 0x%x\n",
+                       SAS_ADDR(dev->sas_addr), phy_id, pc_resp[2]);
+                res = pc_resp[2];
+        }
         kfree(pc_resp);
         kfree(pc_req);
         return res;
@@ -689,10 +697,10 @@ int sas_smp_get_phy_events(struct sas_phy *phy)
         if (res)
                 goto out;
 
-        phy->invalid_dword_count = scsi_to_u32(&resp[12]);
-        phy->running_disparity_error_count = scsi_to_u32(&resp[16]);
-        phy->loss_of_dword_sync_count = scsi_to_u32(&resp[20]);
-        phy->phy_reset_problem_count = scsi_to_u32(&resp[24]);
+        phy->invalid_dword_count = get_unaligned_be32(&resp[12]);
+        phy->running_disparity_error_count = get_unaligned_be32(&resp[16]);
+        phy->loss_of_dword_sync_count = get_unaligned_be32(&resp[20]);
+        phy->phy_reset_problem_count = get_unaligned_be32(&resp[24]);
 
  out:
         kfree(req);
@@ -817,6 +825,26 @@ static struct domain_device *sas_ex_discover_end_dev(
 
 #ifdef CONFIG_SCSI_SAS_ATA
         if ((phy->attached_tproto & SAS_PROTOCOL_STP) || phy->attached_sata_dev) {
+                if (child->linkrate > parent->min_linkrate) {
+                        struct sas_phy_linkrates rates = {
+                                .maximum_linkrate = parent->min_linkrate,
+                                .minimum_linkrate = parent->min_linkrate,
+                        };
+                        int ret;
+
+                        pr_notice("ex %016llx phy%02d SATA device linkrate > min pathway connection rate, attempting to lower device linkrate\n",
+                                   SAS_ADDR(child->sas_addr), phy_id);
+                        ret = sas_smp_phy_control(parent, phy_id,
+                                                  PHY_FUNC_LINK_RESET, &rates);
+                        if (ret) {
+                                pr_err("ex %016llx phy%02d SATA device could not set linkrate (%d)\n",
+                                       SAS_ADDR(child->sas_addr), phy_id, ret);
+                                goto out_free;
+                        }
+                        pr_notice("ex %016llx phy%02d SATA device set linkrate successfully\n",
+                                  SAS_ADDR(child->sas_addr), phy_id);
+                        child->linkrate = child->min_linkrate;
+                }
                 res = sas_get_ata_info(child, phy);
                 if (res)
                         goto out_free;