update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/scsi/pm8001/pm80xx_hwi.c
..
..
@@ -1916,7 +1916,7 @@
1916
1916
 			   param);
1917
1917
 		if (param == 0) {
1918
1918
 			ts->resp = SAS_TASK_COMPLETE;
1919
-			ts->stat = SAM_STAT_GOOD;
1919
+			ts->stat = SAS_SAM_STAT_GOOD;
1920
1920
 		} else {
1921
1921
 			ts->resp = SAS_TASK_COMPLETE;
1922
1922
 			ts->stat = SAS_PROTO_RESPONSE;
..
..
@@ -2450,7 +2450,7 @@
2450
2450
 		pm8001_dbg(pm8001_ha, IO, "IO_SUCCESS\n");
2451
2451
 		if (param == 0) {
2452
2452
 			ts->resp = SAS_TASK_COMPLETE;
2453
-			ts->stat = SAM_STAT_GOOD;
2453
+			ts->stat = SAS_SAM_STAT_GOOD;
2454
2454
 			/* check if response is for SEND READ LOG */
2455
2455
 			if (pm8001_dev &&
2456
2456
 				(pm8001_dev->id & NCQ_READ_LOG_FLAG)) {
..
..
@@ -3004,7 +3004,7 @@
3004
3004
 	case IO_SUCCESS:
3005
3005
 		pm8001_dbg(pm8001_ha, IO, "IO_SUCCESS\n");
3006
3006
 		ts->resp = SAS_TASK_COMPLETE;
3007
-		ts->stat = SAM_STAT_GOOD;
3007
+		ts->stat = SAS_SAM_STAT_GOOD;
3008
3008
 		if (pm8001_dev)
3009
3009
 			atomic_dec(&pm8001_dev->running_req);
3010
3010
 		if (pm8001_ha->smp_exp_mode == SMP_DIRECT) {
..
..
@@ -3046,17 +3046,17 @@
3046
3046
 	case IO_ERROR_HW_TIMEOUT:
3047
3047
 		pm8001_dbg(pm8001_ha, IO, "IO_ERROR_HW_TIMEOUT\n");
3048
3048
 		ts->resp = SAS_TASK_COMPLETE;
3049
-		ts->stat = SAM_STAT_BUSY;
3049
+		ts->stat = SAS_SAM_STAT_BUSY;
3050
3050
 		break;
3051
3051
 	case IO_XFER_ERROR_BREAK:
3052
3052
 		pm8001_dbg(pm8001_ha, IO, "IO_XFER_ERROR_BREAK\n");
3053
3053
 		ts->resp = SAS_TASK_COMPLETE;
3054
-		ts->stat = SAM_STAT_BUSY;
3054
+		ts->stat = SAS_SAM_STAT_BUSY;
3055
3055
 		break;
3056
3056
 	case IO_XFER_ERROR_PHY_NOT_READY:
3057
3057
 		pm8001_dbg(pm8001_ha, IO, "IO_XFER_ERROR_PHY_NOT_READY\n");
3058
3058
 		ts->resp = SAS_TASK_COMPLETE;
3059
-		ts->stat = SAM_STAT_BUSY;
3059
+		ts->stat = SAS_SAM_STAT_BUSY;
3060
3060
 		break;
3061
3061
 	case IO_OPEN_CNX_ERROR_PROTOCOL_NOT_SUPPORTED:
3062
3062
 		pm8001_dbg(pm8001_ha, IO,
..
..
@@ -3722,10 +3722,12 @@
3722
3722
 			(struct set_ctrl_cfg_resp *)(piomb + 4);
3723
3723
 	u32 status = le32_to_cpu(pPayload->status);
3724
3724
 	u32 err_qlfr_pgcd = le32_to_cpu(pPayload->err_qlfr_pgcd);
3725
+	u32 tag = le32_to_cpu(pPayload->tag);
3725
3726
 
3726
3727
 	pm8001_dbg(pm8001_ha, MSG,
3727
3728
 		   "SET CONTROLLER RESP: status 0x%x qlfr_pgcd 0x%x\n",
3728
3729
 		   status, err_qlfr_pgcd);
3730
+	pm8001_tag_free(pm8001_ha, tag);
3729
3731
 
3730
3732
 	return 0;
3731
3733
 }
..
..
@@ -4679,7 +4681,7 @@
4679
4681
 
4680
4682
 			spin_lock_irqsave(&task->task_state_lock, flags);
4681
4683
 			ts->resp = SAS_TASK_COMPLETE;
4682
-			ts->stat = SAM_STAT_GOOD;
4684
+			ts->stat = SAS_SAM_STAT_GOOD;
4683
4685
 			task->task_state_flags &= ~SAS_TASK_STATE_PENDING;
4684
4686
 			task->task_state_flags &= ~SAS_TASK_AT_INITIATOR;
4685
4687
 			task->task_state_flags |= SAS_TASK_STATE_DONE;
..
..
@@ -4741,7 +4743,7 @@
4741
4743
 	payload.sas_identify.dev_type = SAS_END_DEVICE;
4742
4744
 	payload.sas_identify.initiator_bits = SAS_PROTOCOL_ALL;
4743
4745
 	memcpy(payload.sas_identify.sas_addr,
4744
-	  &pm8001_ha->sas_addr, SAS_ADDR_SIZE);
4746
+		&pm8001_ha->phy[phy_id].dev_sas_addr, SAS_ADDR_SIZE);
4745
4747
 	payload.sas_identify.phy_id = phy_id;
4746
4748
 	ret = pm8001_mpi_build_cmd(pm8001_ha, circularQ, opcode, &payload,
4747
4749
 			sizeof(payload), 0);