Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-08 14:23:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[SCSI] mvsas: fixed timeout issue when removing module

Browse Source 
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.

Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
Xiangliang Yu 2013-01-30 00:25:53 +08:00 committed by James Bottomley
parent 2b4df6ea53
commit 7c237c5f6d
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/scsi/mvsas/mv_sas.c
View File

@ -316,10 +316,13 @@ static int mvs_task_prep_smp(struct mvs_info *mvi,
struct mvs_task_exec_info *tei) struct mvs_task_exec_info *tei)
{ {
int elem, rc, i; int elem, rc, i;
struct sas_ha_struct *sha = mvi->sas;
struct sas_task *task = tei->task; struct sas_task *task = tei->task;
struct mvs_cmd_hdr *hdr = tei->hdr; struct mvs_cmd_hdr *hdr = tei->hdr;
struct domain_device *dev = task->dev; struct domain_device *dev = task->dev;
struct asd_sas_port *sas_port = dev->port; 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; struct scatterlist *sg_req, *sg_resp;
u32 req_len, resp_len, tag = tei->tag; u32 req_len, resp_len, tag = tei->tag;
void *buf_tmp; void *buf_tmp;
@ -392,7 +395,7 @@ static int mvs_task_prep_smp(struct mvs_info *mvi,
slot->tx = mvi->tx_prod; slot->tx = mvi->tx_prod;
mvi->tx[mvi->tx_prod] = cpu_to_le32((TXQ_CMD_SMP << TXQ_CMD_SHIFT) | mvi->tx[mvi->tx_prod] = cpu_to_le32((TXQ_CMD_SMP << TXQ_CMD_SHIFT) |
TXQ_MODE_I | tag | TXQ_MODE_I | tag |
(sas_port->phy_mask << TXQ_PHY_SHIFT)); (MVS_PHY_ID << TXQ_PHY_SHIFT));
hdr->flags |= flags; hdr->flags |= flags;
hdr->lens = cpu_to_le32(((resp_len / 4) << 16) | ((req_len - 4) / 4)); 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, static int mvs_task_prep_ata(struct mvs_info *mvi,
struct mvs_task_exec_info *tei) struct mvs_task_exec_info *tei)
{ {
struct sas_ha_struct *sha = mvi->sas;
struct sas_task *task = tei->task; struct sas_task *task = tei->task;
struct domain_device *dev = task->dev; struct domain_device *dev = task->dev;
struct mvs_device *mvi_dev = dev->lldd_dev; struct mvs_device *mvi_dev = dev->lldd_dev;
struct mvs_cmd_hdr *hdr = tei->hdr; struct mvs_cmd_hdr *hdr = tei->hdr;
struct asd_sas_port *sas_port = dev->port; 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; struct mvs_slot_info *slot;
void *buf_prd; void *buf_prd;
u32 tag = tei->tag, hdr_tag; 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; slot->tx = mvi->tx_prod;
del_q = TXQ_MODE_I | tag | del_q = TXQ_MODE_I | tag |
(TXQ_CMD_STP << TXQ_CMD_SHIFT) | (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_dev->taskfileset << TXQ_SRS_SHIFT);
mvi->tx[mvi->tx_prod] = cpu_to_le32(del_q); mvi->tx[mvi->tx_prod] = cpu_to_le32(del_q);

1
drivers/scsi/mvsas/mv_sas.h
View File

@ -76,6 +76,7 @@ extern struct kmem_cache *mvs_task_list_cache;
(__mc) != 0 ; \ (__mc) != 0 ; \
(++__lseq), (__mc) >>= 1) (++__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 MV_INIT_DELAYED_WORK(w, f, d) INIT_DELAYED_WORK(w, f)
#define UNASSOC_D2H_FIS(id) \ #define UNASSOC_D2H_FIS(id) \
((void *) mvi->rx_fis + 0x100 * id) ((void *) mvi->rx_fis + 0x100 * id)