scsi: hisi_sas: Change frame type for SET MAX commands

BugLink: http://bugs.launchpad.net/bugs/1756094
According to ATA protocol, SET MAX commands belong to different frame
types. So judge features field of SET MAX commands to decide which
frame type they belongs to.

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>
(cherry picked from commit 468f4b8d0711146f0075513e6047079a26fc3903)
Signed-off-by: Manoj Iyer <manoj.iyer@canonical.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/drivers/scsi/hisi_sas/hisi_sas.h b/drivers/scsi/hisi_sas/hisi_sas.h
index 29f868d69c769207c14878ac7397101a3d72ed1e..e7fd2877c19cb2a3c7164a883e6d01bc6bdeebd7 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas.h
+++ b/drivers/scsi/hisi_sas/hisi_sas.h
@@ -444,7 +444,8 @@ extern void hisi_sas_stop_phys(struct hisi_hba *hisi_hba);
 extern void hisi_sas_init_add(struct hisi_hba *hisi_hba);
 extern int hisi_sas_alloc(struct hisi_hba *hisi_hba, struct Scsi_Host *shost);
 extern void hisi_sas_free(struct hisi_hba *hisi_hba);
-extern u8 hisi_sas_get_ata_protocol(u8 cmd, int direction);
+extern u8 hisi_sas_get_ata_protocol(struct host_to_dev_fis *fis,
+                               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);

diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c
index b81a98faa06f55ef618a215780de14e2dfb332b4..821a27fe4d9f21f5c07d950216d2dc150f2b9a1b 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
@@ -25,9 +25,9 @@ static int hisi_sas_softreset_ata_disk(struct domain_device *device);
 static int hisi_sas_control_phy(struct asd_sas_phy *sas_phy, enum phy_func func,
                                void *funcdata);
 
-u8 hisi_sas_get_ata_protocol(u8 cmd, int direction)
+u8 hisi_sas_get_ata_protocol(struct host_to_dev_fis *fis, int direction)
 {
-       switch (cmd) {
+       switch (fis->command) {
        case ATA_CMD_FPDMA_WRITE:
        case ATA_CMD_FPDMA_READ:
        case ATA_CMD_FPDMA_RECV:
@@ -79,10 +79,26 @@ u8 hisi_sas_get_ata_protocol(u8 cmd, int direction)
        case ATA_CMD_ZAC_MGMT_OUT:
        return HISI_SAS_SATA_PROTOCOL_NONDATA;
        default:
+       {
+               if (fis->command == ATA_CMD_SET_MAX) {
+                       switch (fis->features) {
+                       case ATA_SET_MAX_PASSWD:
+                       case ATA_SET_MAX_LOCK:
+                       return HISI_SAS_SATA_PROTOCOL_PIO;
+
+                       case ATA_SET_MAX_PASSWD_DMA:
+                       case ATA_SET_MAX_UNLOCK_DMA:
+                       return HISI_SAS_SATA_PROTOCOL_DMA;
+
+                       default:
+                       return HISI_SAS_SATA_PROTOCOL_NONDATA;
+                       }
+               }
                if (direction == DMA_NONE)
                        return HISI_SAS_SATA_PROTOCOL_NONDATA;
                return HISI_SAS_SATA_PROTOCOL_PIO;
        }
+       }
 }
 EXPORT_SYMBOL_GPL(hisi_sas_get_ata_protocol);
 

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
index 08bf09031656f5247145a631095db1f0e10744a9..4ccb61e2ae5ccdbd778aec6c42afb1bd50a5e991 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
@@ -2539,7 +2539,7 @@ static int prep_ata_v2_hw(struct hisi_hba *hisi_hba,
                dw1 |= 1 << CMD_HDR_RESET_OFF;
 
        dw1 |= (hisi_sas_get_ata_protocol(
-               task->ata_task.fis.command, task->data_dir))
+               &task->ata_task.fis, task->data_dir))
                << CMD_HDR_FRAME_TYPE_OFF;
        dw1 |= sas_dev->device_id << CMD_HDR_DEV_ID_OFF;
        hdr->dw1 = cpu_to_le32(dw1);

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
index 6a408d2e92f53dacbf027de9166f65b73852b17b..a1f18689729a4b965b546d4b445305a6e4fddb02 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
@@ -1047,7 +1047,7 @@ static int prep_ata_v3_hw(struct hisi_hba *hisi_hba,
                dw1 |= 1 << CMD_HDR_RESET_OFF;
 
        dw1 |= (hisi_sas_get_ata_protocol(
-               task->ata_task.fis.command, task->data_dir))
+               &task->ata_task.fis, task->data_dir))
                << CMD_HDR_FRAME_TYPE_OFF;
        dw1 |= sas_dev->device_id << CMD_HDR_DEV_ID_OFF;