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

Commit 318913c6 authored by Xiang Chen's avatar Xiang Chen Committed by Martin K. Petersen
Browse files

scsi: hisi_sas: relocate get_ncq_tag_v2_hw() 



Relocate get_ncq_tag_v2_hw() to a common location, as future hw versions
will require it.  Also rename with "hisi_sas_" prefix for consistency.

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 75904077

drivers/scsi/hisi_sas/hisi_sas.h

+1 −0
Original line number Diff line number Diff line
@@ -366,6 +366,7 @@ extern u8 hisi_sas_get_ata_protocol(u8 cmd, int direction); 
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_probe(struct platform_device *pdev,

			  const struct hisi_sas_hw *ops);

extern int hisi_sas_remove(struct platform_device *pdev);

drivers/scsi/hisi_sas/hisi_sas_main.c

+15 −0
Original line number Diff line number Diff line
@@ -97,6 +97,21 @@ 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);



static struct hisi_hba *dev_to_hisi_hba(struct domain_device *device)

{

	return device->port->ha->lldd_ha;

drivers/scsi/hisi_sas/hisi_sas_v2_hw.c

+1 −15
Original line number Diff line number Diff line
@@ -2332,20 +2332,6 @@ slot_complete_v2_hw(struct hisi_hba *hisi_hba, struct hisi_sas_slot *slot) 
	return sts;

}



static int get_ncq_tag_v2_hw(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;

}



static int prep_ata_v2_hw(struct hisi_hba *hisi_hba,

			  struct hisi_sas_slot *slot)

{
@@ -2393,7 +2379,7 @@ static int prep_ata_v2_hw(struct hisi_hba *hisi_hba, 
	hdr->dw1 = cpu_to_le32(dw1);



	/* dw2 */

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

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

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

		dw2 |= hdr_tag << CMD_HDR_NCQ_TAG_OFF;

	}