update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c
..
..
@@ -64,6 +64,7 @@
64
64
 			MLX5_GET(mtrc_cap, out, num_string_trace);
65
65
 	tracer->str_db.num_string_db = MLX5_GET(mtrc_cap, out, num_string_db);
66
66
 	tracer->owner = !!MLX5_GET(mtrc_cap, out, trace_owner);
67
+	tracer->str_db.loaded = false;
67
68
 
68
69
 	for (i = 0; i < tracer->str_db.num_string_db; i++) {
69
70
 		mtrc_cap_sp = MLX5_ADDR_OF(mtrc_cap, out, string_db_param[i]);
..
..
@@ -482,7 +483,7 @@
482
483
 				(u64)timestamp_low;
483
484
 		break;
484
485
 	default:
485
-		if (tracer_event->event_id >= tracer->str_db.first_string_trace ||
486
+		if (tracer_event->event_id >= tracer->str_db.first_string_trace &&
486
487
 		    tracer_event->event_id <= tracer->str_db.first_string_trace +
487
488
 					      tracer->str_db.num_string_trace) {
488
489
 			tracer_event->type = TRACER_EVENT_TYPE_STRING;
..
..
@@ -602,7 +603,7 @@
602
603
 	} else {
603
604
 		cur_string = mlx5_tracer_message_get(tracer, tracer_event);
604
605
 		if (!cur_string) {
605
-			pr_debug("%s Got string event for unknown string tdsm: %d\n",
606
+			pr_debug("%s Got string event for unknown string tmsn: %d\n",
606
607
 				 __func__, tracer_event->string_event.tmsn);
607
608
 			return -1;
608
609
 		}
..
..
@@ -756,6 +757,7 @@
756
757
 	if (err)
757
758
 		mlx5_core_warn(dev, "FWTracer: Failed to set tracer configurations %d\n", err);
758
759
 
760
+	tracer->buff.consumer_index = 0;
759
761
 	return err;
760
762
 }
761
763
 
..
..
@@ -820,7 +822,6 @@
820
822
 	mlx5_core_dbg(tracer->dev, "FWTracer: ownership changed, current=(%d)\n", tracer->owner);
821
823
 	if (tracer->owner) {
822
824
 		tracer->owner = false;
823
-		tracer->buff.consumer_index = 0;
824
825
 		return;
825
826
 	}
826
827