mvsas: fixed timeout issue when removing module
PATCH 1/1 mvsas: fixed timeout issue when removing module
From: Xiangliang Yu <[email protected]>
- Root cause is libsas will clear asd_sas_port phy_mask value in sas_port_deform after triggering destruct workqueue, but the workqueue will send sync cmd and still need phy_mask value. Now, mvsas using asd_sas_phy setting instead of asd_sas_port setting.
--- drivers/scsi/mvsas/mv_sas.c | 10 ++++++++-- drivers/scsi/mvsas/mv_sas.h | 1 + 2 files changed, 9 insertions(+), 2 deletions(-)
drivers/scsi/mvsas/mv_sas.c +8 -2
@@ -316,10 +316,13 @@ static int mvs_task_prep_smp(struct mvs_info *mvi, struct mvs_task_exec_info *tei) {int elem, rc, i; +struct sas_ha_struct *sha = mvi->sas;struct sas_task *task = tei->task;struct mvs_cmd_hdr *hdr = tei->hdr;struct domain_device *dev = task->dev;struct asd_sas_port *sas_port = dev->port; +struct sas_phy *sphy = dev->phy; +struct asd_sas_phy *sas_phy = sha->sas_phy[sphy->number];struct scatterlist *sg_req, *sg_resp;u32 req_len, resp_len, tag = tei->tag;void *buf_tmp;
@@ -392,7 +395,7 @@ static int mvs_task_prep_smp(struct mvs_info *mvi, slot->tx = mvi->tx_prod; mvi->tx[mvi->tx_prod] =cpu_to_le32 ((TXQ_CMD_SMP <<TXQ_CMD_SHIFT ) |TXQ_MODE_I | tag | - (sas_port->phy_mask <<TXQ_PHY_SHIFT )); + (MVS_PHY_ID <<TXQ_PHY_SHIFT )); hdr->flags |= flags; hdr->lens =cpu_to_le32 (((resp_len /4 ) <<16 ) | ((req_len -4 ) /4 ));
@@ -438,11 +441,14 @@ static u32 mvs_get_ncq_tag(struct sas_task *task, u32 *tag)static int mvs_task_prep_ata (struct mvs_info *mvi,struct mvs_task_exec_info *tei) { +struct sas_ha_struct *sha = mvi->sas;struct sas_task *task = tei->task;struct domain_device *dev = task->dev;struct mvs_device *mvi_dev = dev->lldd_dev;struct mvs_cmd_hdr *hdr = tei->hdr;struct asd_sas_port *sas_port = dev->port; +struct sas_phy *sphy = dev->phy; +struct asd_sas_phy *sas_phy = sha->sas_phy[sphy->number];struct mvs_slot_info *slot;void *buf_prd;u32 tag = tei->tag, hdr_tag;
@@ -462,7 +468,7 @@ static int mvs_task_prep_ata(struct mvs_info *mvi, slot->tx = mvi->tx_prod; del_q =TXQ_MODE_I | tag | (TXQ_CMD_STP <<TXQ_CMD_SHIFT ) | - (sas_port->phy_mask <<TXQ_PHY_SHIFT ) | + (MVS_PHY_ID <<TXQ_PHY_SHIFT ) | (mvi_dev->taskfileset <<TXQ_SRS_SHIFT ); mvi->tx[mvi->tx_prod] =cpu_to_le32 (del_q);
drivers/scsi/mvsas/mv_sas.h +1 -0
@@ -76,6 +76,7 @@ extern struct kmem_cache *mvs_task_list_cache; (__mc) !=0 ; \ (++__lseq), (__mc) >>= 1) +#define MVS_PHY_ID (1U << sas_phy->id)#define MV_INIT_DELAYED_WORK (w, f, d) INIT_DELAYED_WORK(w, f)#define UNASSOC_D2H_FIS (id) \ ((void *) mvi->rx_fis + 0x100 * id)
Signature · 1 line
1.7.5.4
James Bottomley
maintainerQuoted 9 lines · On Wed, 2013-01-30 at 00:25 +0800, [email protected] wrote:
From: Xiangliang Yu <[email protected]>
- Root cause is libsas will clear
asd_sas_portphy_maskvalue insas_port_deformafter triggering destruct workqueue, but the workqueue will send sync cmd and still needphy_maskvalue. Now, mvsas usingasd_sas_physetting instead ofasd_sas_portsetting.
---
Signed-off-by missing ... please don't forget next time.
James