update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/net/ethernet/mellanox/mlx5/core/main.c
..
..
@@ -783,7 +783,6 @@
783
783
 	}
784
784
 
785
785
 	mlx5_pci_vsc_init(dev);
786
-	dev->caps.embedded_cpu = mlx5_read_embedded_cpu(dev);
787
786
 	return 0;
788
787
 
789
788
 err_clr_master:
..
..
@@ -887,7 +886,7 @@
887
886
 
888
887
 	dev->dm = mlx5_dm_create(dev);
889
888
 	if (IS_ERR(dev->dm))
890
-		mlx5_core_warn(dev, "Failed to init device memory%d\n", err);
889
+		mlx5_core_warn(dev, "Failed to init device memory %ld\n", PTR_ERR(dev->dm));
891
890
 
892
891
 	dev->tracer = mlx5_fw_tracer_create(dev);
893
892
 	dev->hv_vhca = mlx5_hv_vhca_create(dev);
..
..
@@ -906,6 +905,8 @@
906
905
 err_tables_cleanup:
907
906
 	mlx5_geneve_destroy(dev->geneve);
908
907
 	mlx5_vxlan_destroy(dev->vxlan);
908
+	mlx5_cleanup_clock(dev);
909
+	mlx5_cleanup_reserved_gids(dev);
909
910
 	mlx5_cq_debugfs_cleanup(dev);
910
911
 	mlx5_fw_reset_cleanup(dev);
911
912
 err_events_cleanup:
..
..
@@ -976,6 +977,7 @@
976
977
 		goto err_cmd_cleanup;
977
978
 	}
978
979
 
980
+	dev->caps.embedded_cpu = mlx5_read_embedded_cpu(dev);
979
981
 	mlx5_cmd_set_state(dev, MLX5_CMDIF_STATE_UP);
980
982
 
981
983
 	err = mlx5_core_enable_hca(dev, 0);
..
..
@@ -1640,7 +1642,7 @@
1640
1642
 	}
1641
1643
 }
1642
1644
 
1643
-static int __init init(void)
1645
+static int __init mlx5_init(void)
1644
1646
 {
1645
1647
 	int err;
1646
1648
 
..
..
@@ -1665,7 +1667,7 @@
1665
1667
 	return err;
1666
1668
 }
1667
1669
 
1668
-static void __exit cleanup(void)
1670
+static void __exit mlx5_cleanup(void)
1669
1671
 {
1670
1672
 #ifdef CONFIG_MLX5_CORE_EN
1671
1673
 	mlx5e_cleanup();
..
..
@@ -1674,5 +1676,5 @@
1674
1676
 	mlx5_unregister_debugfs();
1675
1677
 }
1676
1678
 
1677
-module_init(init);
1678
-module_exit(cleanup);
1679
+module_init(mlx5_init);
1680
+module_exit(mlx5_cleanup);