|
| 1 | +--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/mlx5hws_matcher.c 2025-07-17 18:37:24 |
| 2 | ++++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/mlx5hws_matcher.c 2025-07-22 12:45:55 |
| 3 | +@@ -165,14 +165,14 @@ |
| 4 | + next->match_ste.rtc_0_id, |
| 5 | + next->match_ste.rtc_1_id); |
| 6 | + if (ret) { |
| 7 | +- mlx5hws_err(tbl->ctx, "Failed to disconnect matcher\n"); |
| 8 | +- goto matcher_reconnect; |
| 9 | ++ mlx5hws_err(tbl->ctx, "Fatal error, failed to disconnect matcher\n"); |
| 10 | ++ return ret; |
| 11 | + } |
| 12 | + } else { |
| 13 | + ret = mlx5hws_table_connect_to_miss_table(tbl, tbl->default_miss.miss_tbl); |
| 14 | + if (ret) { |
| 15 | +- mlx5hws_err(tbl->ctx, "Failed to disconnect last matcher\n"); |
| 16 | +- goto matcher_reconnect; |
| 17 | ++ mlx5hws_err(tbl->ctx, "Fatal error, failed to disconnect last matcher\n"); |
| 18 | ++ return ret; |
| 19 | + } |
| 20 | + } |
| 21 | + |
| 22 | +@@ -180,27 +180,19 @@ |
| 23 | + if (prev_ft_id == tbl->ft_id) { |
| 24 | + ret = mlx5hws_table_update_connected_miss_tables(tbl); |
| 25 | + if (ret) { |
| 26 | +- mlx5hws_err(tbl->ctx, "Fatal error, failed to update connected miss table\n"); |
| 27 | +- goto matcher_reconnect; |
| 28 | ++ mlx5hws_err(tbl->ctx, |
| 29 | ++ "Fatal error, failed to update connected miss table\n"); |
| 30 | ++ return ret; |
| 31 | + } |
| 32 | + } |
| 33 | + |
| 34 | + ret = mlx5hws_table_ft_set_default_next_ft(tbl, prev_ft_id); |
| 35 | + if (ret) { |
| 36 | + mlx5hws_err(tbl->ctx, "Fatal error, failed to restore matcher ft default miss\n"); |
| 37 | +- goto matcher_reconnect; |
| 38 | ++ return ret; |
| 39 | + } |
| 40 | + |
| 41 | + return 0; |
| 42 | +- |
| 43 | +-matcher_reconnect: |
| 44 | +- if (list_empty(&tbl->matchers_list) || !prev) |
| 45 | +- list_add(&matcher->list_node, &tbl->matchers_list); |
| 46 | +- else |
| 47 | +- /* insert after prev matcher */ |
| 48 | +- list_add(&matcher->list_node, &prev->list_node); |
| 49 | +- |
| 50 | +- return ret; |
| 51 | + } |
| 52 | + |
| 53 | + static void hws_matcher_set_rtc_attr_sz(struct mlx5hws_matcher *matcher, |
0 commit comments