Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 435a05cf authored by Xiang Chen's avatar Xiang Chen Committed by Martin K. Petersen
Browse files

scsi: hisi_sas: Assign NCQ tag for all NCQ commands 

Currently the NCQ tag is only assigned for FPDMA READ and FPDMA WRITE
commands, and for other NCQ commands (such as FPDMA SEND), their NCQ tags
are set in the delivery command to 0.

So for all the NCQ commands, we also need to assign normal NCQ tag for
them, so drop the command type check in hisi_sas_get_ncq_tag() [drop
hisi_sas_get_ncq_tag() altogether actually], and always use the ATA command
NCQ tag when appropriate.

Link: https://lore.kernel.org/r/1567774537-20003-8-git-send-email-john.garry@huawei.com


Signed-off-by: default avatarXiang Chen <chenxiang66@hisilicon.com>
Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 73a4925d

drivers/scsi/hisi_sas/hisi_sas.h

+0 −1
Original line number Diff line number Diff line
@@ -559,7 +559,6 @@ extern u8 hisi_sas_get_ata_protocol(struct host_to_dev_fis *fis, 
extern struct hisi_sas_port *to_hisi_sas_port(struct asd_sas_port *sas_port);

extern void hisi_sas_sata_done(struct sas_task *task,

			    struct hisi_sas_slot *slot);

extern int hisi_sas_get_ncq_tag(struct sas_task *task, u32 *tag);

extern int hisi_sas_get_fw_info(struct hisi_hba *hisi_hba);

extern int hisi_sas_probe(struct platform_device *pdev,

			  const struct hisi_sas_hw *ops);

drivers/scsi/hisi_sas/hisi_sas_main.c

+0 −15
Original line number Diff line number Diff line
@@ -118,21 +118,6 @@ void hisi_sas_sata_done(struct sas_task *task, 
}

EXPORT_SYMBOL_GPL(hisi_sas_sata_done);



int hisi_sas_get_ncq_tag(struct sas_task *task, u32 *tag)

{

	struct ata_queued_cmd *qc = task->uldd_task;



	if (qc) {

		if (qc->tf.command == ATA_CMD_FPDMA_WRITE ||

			qc->tf.command == ATA_CMD_FPDMA_READ) {

			*tag = qc->tag;

			return 1;

		}

	}

	return 0;

}

EXPORT_SYMBOL_GPL(hisi_sas_get_ncq_tag);



/*

 * This function assumes linkrate mask fits in 8 bits, which it

 * does for all HW versions supported.

drivers/scsi/hisi_sas/hisi_sas_v2_hw.c

+4 −1
Original line number Diff line number Diff line
@@ -2534,7 +2534,10 @@ static void prep_ata_v2_hw(struct hisi_hba *hisi_hba, 
	hdr->dw1 = cpu_to_le32(dw1);



	/* dw2 */

	if (task->ata_task.use_ncq && hisi_sas_get_ncq_tag(task, &hdr_tag)) {

	if (task->ata_task.use_ncq) {

		struct ata_queued_cmd *qc = task->uldd_task;



		hdr_tag = qc->tag;

		task->ata_task.fis.sector_count |= (u8) (hdr_tag << 3);

		dw2 |= hdr_tag << CMD_HDR_NCQ_TAG_OFF;

	}

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

+4 −1
Original line number Diff line number Diff line
@@ -1356,7 +1356,10 @@ static void prep_ata_v3_hw(struct hisi_hba *hisi_hba, 
	hdr->dw1 = cpu_to_le32(dw1);



	/* dw2 */

	if (task->ata_task.use_ncq && hisi_sas_get_ncq_tag(task, &hdr_tag)) {

	if (task->ata_task.use_ncq) {

		struct ata_queued_cmd *qc = task->uldd_task;



		hdr_tag = qc->tag;

		task->ata_task.fis.sector_count |= (u8) (hdr_tag << 3);

		dw2 |= hdr_tag << CMD_HDR_NCQ_TAG_OFF;

	}