Skip to content

Commit ebf26e9

Browse files
johnpgarrymartinkpetersen
authored andcommitted
scsi: libsas: Delete sas_ssp_task.enable_first_burst
Since libsas was introduced in commit 2908d77 ("[SCSI] aic94xx: new driver"), sas_ssp_task.enable_first_burst is never set, so delete it and any references. Signed-off-by: John Garry <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Damien Le Moal <[email protected]> Reviewed-by: Jason Yan <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
1 parent 31d9061 commit ebf26e9

File tree

6 files changed

+4
-19
lines changed

6 files changed

+4
-19
lines changed

drivers/scsi/aic94xx/aic94xx_task.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -485,8 +485,6 @@ static int asd_build_ssp_ascb(struct asd_ascb *ascb, struct sas_task *task,
485485
scb->ssp_task.ssp_frame.tptt = cpu_to_be16(0xFFFF);
486486

487487
memcpy(scb->ssp_task.ssp_cmd.lun, task->ssp_task.LUN, 8);
488-
if (task->ssp_task.enable_first_burst)
489-
scb->ssp_task.ssp_cmd.efb_prio_attr |= EFB_MASK;
490488
scb->ssp_task.ssp_cmd.efb_prio_attr |= (task->ssp_task.task_prio << 3);
491489
scb->ssp_task.ssp_cmd.efb_prio_attr |= (task->ssp_task.task_attr & 7);
492490
memcpy(scb->ssp_task.ssp_cmd.cdb, task->ssp_task.cmd->cmnd,

drivers/scsi/hisi_sas/hisi_sas_v1_hw.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -960,7 +960,7 @@ static void prep_ssp_v1_hw(struct hisi_hba *hisi_hba,
960960
struct scsi_cmnd *scsi_cmnd = ssp_task->cmd;
961961
struct sas_tmf_task *tmf = slot->tmf;
962962
int has_data = 0, priority = !!tmf;
963-
u8 *buf_cmd, fburst = 0;
963+
u8 *buf_cmd;
964964
u32 dw1, dw2;
965965

966966
/* create header */
@@ -1018,15 +1018,11 @@ static void prep_ssp_v1_hw(struct hisi_hba *hisi_hba,
10181018

10191019
buf_cmd = hisi_sas_cmd_hdr_addr_mem(slot) +
10201020
sizeof(struct ssp_frame_hdr);
1021-
if (task->ssp_task.enable_first_burst) {
1022-
fburst = (1 << 7);
1023-
dw2 |= 1 << CMD_HDR_FIRST_BURST_OFF;
1024-
}
10251021
hdr->dw2 = cpu_to_le32(dw2);
10261022

10271023
memcpy(buf_cmd, &task->ssp_task.LUN, 8);
10281024
if (!tmf) {
1029-
buf_cmd[9] = fburst | task->ssp_task.task_attr |
1025+
buf_cmd[9] = task->ssp_task.task_attr |
10301026
(task->ssp_task.task_prio << 3);
10311027
memcpy(buf_cmd + 12, task->ssp_task.cmd->cmnd,
10321028
task->ssp_task.cmd->cmd_len);

drivers/scsi/mvsas/mv_sas.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ static int mvs_task_prep_ssp(struct mvs_info *mvi,
564564
void *buf_prd;
565565
struct ssp_frame_hdr *ssp_hdr;
566566
void *buf_tmp;
567-
u8 *buf_cmd, *buf_oaf, fburst = 0;
567+
u8 *buf_cmd, *buf_oaf;
568568
dma_addr_t buf_tmp_dma;
569569
u32 flags;
570570
u32 resp_len, req_len, i, tag = tei->tag;
@@ -582,10 +582,6 @@ static int mvs_task_prep_ssp(struct mvs_info *mvi,
582582
(phy_mask << TXQ_PHY_SHIFT));
583583

584584
flags = MCH_RETRY;
585-
if (task->ssp_task.enable_first_burst) {
586-
flags |= MCH_FBURST;
587-
fburst = (1 << 7);
588-
}
589585
if (is_tmf)
590586
flags |= (MCH_SSP_FR_TASK << MCH_SSP_FR_TYPE_SHIFT);
591587
else
@@ -667,7 +663,7 @@ static int mvs_task_prep_ssp(struct mvs_info *mvi,
667663
memcpy(buf_cmd, &task->ssp_task.LUN, 8);
668664

669665
if (ssp_hdr->frame_type != SSP_TASK) {
670-
buf_cmd[9] = fburst | task->ssp_task.task_attr |
666+
buf_cmd[9] = task->ssp_task.task_attr |
671667
(task->ssp_task.task_prio << 3);
672668
memcpy(buf_cmd + 12, task->ssp_task.cmd->cmnd,
673669
task->ssp_task.cmd->cmd_len);

drivers/scsi/pm8001/pm8001_hwi.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4053,8 +4053,6 @@ static int pm8001_chip_ssp_io_req(struct pm8001_hba_info *pm8001_ha,
40534053
ssp_cmd.data_len = cpu_to_le32(task->total_xfer_len);
40544054
ssp_cmd.device_id = cpu_to_le32(pm8001_dev->device_id);
40554055
ssp_cmd.tag = cpu_to_le32(tag);
4056-
if (task->ssp_task.enable_first_burst)
4057-
ssp_cmd.ssp_iu.efb_prio_attr |= 0x80;
40584056
ssp_cmd.ssp_iu.efb_prio_attr |= (task->ssp_task.task_prio << 3);
40594057
ssp_cmd.ssp_iu.efb_prio_attr |= (task->ssp_task.task_attr & 7);
40604058
memcpy(ssp_cmd.ssp_iu.cdb, task->ssp_task.cmd->cmnd,

drivers/scsi/pm8001/pm80xx_hwi.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4316,8 +4316,6 @@ static int pm80xx_chip_ssp_io_req(struct pm8001_hba_info *pm8001_ha,
43164316
ssp_cmd.data_len = cpu_to_le32(task->total_xfer_len);
43174317
ssp_cmd.device_id = cpu_to_le32(pm8001_dev->device_id);
43184318
ssp_cmd.tag = cpu_to_le32(tag);
4319-
if (task->ssp_task.enable_first_burst)
4320-
ssp_cmd.ssp_iu.efb_prio_attr = 0x80;
43214319
ssp_cmd.ssp_iu.efb_prio_attr |= (task->ssp_task.task_prio << 3);
43224320
ssp_cmd.ssp_iu.efb_prio_attr |= (task->ssp_task.task_attr & 7);
43234321
memcpy(ssp_cmd.ssp_iu.cdb, task->ssp_task.cmd->cmnd,

include/scsi/libsas.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,6 @@ enum task_attribute {
564564

565565
struct sas_ssp_task {
566566
u8 LUN[8];
567-
u8 enable_first_burst:1;
568567
enum task_attribute task_attr;
569568
u8 task_prio;
570569
struct scsi_cmnd *cmd;

0 commit comments

Comments
 (0)