Skip to content

Commit a8a0a13

Browse files
djbwdjbw
committed
isci: pare back error messsages
The messages emitted from task.c and some from request.c likely duplicate (in a less undertandable way) what is reported by the midlayer. Signed-off-by: Dan Williams <[email protected]>
1 parent dc00c8b commit a8a0a13

File tree

2 files changed

+28
-28
lines changed

2 files changed

+28
-28
lines changed

‎drivers/scsi/isci/request.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2350,7 +2350,7 @@ static void isci_task_save_for_upper_layer_completion(
23502350
/* No notification to libsas because this request is
23512351
* already in the abort path.
23522352
*/
2353-
dev_warn(&host->pdev->dev,
2353+
dev_dbg(&host->pdev->dev,
23542354
"%s: Aborted - task = %p, response=%d (%d), status=%d (%d)\n",
23552355
__func__,
23562356
task,
@@ -2373,7 +2373,7 @@ static void isci_task_save_for_upper_layer_completion(
23732373

23742374
case isci_perform_error_io_completion:
23752375
/* Use sas_task_abort */
2376-
dev_warn(&host->pdev->dev,
2376+
dev_dbg(&host->pdev->dev,
23772377
"%s: Error - task = %p, response=%d (%d), status=%d (%d)\n",
23782378
__func__,
23792379
task,
@@ -2385,7 +2385,7 @@ static void isci_task_save_for_upper_layer_completion(
23852385
break;
23862386

23872387
default:
2388-
dev_warn(&host->pdev->dev,
2388+
dev_dbg(&host->pdev->dev,
23892389
"%s: Unknown - task = %p, response=%d (%d), status=%d (%d)\n",
23902390
__func__,
23912391
task,
@@ -2710,7 +2710,7 @@ static void isci_request_io_request_complete(struct isci_host *ihost,
27102710

27112711
default:
27122712
/* Catch any otherwise unhandled error codes here. */
2713-
dev_warn(&ihost->pdev->dev,
2713+
dev_dbg(&ihost->pdev->dev,
27142714
"%s: invalid completion code: 0x%x - "
27152715
"isci_request = %p\n",
27162716
__func__, completion_status, request);
@@ -3164,7 +3164,7 @@ static enum sci_status isci_smp_request_build(struct isci_request *ireq)
31643164

31653165
status = sci_io_request_construct_smp(dev, ireq, task);
31663166
if (status != SCI_SUCCESS)
3167-
dev_warn(&ireq->isci_host->pdev->dev,
3167+
dev_dbg(&ireq->isci_host->pdev->dev,
31683168
"%s: failed with status = %d\n",
31693169
__func__,
31703170
status);
@@ -3219,7 +3219,7 @@ static enum sci_status isci_io_request_build(struct isci_host *ihost,
32193219
status = sci_io_request_construct(ihost, idev, request);
32203220

32213221
if (status != SCI_SUCCESS) {
3222-
dev_warn(&ihost->pdev->dev,
3222+
dev_dbg(&ihost->pdev->dev,
32233223
"%s: failed request construct\n",
32243224
__func__);
32253225
return SCI_FAILURE;
@@ -3238,7 +3238,7 @@ static enum sci_status isci_io_request_build(struct isci_host *ihost,
32383238
status = isci_request_stp_request_construct(request);
32393239
break;
32403240
default:
3241-
dev_warn(&ihost->pdev->dev,
3241+
dev_dbg(&ihost->pdev->dev,
32423242
"%s: unknown protocol\n", __func__);
32433243
return SCI_FAILURE;
32443244
}
@@ -3302,7 +3302,7 @@ int isci_request_execute(struct isci_host *ihost, struct isci_remote_device *ide
33023302

33033303
status = isci_io_request_build(ihost, ireq, idev);
33043304
if (status != SCI_SUCCESS) {
3305-
dev_warn(&ihost->pdev->dev,
3305+
dev_dbg(&ihost->pdev->dev,
33063306
"%s: request_construct failed - status = 0x%x\n",
33073307
__func__,
33083308
status);
@@ -3335,7 +3335,7 @@ int isci_request_execute(struct isci_host *ihost, struct isci_remote_device *ide
33353335

33363336
if (status != SCI_SUCCESS &&
33373337
status != SCI_FAILURE_REMOTE_DEVICE_RESET_REQUIRED) {
3338-
dev_warn(&ihost->pdev->dev,
3338+
dev_dbg(&ihost->pdev->dev,
33393339
"%s: failed request start (0x%x)\n",
33403340
__func__, status);
33413341
spin_unlock_irqrestore(&ihost->scic_lock, flags);

‎drivers/scsi/isci/task.c

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -104,15 +104,15 @@ static void isci_task_refuse(struct isci_host *ihost, struct sas_task *task,
104104
/* No notification because this request is already in the
105105
* abort path.
106106
*/
107-
dev_warn(&ihost->pdev->dev,
107+
dev_dbg(&ihost->pdev->dev,
108108
"%s: Aborted - task = %p, response=%d, "
109109
"status=%d\n",
110110
__func__, task, response, status);
111111
break;
112112

113113
case isci_perform_error_io_completion:
114114
/* Use sas_task_abort */
115-
dev_warn(&ihost->pdev->dev,
115+
dev_dbg(&ihost->pdev->dev,
116116
"%s: Error - task = %p, response=%d, "
117117
"status=%d\n",
118118
__func__, task, response, status);
@@ -121,7 +121,7 @@ static void isci_task_refuse(struct isci_host *ihost, struct sas_task *task,
121121
break;
122122

123123
default:
124-
dev_warn(&ihost->pdev->dev,
124+
dev_dbg(&ihost->pdev->dev,
125125
"%s: isci task notification default case!",
126126
__func__);
127127
sas_task_abort(task);
@@ -374,7 +374,7 @@ static int isci_task_execute_tmf(struct isci_host *ihost,
374374
status = sci_controller_start_task(ihost, idev, ireq);
375375

376376
if (status != SCI_TASK_SUCCESS) {
377-
dev_warn(&ihost->pdev->dev,
377+
dev_dbg(&ihost->pdev->dev,
378378
"%s: start_io failed - status = 0x%x, request = %p\n",
379379
__func__,
380380
status,
@@ -604,7 +604,7 @@ static void isci_terminate_request_core(struct isci_host *ihost,
604604
* being aborted.
605605
*/
606606
if (status != SCI_SUCCESS) {
607-
dev_err(&ihost->pdev->dev,
607+
dev_dbg(&ihost->pdev->dev,
608608
"%s: sci_controller_terminate_request"
609609
" returned = 0x%x\n",
610610
__func__, status);
@@ -662,7 +662,7 @@ static void isci_terminate_request_core(struct isci_host *ihost,
662662

663663
if (!termination_completed) {
664664

665-
dev_err(&ihost->pdev->dev,
665+
dev_dbg(&ihost->pdev->dev,
666666
"%s: *** Timeout waiting for "
667667
"termination(%p/%p)\n",
668668
__func__, io_request_completion,
@@ -853,7 +853,7 @@ static int isci_task_send_lu_reset_sata(struct isci_host *ihost,
853853
ret = isci_task_execute_tmf(ihost, idev, &tmf, ISCI_SRST_TIMEOUT_MS);
854854

855855
if (ret != TMF_RESP_FUNC_COMPLETE) {
856-
dev_warn(&ihost->pdev->dev,
856+
dev_dbg(&ihost->pdev->dev,
857857
"%s: Assert SRST failed (%p) = %x",
858858
__func__, idev, ret);
859859

@@ -897,7 +897,7 @@ int isci_task_lu_reset(struct domain_device *domain_device, u8 *lun)
897897
*/
898898
if (!isci_device ||
899899
isci_device_is_reset_pending(isci_host, isci_device)) {
900-
dev_warn(&isci_host->pdev->dev,
900+
dev_dbg(&isci_host->pdev->dev,
901901
"%s: No dev (%p), or "
902902
"RESET PENDING: domain_device=%p\n",
903903
__func__, isci_device, domain_device);
@@ -970,7 +970,7 @@ static void isci_abort_task_process_cb(
970970
*/
971971
if ((old_request->status != aborted)
972972
&& (old_request->status != completed))
973-
dev_err(&old_request->isci_host->pdev->dev,
973+
dev_dbg(&old_request->isci_host->pdev->dev,
974974
"%s: Bad request status (%d): tmf=%p, old_request=%p\n",
975975
__func__, old_request->status, tmf, old_request);
976976
break;
@@ -988,7 +988,7 @@ static void isci_abort_task_process_cb(
988988
break;
989989

990990
default:
991-
dev_err(&old_request->isci_host->pdev->dev,
991+
dev_dbg(&old_request->isci_host->pdev->dev,
992992
"%s: Bad cb_state (%d): tmf=%p, old_request=%p\n",
993993
__func__, cb_state, tmf, old_request);
994994
break;
@@ -1046,7 +1046,7 @@ int isci_task_abort_task(struct sas_task *task)
10461046
* SCSI error handler thread to escalate to LUN reset
10471047
*/
10481048
if (sas_protocol_ata(task->task_proto)) {
1049-
dev_warn(&isci_host->pdev->dev,
1049+
dev_dbg(&isci_host->pdev->dev,
10501050
" task %p is for a STP/SATA device;"
10511051
" returning TMF_RESP_FUNC_FAILED\n"
10521052
" to cause a LUN reset...\n", task);
@@ -1176,7 +1176,7 @@ int isci_task_abort_task(struct sas_task *task)
11761176
ISCI_ABORT_TASK_TIMEOUT_MS);
11771177

11781178
if (ret != TMF_RESP_FUNC_COMPLETE)
1179-
dev_err(&isci_host->pdev->dev,
1179+
dev_dbg(&isci_host->pdev->dev,
11801180
"%s: isci_task_send_tmf failed\n",
11811181
__func__);
11821182
}
@@ -1395,7 +1395,7 @@ static int isci_smp_execute_task(struct isci_host *ihost,
13951395

13961396
if (res) {
13971397
del_timer(&task->timer);
1398-
dev_err(&ihost->pdev->dev,
1398+
dev_dbg(&ihost->pdev->dev,
13991399
"%s: executing SMP task failed:%d\n",
14001400
__func__, res);
14011401
goto ex_err;
@@ -1404,12 +1404,12 @@ static int isci_smp_execute_task(struct isci_host *ihost,
14041404
wait_for_completion(&task->completion);
14051405
res = -ECOMM;
14061406
if ((task->task_state_flags & SAS_TASK_STATE_ABORTED)) {
1407-
dev_err(&ihost->pdev->dev,
1407+
dev_dbg(&ihost->pdev->dev,
14081408
"%s: smp task timed out or aborted\n",
14091409
__func__);
14101410
isci_task_abort_task(task);
14111411
if (!(task->task_state_flags & SAS_TASK_STATE_DONE)) {
1412-
dev_err(&ihost->pdev->dev,
1412+
dev_dbg(&ihost->pdev->dev,
14131413
"%s: SMP task aborted and not done\n",
14141414
__func__);
14151415
goto ex_err;
@@ -1432,7 +1432,7 @@ static int isci_smp_execute_task(struct isci_host *ihost,
14321432
res = -EMSGSIZE;
14331433
break;
14341434
} else {
1435-
dev_err(&ihost->pdev->dev,
1435+
dev_dbg(&ihost->pdev->dev,
14361436
"%s: task to dev %016llx response: 0x%x "
14371437
"status 0x%x\n", __func__,
14381438
SAS_ADDR(dev->sas_addr),
@@ -1526,7 +1526,7 @@ static void isci_wait_for_smp_phy_reset(struct isci_remote_device *idev, int phy
15261526
tmo = deadline - jiffies;
15271527

15281528
if (res) {
1529-
dev_warn(&ihost->pdev->dev,
1529+
dev_dbg(&ihost->pdev->dev,
15301530
"%s: iteration %d, phase %d:"
15311531
" SMP error=%d, time_remaining=%lu\n",
15321532
__func__, iteration, phy_state, res, tmo);
@@ -1578,7 +1578,7 @@ static int isci_reset_device(struct isci_host *ihost,
15781578
if (status != SCI_SUCCESS) {
15791579
spin_unlock_irqrestore(&ihost->scic_lock, flags);
15801580

1581-
dev_warn(&ihost->pdev->dev,
1581+
dev_dbg(&ihost->pdev->dev,
15821582
"%s: sci_remote_device_reset(%p) returned %d!\n",
15831583
__func__, idev, status);
15841584

@@ -1619,7 +1619,7 @@ static int isci_reset_device(struct isci_host *ihost,
16191619
}
16201620

16211621
if (status != SCI_SUCCESS) {
1622-
dev_warn(&ihost->pdev->dev,
1622+
dev_dbg(&ihost->pdev->dev,
16231623
"%s: sci_remote_device_reset_complete(%p) "
16241624
"returned %d!\n", __func__, idev, status);
16251625
}

0 commit comments

Comments
 (0)