update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/scsi/pm8001/pm8001_hwi.c
..
..
@@ -1881,7 +1881,7 @@
1881
1881
 			   param);
1882
1882
 		if (param == 0) {
1883
1883
 			ts->resp = SAS_TASK_COMPLETE;
1884
-			ts->stat = SAM_STAT_GOOD;
1884
+			ts->stat = SAS_SAM_STAT_GOOD;
1885
1885
 		} else {
1886
1886
 			ts->resp = SAS_TASK_COMPLETE;
1887
1887
 			ts->stat = SAS_PROTO_RESPONSE;
..
..
@@ -2341,7 +2341,7 @@
2341
2341
 		pm8001_dbg(pm8001_ha, IO, "IO_SUCCESS\n");
2342
2342
 		if (param == 0) {
2343
2343
 			ts->resp = SAS_TASK_COMPLETE;
2344
-			ts->stat = SAM_STAT_GOOD;
2344
+			ts->stat = SAS_SAM_STAT_GOOD;
2345
2345
 			/* check if response is for SEND READ LOG */
2346
2346
 			if (pm8001_dev &&
2347
2347
 				(pm8001_dev->id & NCQ_READ_LOG_FLAG)) {
..
..
@@ -2864,7 +2864,7 @@
2864
2864
 	case IO_SUCCESS:
2865
2865
 		pm8001_dbg(pm8001_ha, IO, "IO_SUCCESS\n");
2866
2866
 		ts->resp = SAS_TASK_COMPLETE;
2867
-		ts->stat = SAM_STAT_GOOD;
2867
+		ts->stat = SAS_SAM_STAT_GOOD;
2868
2868
 		if (pm8001_dev)
2869
2869
 			atomic_dec(&pm8001_dev->running_req);
2870
2870
 		break;
..
..
@@ -2891,17 +2891,17 @@
2891
2891
 	case IO_ERROR_HW_TIMEOUT:
2892
2892
 		pm8001_dbg(pm8001_ha, IO, "IO_ERROR_HW_TIMEOUT\n");
2893
2893
 		ts->resp = SAS_TASK_COMPLETE;
2894
-		ts->stat = SAM_STAT_BUSY;
2894
+		ts->stat = SAS_SAM_STAT_BUSY;
2895
2895
 		break;
2896
2896
 	case IO_XFER_ERROR_BREAK:
2897
2897
 		pm8001_dbg(pm8001_ha, IO, "IO_XFER_ERROR_BREAK\n");
2898
2898
 		ts->resp = SAS_TASK_COMPLETE;
2899
-		ts->stat = SAM_STAT_BUSY;
2899
+		ts->stat = SAS_SAM_STAT_BUSY;
2900
2900
 		break;
2901
2901
 	case IO_XFER_ERROR_PHY_NOT_READY:
2902
2902
 		pm8001_dbg(pm8001_ha, IO, "IO_XFER_ERROR_PHY_NOT_READY\n");
2903
2903
 		ts->resp = SAS_TASK_COMPLETE;
2904
-		ts->stat = SAM_STAT_BUSY;
2904
+		ts->stat = SAS_SAM_STAT_BUSY;
2905
2905
 		break;
2906
2906
 	case IO_OPEN_CNX_ERROR_PROTOCOL_NOT_SUPPORTED:
2907
2907
 		pm8001_dbg(pm8001_ha, IO,
..
..
@@ -3656,7 +3656,7 @@
3656
3656
 	case IO_SUCCESS:
3657
3657
 		pm8001_dbg(pm8001_ha, EH, "IO_SUCCESS\n");
3658
3658
 		ts->resp = SAS_TASK_COMPLETE;
3659
-		ts->stat = SAM_STAT_GOOD;
3659
+		ts->stat = SAS_SAM_STAT_GOOD;
3660
3660
 		break;
3661
3661
 	case IO_NOT_VALID:
3662
3662
 		pm8001_dbg(pm8001_ha, EH, "IO_NOT_VALID\n");
..
..
@@ -4288,7 +4288,7 @@
4288
4288
 
4289
4289
 			spin_lock_irqsave(&task->task_state_lock, flags);
4290
4290
 			ts->resp = SAS_TASK_COMPLETE;
4291
-			ts->stat = SAM_STAT_GOOD;
4291
+			ts->stat = SAS_SAM_STAT_GOOD;
4292
4292
 			task->task_state_flags &= ~SAS_TASK_STATE_PENDING;
4293
4293
 			task->task_state_flags &= ~SAS_TASK_AT_INITIATOR;
4294
4294
 			task->task_state_flags |= SAS_TASK_STATE_DONE;
..
..
@@ -4344,7 +4344,7 @@
4344
4344
 	payload.sas_identify.dev_type = SAS_END_DEVICE;
4345
4345
 	payload.sas_identify.initiator_bits = SAS_PROTOCOL_ALL;
4346
4346
 	memcpy(payload.sas_identify.sas_addr,
4347
-		pm8001_ha->sas_addr, SAS_ADDR_SIZE);
4347
+		&pm8001_ha->phy[phy_id].dev_sas_addr, SAS_ADDR_SIZE);
4348
4348
 	payload.sas_identify.phy_id = phy_id;
4349
4349
 	ret = pm8001_mpi_build_cmd(pm8001_ha, circularQ, opcode, &payload,
4350
4350
 			sizeof(payload), 0);