scsi: hisi_sas: relocate get_ata_protocol()

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

Signed-off-by: Xiang Chen <chenxiang66@hisilicon.com>
Signed-off-by: John Garry <john.garry@huawei.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/hisi_sas/hisi_sas.h b/drivers/scsi/hisi_sas/hisi_sas.h
index 68ba7bd229e826d6feea11e95c84c5e821d6583c..a50c699893520f7f1aeefdded9a67ba6122475a4 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas.h
+++ b/drivers/scsi/hisi_sas/hisi_sas.h
@@ -46,6 +46,12 @@
        ((type == SAS_EDGE_EXPANDER_DEVICE) || \
        (type == SAS_FANOUT_EXPANDER_DEVICE))
 
+#define HISI_SAS_SATA_PROTOCOL_NONDATA         0x1
+#define HISI_SAS_SATA_PROTOCOL_PIO                     0x2
+#define HISI_SAS_SATA_PROTOCOL_DMA                     0x4
+#define HISI_SAS_SATA_PROTOCOL_FPDMA           0x8
+#define HISI_SAS_SATA_PROTOCOL_ATAPI           0x10
+
 struct hisi_hba;
 
 enum {
@@ -356,6 +362,7 @@ union hisi_sas_command_table {
        struct hisi_sas_command_table_stp stp;
 };
 
+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 int hisi_sas_probe(struct platform_device *pdev,
                          const struct hisi_sas_hw *ops);

diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c
index 4e78cbcd0cf28b6a070037faed02eca1a9252c18..5b51d9af201389696186d284b7520da6995f77f3 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
@@ -23,6 +23,65 @@ hisi_sas_internal_task_abort(struct hisi_hba *hisi_hba,
                             int abort_flag, int tag);
 static int hisi_sas_softreset_ata_disk(struct domain_device *device);
 
+u8 hisi_sas_get_ata_protocol(u8 cmd, int direction)
+{
+       switch (cmd) {
+       case ATA_CMD_FPDMA_WRITE:
+       case ATA_CMD_FPDMA_READ:
+       case ATA_CMD_FPDMA_RECV:
+       case ATA_CMD_FPDMA_SEND:
+       case ATA_CMD_NCQ_NON_DATA:
+       return HISI_SAS_SATA_PROTOCOL_FPDMA;
+
+       case ATA_CMD_DOWNLOAD_MICRO:
+       case ATA_CMD_ID_ATA:
+       case ATA_CMD_PMP_READ:
+       case ATA_CMD_READ_LOG_EXT:
+       case ATA_CMD_PIO_READ:
+       case ATA_CMD_PIO_READ_EXT:
+       case ATA_CMD_PMP_WRITE:
+       case ATA_CMD_WRITE_LOG_EXT:
+       case ATA_CMD_PIO_WRITE:
+       case ATA_CMD_PIO_WRITE_EXT:
+       return HISI_SAS_SATA_PROTOCOL_PIO;
+
+       case ATA_CMD_DSM:
+       case ATA_CMD_DOWNLOAD_MICRO_DMA:
+       case ATA_CMD_PMP_READ_DMA:
+       case ATA_CMD_PMP_WRITE_DMA:
+       case ATA_CMD_READ:
+       case ATA_CMD_READ_EXT:
+       case ATA_CMD_READ_LOG_DMA_EXT:
+       case ATA_CMD_READ_STREAM_DMA_EXT:
+       case ATA_CMD_TRUSTED_RCV_DMA:
+       case ATA_CMD_TRUSTED_SND_DMA:
+       case ATA_CMD_WRITE:
+       case ATA_CMD_WRITE_EXT:
+       case ATA_CMD_WRITE_FUA_EXT:
+       case ATA_CMD_WRITE_QUEUED:
+       case ATA_CMD_WRITE_LOG_DMA_EXT:
+       case ATA_CMD_WRITE_STREAM_DMA_EXT:
+       return HISI_SAS_SATA_PROTOCOL_DMA;
+
+       case ATA_CMD_CHK_POWER:
+       case ATA_CMD_DEV_RESET:
+       case ATA_CMD_EDD:
+       case ATA_CMD_FLUSH:
+       case ATA_CMD_FLUSH_EXT:
+       case ATA_CMD_VERIFY:
+       case ATA_CMD_VERIFY_EXT:
+       case ATA_CMD_SET_FEATURES:
+       case ATA_CMD_STANDBY:
+       case ATA_CMD_STANDBYNOW1:
+       return HISI_SAS_SATA_PROTOCOL_NONDATA;
+       default:
+               if (direction == DMA_NONE)
+                       return HISI_SAS_SATA_PROTOCOL_NONDATA;
+               return HISI_SAS_SATA_PROTOCOL_PIO;
+       }
+}
+EXPORT_SYMBOL_GPL(hisi_sas_get_ata_protocol);
+
 static struct hisi_hba *dev_to_hisi_hba(struct domain_device *device)
 {
        return device->port->ha->lldd_ha;

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
index 2607aac00ac9087bfd196f884a8ec78115030f05..d9314c4eff0f9cd94229f2de1c069312ba803bdf 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
@@ -554,12 +554,6 @@ enum {
 #define DIR_TO_DEVICE 2
 #define DIR_RESERVED 3
 
-#define SATA_PROTOCOL_NONDATA          0x1
-#define SATA_PROTOCOL_PIO              0x2
-#define SATA_PROTOCOL_DMA              0x4
-#define SATA_PROTOCOL_FPDMA            0x8
-#define SATA_PROTOCOL_ATAPI            0x10
-
 #define ERR_ON_TX_PHASE(err_phase) (err_phase == 0x2 || \
                err_phase == 0x4 || err_phase == 0x8 ||\
                err_phase == 0x6 || err_phase == 0xa)
@@ -2352,64 +2346,6 @@ out:
        return sts;
 }
 
-static u8 get_ata_protocol(u8 cmd, int direction)
-{
-       switch (cmd) {
-       case ATA_CMD_FPDMA_WRITE:
-       case ATA_CMD_FPDMA_READ:
-       case ATA_CMD_FPDMA_RECV:
-       case ATA_CMD_FPDMA_SEND:
-       case ATA_CMD_NCQ_NON_DATA:
-       return SATA_PROTOCOL_FPDMA;
-
-       case ATA_CMD_DOWNLOAD_MICRO:
-       case ATA_CMD_ID_ATA:
-       case ATA_CMD_PMP_READ:
-       case ATA_CMD_READ_LOG_EXT:
-       case ATA_CMD_PIO_READ:
-       case ATA_CMD_PIO_READ_EXT:
-       case ATA_CMD_PMP_WRITE:
-       case ATA_CMD_WRITE_LOG_EXT:
-       case ATA_CMD_PIO_WRITE:
-       case ATA_CMD_PIO_WRITE_EXT:
-       return SATA_PROTOCOL_PIO;
-
-       case ATA_CMD_DSM:
-       case ATA_CMD_DOWNLOAD_MICRO_DMA:
-       case ATA_CMD_PMP_READ_DMA:
-       case ATA_CMD_PMP_WRITE_DMA:
-       case ATA_CMD_READ:
-       case ATA_CMD_READ_EXT:
-       case ATA_CMD_READ_LOG_DMA_EXT:
-       case ATA_CMD_READ_STREAM_DMA_EXT:
-       case ATA_CMD_TRUSTED_RCV_DMA:
-       case ATA_CMD_TRUSTED_SND_DMA:
-       case ATA_CMD_WRITE:
-       case ATA_CMD_WRITE_EXT:
-       case ATA_CMD_WRITE_FUA_EXT:
-       case ATA_CMD_WRITE_QUEUED:
-       case ATA_CMD_WRITE_LOG_DMA_EXT:
-       case ATA_CMD_WRITE_STREAM_DMA_EXT:
-       return SATA_PROTOCOL_DMA;
-
-       case ATA_CMD_CHK_POWER:
-       case ATA_CMD_DEV_RESET:
-       case ATA_CMD_EDD:
-       case ATA_CMD_FLUSH:
-       case ATA_CMD_FLUSH_EXT:
-       case ATA_CMD_VERIFY:
-       case ATA_CMD_VERIFY_EXT:
-       case ATA_CMD_SET_FEATURES:
-       case ATA_CMD_STANDBY:
-       case ATA_CMD_STANDBYNOW1:
-       return SATA_PROTOCOL_NONDATA;
-       default:
-               if (direction == DMA_NONE)
-                       return SATA_PROTOCOL_NONDATA;
-               return SATA_PROTOCOL_PIO;
-       }
-}
-
 static int get_ncq_tag_v2_hw(struct sas_task *task, u32 *tag)
 {
        struct ata_queued_cmd *qc = task->uldd_task;
@@ -2464,7 +2400,8 @@ static int prep_ata_v2_hw(struct hisi_hba *hisi_hba,
                        (task->ata_task.fis.control & ATA_SRST))
                dw1 |= 1 << CMD_HDR_RESET_OFF;
 
-       dw1 |= (get_ata_protocol(task->ata_task.fis.command, task->data_dir))
+       dw1 |= (hisi_sas_get_ata_protocol(
+               task->ata_task.fis.command, task->data_dir))
                << CMD_HDR_FRAME_TYPE_OFF;
        dw1 |= sas_dev->device_id << CMD_HDR_DEV_ID_OFF;
        hdr->dw1 = cpu_to_le32(dw1);