Now that each ATA qc has a SCSI command associated, change the qc <->
scsi_cmnd <-> sas_task referencing to deal with this. Essentially
task->uldd_task = scmd always. We need to do this for sas_execute_tmf(),
as those ATA commands have no qc.
TODO: rename ASSIGN_SAS_TASK and TO_SAS_TASK to be more appropriate.
Signed-off-by: John Garry <john.garry@xxxxxxxxxx>
---
drivers/scsi/hisi_sas/hisi_sas_main.c | 11 +----------
drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 3 ++-
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 3 ++-
drivers/scsi/libsas/sas_ata.c | 11 ++++++-----
4 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c
index 461ef8a76c4c..e438c68e249a 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
@@ -520,16 +520,7 @@ static int hisi_sas_queue_command(struct sas_task *task, gfp_t gfp_flags)
return -ECOMM;
}
- if (task->uldd_task) {
- struct ata_queued_cmd *qc;
-
- if (dev_is_sata(device)) {
- qc = task->uldd_task;
- scmd = qc->scsicmd;
- } else {
- scmd = task->uldd_task;
- }
- }
+ scmd = task->uldd_task;
if (scmd) {
unsigned int dq_index;
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
index 455d49299ddf..d1f2c8fbdc79 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
@@ -2538,7 +2538,8 @@ static void prep_ata_v2_hw(struct hisi_hba *hisi_hba,
/* dw2 */
if (task->ata_task.use_ncq) {
- struct ata_queued_cmd *qc = task->uldd_task;
+ struct scsi_cmnd *scmd = task->uldd_task;
+ struct ata_queued_cmd *qc = (struct ata_queued_cmd *)scmd->host_scribble;
hdr_tag = qc->tag;
task->ata_task.fis.sector_count |= (u8) (hdr_tag << 3);
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
index 79f87d7c3e68..e3e02a24ee76 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
@@ -1421,7 +1421,8 @@ static void prep_ata_v3_hw(struct hisi_hba *hisi_hba,
/* dw2 */
if (task->ata_task.use_ncq) {
- struct ata_queued_cmd *qc = task->uldd_task;
+ struct scsi_cmnd *scmd = task->uldd_task;
+ struct ata_queued_cmd *qc = (struct ata_queued_cmd *)scmd->host_scribble;
hdr_tag = qc->tag;
task->ata_task.fis.sector_count |= (u8) (hdr_tag << 3);
diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
index d34c82e24d9a..4d2b8fb31f30 100644
--- a/drivers/scsi/libsas/sas_ata.c
+++ b/drivers/scsi/libsas/sas_ata.c
@@ -72,7 +72,8 @@ static enum ata_completion_errors sas_to_ata_err(struct task_status_struct *ts)
static void sas_ata_task_done(struct sas_task *task)
{
- struct ata_queued_cmd *qc = task->uldd_task;
+ struct scsi_cmnd *scmd = task->uldd_task;
+ struct ata_queued_cmd *qc = TO_SAS_TASK(scmd);
struct domain_device *dev = task->dev;
struct task_status_struct *stat = &task->task_status;
struct ata_task_resp *resp = (struct ata_task_resp *)stat->buf;
@@ -184,7 +185,7 @@ static unsigned int sas_ata_qc_issue(struct ata_queued_cmd *qc)
qc->tf.nsect = 0;
ata_tf_to_fis(&qc->tf, qc->dev->link->pmp, 1, (u8 *)&task->ata_task.fis);
- task->uldd_task = qc;
+ task->uldd_task = qc->scsicmd;
if (ata_is_atapi(qc->tf.protocol)) {
memcpy(task->ata_task.atapi_packet, qc->cdb, qc->dev->cdb_len);
task->total_xfer_len = qc->nbytes;
@@ -207,8 +208,7 @@ static unsigned int sas_ata_qc_issue(struct ata_queued_cmd *qc)
task->ata_task.use_ncq = ata_is_ncq(qc->tf.protocol);
task->ata_task.dma_xfer = ata_is_dma(qc->tf.protocol);
- if (qc->scsicmd)
- ASSIGN_SAS_TASK(qc->scsicmd, task);
+ ASSIGN_SAS_TASK(qc->scsicmd, qc);
ret = i->dft->lldd_execute_task(task, GFP_ATOMIC);
if (ret) {
@@ -583,7 +583,8 @@ int sas_ata_init(struct domain_device *found_dev)
void sas_ata_task_abort(struct sas_task *task)
{
- struct ata_queued_cmd *qc = task->uldd_task;
+ struct scsi_cmnd *scmd = task->uldd_task;
+ struct ata_queued_cmd *qc = TO_SAS_TASK(scmd);
struct completion *waiting;
/* Bounce SCSI-initiated commands to the SCSI EH */
--
2.26.2
