scsi: libsas: Delete sas_ssp_task.enable_first_burst

Since libsas was introduced in commit 2908d778ab3e ("[SCSI] aic94xx: new
driver"), sas_ssp_task.enable_first_burst is never set, so delete it and
any references.

Signed-off-by: John Garry <john.g.garry@oracle.com>
Link: https://lore.kernel.org/r/20230815115156.343535-7-john.g.garry@oracle.com
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: Jason Yan <yanaijie@huawei.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/aic94xx/aic94xx_task.c b/drivers/scsi/aic94xx/aic94xx_task.c
index 7f02083001100146d6518afaa4be0cadbe965ff1..1ac4d3afc1a1b63fd21b58248291c1044bedadd3 100644 (file)
--- a/drivers/scsi/aic94xx/aic94xx_task.c
+++ b/drivers/scsi/aic94xx/aic94xx_task.c
@@ -485,8 +485,6 @@ static int asd_build_ssp_ascb(struct asd_ascb *ascb, struct sas_task *task,
        scb->ssp_task.ssp_frame.tptt = cpu_to_be16(0xFFFF);
 
        memcpy(scb->ssp_task.ssp_cmd.lun, task->ssp_task.LUN, 8);
-       if (task->ssp_task.enable_first_burst)
-               scb->ssp_task.ssp_cmd.efb_prio_attr |= EFB_MASK;
        scb->ssp_task.ssp_cmd.efb_prio_attr |= (task->ssp_task.task_prio << 3);
        scb->ssp_task.ssp_cmd.efb_prio_attr |= (task->ssp_task.task_attr & 7);
        memcpy(scb->ssp_task.ssp_cmd.cdb, task->ssp_task.cmd->cmnd,

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
index 94fbbceddc2e6faeb7f9219e7db0cc4ad7e8417d..d4e3c3a058e094888c9debbb136f2e69c67bbcb2 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
@@ -960,7 +960,7 @@ static void prep_ssp_v1_hw(struct hisi_hba *hisi_hba,
        struct scsi_cmnd *scsi_cmnd = ssp_task->cmd;
        struct sas_tmf_task *tmf = slot->tmf;
        int has_data = 0, priority = !!tmf;
-       u8 *buf_cmd, fburst = 0;
+       u8 *buf_cmd;
        u32 dw1, dw2;
 
        /* create header */
@@ -1018,15 +1018,11 @@ static void prep_ssp_v1_hw(struct hisi_hba *hisi_hba,
 
        buf_cmd = hisi_sas_cmd_hdr_addr_mem(slot) +
                sizeof(struct ssp_frame_hdr);
-       if (task->ssp_task.enable_first_burst) {
-               fburst = (1 << 7);
-               dw2 |= 1 << CMD_HDR_FIRST_BURST_OFF;
-       }
        hdr->dw2 = cpu_to_le32(dw2);
 
        memcpy(buf_cmd, &task->ssp_task.LUN, 8);
        if (!tmf) {
-               buf_cmd[9] = fburst | task->ssp_task.task_attr |
+               buf_cmd[9] = task->ssp_task.task_attr |
                                (task->ssp_task.task_prio << 3);
                memcpy(buf_cmd + 12, task->ssp_task.cmd->cmnd,
                                task->ssp_task.cmd->cmd_len);

diff --git a/drivers/scsi/mvsas/mv_sas.c b/drivers/scsi/mvsas/mv_sas.c
index 9978c424214cda590152c65ca5ea6d8c541dd69b..165f46320bd2d217a15d20d4bd650618b92ef0af 100644 (file)
--- a/drivers/scsi/mvsas/mv_sas.c
+++ b/drivers/scsi/mvsas/mv_sas.c
@@ -564,7 +564,7 @@ static int mvs_task_prep_ssp(struct mvs_info *mvi,
        void *buf_prd;
        struct ssp_frame_hdr *ssp_hdr;
        void *buf_tmp;
-       u8 *buf_cmd, *buf_oaf, fburst = 0;
+       u8 *buf_cmd, *buf_oaf;
        dma_addr_t buf_tmp_dma;
        u32 flags;
        u32 resp_len, req_len, i, tag = tei->tag;
@@ -582,10 +582,6 @@ static int mvs_task_prep_ssp(struct mvs_info *mvi,
                                (phy_mask << TXQ_PHY_SHIFT));
 
        flags = MCH_RETRY;
-       if (task->ssp_task.enable_first_burst) {
-               flags |= MCH_FBURST;
-               fburst = (1 << 7);
-       }
        if (is_tmf)
                flags |= (MCH_SSP_FR_TASK << MCH_SSP_FR_TYPE_SHIFT);
        else
@@ -667,7 +663,7 @@ static int mvs_task_prep_ssp(struct mvs_info *mvi,
        memcpy(buf_cmd, &task->ssp_task.LUN, 8);
 
        if (ssp_hdr->frame_type != SSP_TASK) {
-               buf_cmd[9] = fburst | task->ssp_task.task_attr |
+               buf_cmd[9] = task->ssp_task.task_attr |
                                (task->ssp_task.task_prio << 3);
                memcpy(buf_cmd + 12, task->ssp_task.cmd->cmnd,
                       task->ssp_task.cmd->cmd_len);

diff --git a/drivers/scsi/pm8001/pm8001_hwi.c b/drivers/scsi/pm8001/pm8001_hwi.c
index 73cd25f30ca580b2941622a9b6d6b0b36edbfe4b..18070e0e06d56417091f1197ea70d2923f4d51e0 100644 (file)
--- a/drivers/scsi/pm8001/pm8001_hwi.c
+++ b/drivers/scsi/pm8001/pm8001_hwi.c
@@ -4053,8 +4053,6 @@ static int pm8001_chip_ssp_io_req(struct pm8001_hba_info *pm8001_ha,
        ssp_cmd.data_len = cpu_to_le32(task->total_xfer_len);
        ssp_cmd.device_id = cpu_to_le32(pm8001_dev->device_id);
        ssp_cmd.tag = cpu_to_le32(tag);
-       if (task->ssp_task.enable_first_burst)
-               ssp_cmd.ssp_iu.efb_prio_attr |= 0x80;
        ssp_cmd.ssp_iu.efb_prio_attr |= (task->ssp_task.task_prio << 3);
        ssp_cmd.ssp_iu.efb_prio_attr |= (task->ssp_task.task_attr & 7);
        memcpy(ssp_cmd.ssp_iu.cdb, task->ssp_task.cmd->cmnd,

diff --git a/drivers/scsi/pm8001/pm80xx_hwi.c b/drivers/scsi/pm8001/pm80xx_hwi.c
index 39a12ee94a72ffe68d2ff3784af12ae18da1a401..ad5a73b86415228af1e012aa7bd587caa6dd93ed 100644 (file)
--- a/drivers/scsi/pm8001/pm80xx_hwi.c
+++ b/drivers/scsi/pm8001/pm80xx_hwi.c
@@ -4316,8 +4316,6 @@ static int pm80xx_chip_ssp_io_req(struct pm8001_hba_info *pm8001_ha,
        ssp_cmd.data_len = cpu_to_le32(task->total_xfer_len);
        ssp_cmd.device_id = cpu_to_le32(pm8001_dev->device_id);
        ssp_cmd.tag = cpu_to_le32(tag);
-       if (task->ssp_task.enable_first_burst)
-               ssp_cmd.ssp_iu.efb_prio_attr = 0x80;
        ssp_cmd.ssp_iu.efb_prio_attr |= (task->ssp_task.task_prio << 3);
        ssp_cmd.ssp_iu.efb_prio_attr |= (task->ssp_task.task_attr & 7);
        memcpy(ssp_cmd.ssp_iu.cdb, task->ssp_task.cmd->cmnd,

diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
index d8222c4426405d5af498d974a8f828f4c5edaa2d..d77db53cbd8d88c51948b39f8f388c71296ce83e 100644 (file)
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
@@ -564,7 +564,6 @@ enum task_attribute {
 
 struct sas_ssp_task {
        u8     LUN[8];
-       u8     enable_first_burst:1;
        enum   task_attribute task_attr;
        u8     task_prio;
        struct scsi_cmnd *cmd;