Skip to content

Commit df64d3c

Browse files
James BottomleyJames Bottomley
James Bottomley
authored and
James Bottomley
committed
[SCSI] Unify SAM_ and SAM_STAT_ macros
We have two separate definitions for identical constants with nearly the same name. One comes from the generic headers in scsi.h; the other is an enum in libsas.h ... it's causing confusion about which one is correct (fortunately they both are). Fix this by eliminating the libsas.h duplicate Signed-off-by: James Bottomley <James.Bottomley@suse.de>
1 parent 653c42d commit df64d3c

File tree

9 files changed

+31
-40
lines changed

9 files changed

+31
-40
lines changed

‎drivers/scsi/aic94xx/aic94xx_task.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ static void asd_task_tasklet_complete(struct asd_ascb *ascb,
223223
switch (opcode) {
224224
case TC_NO_ERROR:
225225
ts->resp = SAS_TASK_COMPLETE;
226-
ts->stat = SAM_GOOD;
226+
ts->stat = SAM_STAT_GOOD;
227227
break;
228228
case TC_UNDERRUN:
229229
ts->resp = SAS_TASK_COMPLETE;

‎drivers/scsi/libsas/sas_ata.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ static enum ata_completion_errors sas_to_ata_err(struct task_status_struct *ts)
7171
case SAS_SG_ERR:
7272
return AC_ERR_INVALID;
7373

74-
case SAM_CHECK_COND:
74+
case SAM_STAT_CHECK_CONDITION:
7575
case SAS_OPEN_TO:
7676
case SAS_OPEN_REJECT:
7777
SAS_DPRINTK("%s: Saw error %d. What to do?\n",
@@ -107,7 +107,7 @@ static void sas_ata_task_done(struct sas_task *task)
107107
sas_ha = dev->port->ha;
108108

109109
spin_lock_irqsave(dev->sata_dev.ap->lock, flags);
110-
if (stat->stat == SAS_PROTO_RESPONSE || stat->stat == SAM_GOOD) {
110+
if (stat->stat == SAS_PROTO_RESPONSE || stat->stat == SAM_STAT_GOOD) {
111111
ata_tf_from_fis(resp->ending_fis, &dev->sata_dev.tf);
112112
qc->err_mask |= ac_err_mask(dev->sata_dev.tf.command);
113113
dev->sata_dev.sstatus = resp->sstatus;
@@ -511,12 +511,12 @@ static int sas_execute_task(struct sas_task *task, void *buffer, int size,
511511
goto ex_err;
512512
}
513513
}
514-
if (task->task_status.stat == SAM_BUSY ||
515-
task->task_status.stat == SAM_TASK_SET_FULL ||
514+
if (task->task_status.stat == SAM_STAT_BUSY ||
515+
task->task_status.stat == SAM_STAT_TASK_SET_FULL ||
516516
task->task_status.stat == SAS_QUEUE_FULL) {
517517
SAS_DPRINTK("task: q busy, sleeping...\n");
518518
schedule_timeout_interruptible(HZ);
519-
} else if (task->task_status.stat == SAM_CHECK_COND) {
519+
} else if (task->task_status.stat == SAM_STAT_CHECK_CONDITION) {
520520
struct scsi_sense_hdr shdr;
521521

522522
if (!scsi_normalize_sense(ts->buf, ts->buf_valid_size,
@@ -549,7 +549,7 @@ static int sas_execute_task(struct sas_task *task, void *buffer, int size,
549549
shdr.asc, shdr.ascq);
550550
}
551551
} else if (task->task_status.resp != SAS_TASK_COMPLETE ||
552-
task->task_status.stat != SAM_GOOD) {
552+
task->task_status.stat != SAM_STAT_GOOD) {
553553
SAS_DPRINTK("task finished with resp:0x%x, "
554554
"stat:0x%x\n",
555555
task->task_status.resp,

‎drivers/scsi/libsas/sas_expander.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ static int smp_execute_task(struct domain_device *dev, void *req, int req_size,
107107
}
108108
}
109109
if (task->task_status.resp == SAS_TASK_COMPLETE &&
110-
task->task_status.stat == SAM_GOOD) {
110+
task->task_status.stat == SAM_STAT_GOOD) {
111111
res = 0;
112112
break;
113113
} if (task->task_status.resp == SAS_TASK_COMPLETE &&

‎drivers/scsi/libsas/sas_scsi_host.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,10 @@ static void sas_scsi_task_done(struct sas_task *task)
113113
case SAS_ABORTED_TASK:
114114
hs = DID_ABORT;
115115
break;
116-
case SAM_CHECK_COND:
116+
case SAM_STAT_CHECK_CONDITION:
117117
memcpy(sc->sense_buffer, ts->buf,
118118
min(SCSI_SENSE_BUFFERSIZE, ts->buf_valid_size));
119-
stat = SAM_CHECK_COND;
119+
stat = SAM_STAT_CHECK_CONDITION;
120120
break;
121121
default:
122122
stat = ts->stat;

‎drivers/scsi/libsas/sas_task.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ void sas_ssp_task_response(struct device *dev, struct sas_task *task,
1515
else if (iu->datapres == 1)
1616
tstat->stat = iu->resp_data[3];
1717
else if (iu->datapres == 2) {
18-
tstat->stat = SAM_CHECK_COND;
18+
tstat->stat = SAM_STAT_CHECK_CONDITION;
1919
tstat->buf_valid_size =
2020
min_t(int, SAS_STATUS_BUF_SIZE,
2121
be32_to_cpu(iu->sense_data_len));
2222
memcpy(tstat->buf, iu->sense_data, tstat->buf_valid_size);
2323

24-
if (iu->status != SAM_CHECK_COND)
24+
if (iu->status != SAM_STAT_CHECK_CONDITION)
2525
dev_printk(KERN_WARNING, dev,
2626
"dev %llx sent sense data, but "
2727
"stat(%x) is not CHECK CONDITION\n",
@@ -30,7 +30,7 @@ void sas_ssp_task_response(struct device *dev, struct sas_task *task,
3030
}
3131
else
3232
/* when datapres contains corrupt/unknown value... */
33-
tstat->stat = SAM_CHECK_COND;
33+
tstat->stat = SAM_STAT_CHECK_CONDITION;
3434
}
3535
EXPORT_SYMBOL_GPL(sas_ssp_task_response);
3636

‎drivers/scsi/mvsas/mv_sas.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1483,7 +1483,7 @@ static int mvs_exec_internal_tmf_task(struct domain_device *dev,
14831483
}
14841484

14851485
if (task->task_status.resp == SAS_TASK_COMPLETE &&
1486-
task->task_status.stat == SAM_GOOD) {
1486+
task->task_status.stat == SAM_STAT_GOOD) {
14871487
res = TMF_RESP_FUNC_COMPLETE;
14881488
break;
14891489
}
@@ -1758,7 +1758,7 @@ static int mvs_sata_done(struct mvs_info *mvi, struct sas_task *task,
17581758
struct mvs_device *mvi_dev = task->dev->lldd_dev;
17591759
struct task_status_struct *tstat = &task->task_status;
17601760
struct ata_task_resp *resp = (struct ata_task_resp *)tstat->buf;
1761-
int stat = SAM_GOOD;
1761+
int stat = SAM_STAT_GOOD;
17621762

17631763

17641764
resp->frame_len = sizeof(struct dev_to_host_fis);
@@ -1790,13 +1790,13 @@ static int mvs_slot_err(struct mvs_info *mvi, struct sas_task *task,
17901790

17911791
MVS_CHIP_DISP->command_active(mvi, slot_idx);
17921792

1793-
stat = SAM_CHECK_COND;
1793+
stat = SAM_STAT_CHECK_CONDITION;
17941794
switch (task->task_proto) {
17951795
case SAS_PROTOCOL_SSP:
17961796
stat = SAS_ABORTED_TASK;
17971797
break;
17981798
case SAS_PROTOCOL_SMP:
1799-
stat = SAM_CHECK_COND;
1799+
stat = SAM_STAT_CHECK_CONDITION;
18001800
break;
18011801

18021802
case SAS_PROTOCOL_SATA:
@@ -1881,7 +1881,7 @@ int mvs_slot_complete(struct mvs_info *mvi, u32 rx_desc, u32 flags)
18811881
case SAS_PROTOCOL_SSP:
18821882
/* hw says status == 0, datapres == 0 */
18831883
if (rx_desc & RXQ_GOOD) {
1884-
tstat->stat = SAM_GOOD;
1884+
tstat->stat = SAM_STAT_GOOD;
18851885
tstat->resp = SAS_TASK_COMPLETE;
18861886
}
18871887
/* response frame present */
@@ -1890,12 +1890,12 @@ int mvs_slot_complete(struct mvs_info *mvi, u32 rx_desc, u32 flags)
18901890
sizeof(struct mvs_err_info);
18911891
sas_ssp_task_response(mvi->dev, task, iu);
18921892
} else
1893-
tstat->stat = SAM_CHECK_COND;
1893+
tstat->stat = SAM_STAT_CHECK_CONDITION;
18941894
break;
18951895

18961896
case SAS_PROTOCOL_SMP: {
18971897
struct scatterlist *sg_resp = &task->smp_task.smp_resp;
1898-
tstat->stat = SAM_GOOD;
1898+
tstat->stat = SAM_STAT_GOOD;
18991899
to = kmap_atomic(sg_page(sg_resp), KM_IRQ0);
19001900
memcpy(to + sg_resp->offset,
19011901
slot->response + sizeof(struct mvs_err_info),
@@ -1912,7 +1912,7 @@ int mvs_slot_complete(struct mvs_info *mvi, u32 rx_desc, u32 flags)
19121912
}
19131913

19141914
default:
1915-
tstat->stat = SAM_CHECK_COND;
1915+
tstat->stat = SAM_STAT_CHECK_CONDITION;
19161916
break;
19171917
}
19181918
if (!slot->port->port_attached) {

‎drivers/scsi/pm8001/pm8001_hwi.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1480,7 +1480,7 @@ mpi_ssp_completion(struct pm8001_hba_info *pm8001_ha , void *piomb)
14801480
",param = %d \n", param));
14811481
if (param == 0) {
14821482
ts->resp = SAS_TASK_COMPLETE;
1483-
ts->stat = SAM_GOOD;
1483+
ts->stat = SAM_STAT_GOOD;
14841484
} else {
14851485
ts->resp = SAS_TASK_COMPLETE;
14861486
ts->stat = SAS_PROTO_RESPONSE;
@@ -1909,7 +1909,7 @@ mpi_sata_completion(struct pm8001_hba_info *pm8001_ha, void *piomb)
19091909
PM8001_IO_DBG(pm8001_ha, pm8001_printk("IO_SUCCESS\n"));
19101910
if (param == 0) {
19111911
ts->resp = SAS_TASK_COMPLETE;
1912-
ts->stat = SAM_GOOD;
1912+
ts->stat = SAM_STAT_GOOD;
19131913
} else {
19141914
u8 len;
19151915
ts->resp = SAS_TASK_COMPLETE;
@@ -2450,7 +2450,7 @@ mpi_smp_completion(struct pm8001_hba_info *pm8001_ha, void *piomb)
24502450
case IO_SUCCESS:
24512451
PM8001_IO_DBG(pm8001_ha, pm8001_printk("IO_SUCCESS\n"));
24522452
ts->resp = SAS_TASK_COMPLETE;
2453-
ts->stat = SAM_GOOD;
2453+
ts->stat = SAM_STAT_GOOD;
24542454
if (pm8001_dev)
24552455
pm8001_dev->running_req--;
24562456
break;
@@ -2479,19 +2479,19 @@ mpi_smp_completion(struct pm8001_hba_info *pm8001_ha, void *piomb)
24792479
PM8001_IO_DBG(pm8001_ha,
24802480
pm8001_printk("IO_ERROR_HW_TIMEOUT\n"));
24812481
ts->resp = SAS_TASK_COMPLETE;
2482-
ts->stat = SAM_BUSY;
2482+
ts->stat = SAM_STAT_BUSY;
24832483
break;
24842484
case IO_XFER_ERROR_BREAK:
24852485
PM8001_IO_DBG(pm8001_ha,
24862486
pm8001_printk("IO_XFER_ERROR_BREAK\n"));
24872487
ts->resp = SAS_TASK_COMPLETE;
2488-
ts->stat = SAM_BUSY;
2488+
ts->stat = SAM_STAT_BUSY;
24892489
break;
24902490
case IO_XFER_ERROR_PHY_NOT_READY:
24912491
PM8001_IO_DBG(pm8001_ha,
24922492
pm8001_printk("IO_XFER_ERROR_PHY_NOT_READY\n"));
24932493
ts->resp = SAS_TASK_COMPLETE;
2494-
ts->stat = SAM_BUSY;
2494+
ts->stat = SAM_STAT_BUSY;
24952495
break;
24962496
case IO_OPEN_CNX_ERROR_PROTOCOL_NOT_SUPPORTED:
24972497
PM8001_IO_DBG(pm8001_ha,
@@ -3260,7 +3260,7 @@ mpi_task_abort_resp(struct pm8001_hba_info *pm8001_ha, void *piomb)
32603260
case IO_SUCCESS:
32613261
PM8001_EH_DBG(pm8001_ha, pm8001_printk("IO_SUCCESS\n"));
32623262
ts->resp = SAS_TASK_COMPLETE;
3263-
ts->stat = SAM_GOOD;
3263+
ts->stat = SAM_STAT_GOOD;
32643264
break;
32653265
case IO_NOT_VALID:
32663266
PM8001_EH_DBG(pm8001_ha, pm8001_printk("IO_NOT_VALID\n"));

‎drivers/scsi/pm8001/pm8001_sas.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -763,7 +763,7 @@ static int pm8001_exec_internal_tmf_task(struct domain_device *dev,
763763
}
764764

765765
if (task->task_status.resp == SAS_TASK_COMPLETE &&
766-
task->task_status.stat == SAM_GOOD) {
766+
task->task_status.stat == SAM_STAT_GOOD) {
767767
res = TMF_RESP_FUNC_COMPLETE;
768768
break;
769769
}
@@ -853,7 +853,7 @@ pm8001_exec_internal_task_abort(struct pm8001_hba_info *pm8001_ha,
853853
}
854854

855855
if (task->task_status.resp == SAS_TASK_COMPLETE &&
856-
task->task_status.stat == SAM_GOOD) {
856+
task->task_status.stat == SAM_STAT_GOOD) {
857857
res = TMF_RESP_FUNC_COMPLETE;
858858
break;
859859

‎include/scsi/libsas.h‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -422,16 +422,7 @@ enum service_response {
422422
};
423423

424424
enum exec_status {
425-
SAM_GOOD = 0,
426-
SAM_CHECK_COND = 2,
427-
SAM_COND_MET = 4,
428-
SAM_BUSY = 8,
429-
SAM_INTERMEDIATE = 0x10,
430-
SAM_IM_COND_MET = 0x12,
431-
SAM_RESV_CONFLICT= 0x14,
432-
SAM_TASK_SET_FULL= 0x28,
433-
SAM_ACA_ACTIVE = 0x30,
434-
SAM_TASK_ABORTED = 0x40,
425+
/* The SAM_STAT_.. codes fit in the lower 6 bits */
435426

436427
SAS_DEV_NO_RESPONSE = 0x80,
437428
SAS_DATA_UNDERRUN,

0 commit comments

Comments
 (0)