|
@@ -441,14 +441,11 @@ 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;
|
|
@@ -468,7 +465,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) |
|
|
|
- (MVS_PHY_ID << TXQ_PHY_SHIFT) |
|
|
|
+ ((sas_port->phy_mask & TXQ_PHY_MASK) << TXQ_PHY_SHIFT) |
|
|
|
(mvi_dev->taskfileset << TXQ_SRS_SHIFT);
|
|
|
mvi->tx[mvi->tx_prod] = cpu_to_le32(del_q);
|
|
|
|