[SCSI] mvsas: fixed some disk spin up issue

spin up issue: some direct attached SAS device can't spin up

Signed-off-by: Xiangliang Yu <yuxiangl@marvell.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

2 files changed, 16 insertions, 0 deletions

diff --git a/drivers/scsi/mvsas/mv_94xx.c b/drivers/scsi/mvsas/mv_94xx.c
index 3501291618fd..8f32c7c567cf 100644
--- a/drivers/scsi/mvsas/mv_94xx.c
+++ b/drivers/scsi/mvsas/mv_94xx.c
@@ -823,6 +823,10 @@ static void mvs_94xx_fix_phy_info(struct mvs_info *mvi, int i,
                 phy->att_dev_info = PORT_DEV_STP_TRGT | 1;
         }
 
+        /* enable spin up bit */
+        mvs_write_port_cfg_addr(mvi, i, PHYR_PHY_STAT);
+        mvs_write_port_cfg_data(mvi, i, 0x04);
+
 }
 
 void mvs_94xx_phy_set_link_rate(struct mvs_info *mvi, u32 phy_id,
diff --git a/drivers/scsi/mvsas/mv_sas.c b/drivers/scsi/mvsas/mv_sas.c
index ab2a71fd0fde..d4475d350847 100644
--- a/drivers/scsi/mvsas/mv_sas.c
+++ b/drivers/scsi/mvsas/mv_sas.c
@@ -265,6 +265,12 @@ static void mvs_bytes_dmaed(struct mvs_info *mvi, int i)
                 id->dev_type = phy->identify.device_type;
                 id->initiator_bits = SAS_PROTOCOL_ALL;
                 id->target_bits = phy->identify.target_port_protocols;
+
+                /* direct attached SAS device */
+                if (phy->att_dev_info & PORT_SSP_TRGT_MASK) {
+                        MVS_CHIP_DISP->write_port_cfg_addr(mvi, i, PHYR_PHY_STAT);
+                        MVS_CHIP_DISP->write_port_cfg_data(mvi, i, 0x00);
+                }
         } else if (phy->phy_type & PORT_TYPE_SATA) {
                 /*Nothing*/
         }
@@ -1211,6 +1217,12 @@ static void mvs_port_notify_formed(struct asd_sas_phy *sas_phy, int lock)
                 port->wide_port_phymap = sas_port->phy_mask;
                 mv_printk("set wide port phy map %x\n", sas_port->phy_mask);
                 mvs_update_wideport(mvi, sas_phy->id);
+
+                /* direct attached SAS device */
+                if (phy->att_dev_info & PORT_SSP_TRGT_MASK) {
+                        MVS_CHIP_DISP->write_port_cfg_addr(mvi, i, PHYR_PHY_STAT);
+                        MVS_CHIP_DISP->write_port_cfg_data(mvi, i, 0x04);
+                }
         }
         if (lock)
                 spin_unlock_irqrestore(&mvi->lock, flags);