| @@ -41,6 +41,11 @@ · 40 unmodified lines |
| 41 | 41 | #define MLX5E_CEE_STATE_UP 1 |
| 42 | 42 | #define MLX5E_CEE_STATE_DOWN 0 |
| 43 | 43 | |
| 44 | +enum { |
| 45 | + MLX5E_VENDOR_TC_GROUP_NUM = 7, |
| 46 | + MLX5E_LOWEST_PRIO_GROUP = 0, |
| 47 | +}; |
| 48 | + |
| 44 | 49 | /* If dcbx mode is non-host set the dcbx mode to host. |
| 45 | 50 | */ |
| 46 | 51 | static int mlx5e_dcbnl_set_dcbx_mode(struct mlx5e_priv *priv, |
| @@ -85,6 +90,9 @@ static int mlx5e_dcbnl_ieee_getets(struct net_device *netdev, · 38 unmodified lines |
| 85 | 90 | { |
| 86 | 91 | struct mlx5e_priv *priv = netdev_priv(netdev); |
| 87 | 92 | struct mlx5_core_dev *mdev = priv->mdev; |
| 93 | + u8 tc_group[IEEE_8021QAZ_MAX_TCS]; |
| 94 | + bool is_tc_group_6_exist = false; |
| 95 | + bool is_zero_bw_ets_tc = false; |
| 88 | 96 | int err = 0; |
| 89 | 97 | int i; |
| 90 | 98 | |
| @@ -96,37 +104,64 @@ static int mlx5e_dcbnl_ieee_getets(struct net_device *netdev, · 5 unmodified lines |
| 96 | 104 | err = mlx5_query_port_prio_tc(mdev, i, &ets->prio_tc[i]); |
| 97 | 105 | if (err) |
| 98 | 106 | return err; |
| 99 | | − } |
| 100 | 107 | |
| 101 | | − for (i = 0; i < ets->ets_cap; i++) { |
| 108 | + err = mlx5_query_port_tc_group(mdev, i, &tc_group[i]); |
| 109 | + if (err) |
| 110 | + return err; |
| 111 | + |
| 102 | 112 | err = mlx5_query_port_tc_bw_alloc(mdev, i, &ets->tc_tx_bw[i]); |
| 103 | 113 | if (err) |
| 104 | 114 | return err; |
| 115 | + |
| 116 | + if (ets->tc_tx_bw[i] < MLX5E_MAX_BW_ALLOC && |
| 117 | + tc_group[i] == (MLX5E_LOWEST_PRIO_GROUP + 1)) |
| 118 | + is_zero_bw_ets_tc = true; |
| 119 | + |
| 120 | + if (tc_group[i] == (MLX5E_VENDOR_TC_GROUP_NUM - 1)) |
| 121 | + is_tc_group_6_exist = true; |
| 122 | + } |
| 123 | + |
| 124 | + /* Report 0% ets tc if exits*/ |
| 125 | + if (is_zero_bw_ets_tc) { |
| 126 | + for (i = 0; i < ets->ets_cap; i++) |
| 127 | + if (tc_group[i] == MLX5E_LOWEST_PRIO_GROUP) |
| 128 | + ets->tc_tx_bw[i] = 0; |
| 129 | + } |
| 130 | + |
| 131 | + /* Update tc_tsa based on fw setting*/ |
| 132 | + for (i = 0; i < ets->ets_cap; i++) { |
| 105 | 133 | if (ets->tc_tx_bw[i] < MLX5E_MAX_BW_ALLOC) |
| 106 | 134 | priv->dcbx.tc_tsa[i] = IEEE_8021QAZ_TSA_ETS; |
| 135 | + else if (tc_group[i] == MLX5E_VENDOR_TC_GROUP_NUM && |
| 136 | + !is_tc_group_6_exist) |
| 137 | + priv->dcbx.tc_tsa[i] = IEEE_8021QAZ_TSA_VENDOR; |
| 107 | 138 | } |
| 108 | | − |
| 109 | 139 | memcpy(ets->tc_tsa, priv->dcbx.tc_tsa, sizeof(ets->tc_tsa)); |
| 110 | 140 | |
| 111 | 141 | return err; |
| 112 | 142 | } |
| 113 | 143 | |
| 114 | | −enum { |
| 115 | | − MLX5E_VENDOR_TC_GROUP_NUM = 7, |
| 116 | | − MLX5E_ETS_TC_GROUP_NUM = 0, |
| 117 | | −}; |
| 118 | | − |
| 119 | 144 | static void mlx5e_build_tc_group(struct ieee_ets *ets, u8 *tc_group, int max_tc) |
| 120 | 145 | { |
| 121 | 146 | bool any_tc_mapped_to_ets = false; |
| 147 | + bool ets_zero_bw = false; |
| 122 | 148 | int strict_group; |
| 123 | 149 | int i; |
| 124 | 150 | |
| 125 | | − for (i = 0; i <= max_tc; i++) |
| 126 | | − if (ets->tc_tsa[i] == IEEE_8021QAZ_TSA_ETS) |
| 151 | + for (i = 0; i <= max_tc; i++) { |
| 152 | + if (ets->tc_tsa[i] == IEEE_8021QAZ_TSA_ETS) { |
| 127 | 153 | any_tc_mapped_to_ets = true; |
| 154 | + if (!ets->tc_tx_bw[i]) |
| 155 | + ets_zero_bw = true; |
| 156 | + } |
| 157 | + } |
| 128 | 158 | |
| 129 | | − strict_group = any_tc_mapped_to_ets ? 1 : 0; |
| 159 | + /* strict group has higher priority than ets group */ |
| 160 | + strict_group = MLX5E_LOWEST_PRIO_GROUP; |
| 161 | + if (any_tc_mapped_to_ets) |
| 162 | + strict_group++; |
| 163 | + if (ets_zero_bw) |
| 164 | + strict_group++; |
| 130 | 165 | |
| 131 | 166 | for (i = 0; i <= max_tc; i++) { |
| 132 | 167 | switch (ets->tc_tsa[i]) { |
| @@ -137,7 +172,9 @@ static void mlx5e_build_tc_group(struct ieee_ets *ets, u8 *tc_group, int max_tc) · 4 unmodified lines |
| 137 | 172 | tc_group[i] = strict_group++; |
| 138 | 173 | break; |
| 139 | 174 | case IEEE_8021QAZ_TSA_ETS: |
| 140 | | − tc_group[i] = MLX5E_ETS_TC_GROUP_NUM; |
| 175 | + tc_group[i] = MLX5E_LOWEST_PRIO_GROUP; |
| 176 | + if (ets->tc_tx_bw[i] && ets_zero_bw) |
| 177 | + tc_group[i] = MLX5E_LOWEST_PRIO_GROUP + 1; |
| 141 | 178 | break; |
| 142 | 179 | } |
| 143 | 180 | } |
| @@ -146,8 +183,22 @@ static void mlx5e_build_tc_group(struct ieee_ets *ets, u8 *tc_group, int max_tc) · 2 unmodified lines |
| 146 | 183 | static void mlx5e_build_tc_tx_bw(struct ieee_ets *ets, u8 *tc_tx_bw, |
| 147 | 184 | u8 *tc_group, int max_tc) |
| 148 | 185 | { |
| 186 | + int bw_for_ets_zero_bw_tc = 0; |
| 187 | + int last_ets_zero_bw_tc = -1; |
| 188 | + int num_ets_zero_bw = 0; |
| 149 | 189 | int i; |
| 150 | 190 | |
| 191 | + for (i = 0; i <= max_tc; i++) { |
| 192 | + if (ets->tc_tsa[i] == IEEE_8021QAZ_TSA_ETS && |
| 193 | + !ets->tc_tx_bw[i]) { |
| 194 | + num_ets_zero_bw++; |
| 195 | + last_ets_zero_bw_tc = i; |
| 196 | + } |
| 197 | + } |
| 198 | + |
| 199 | + if (num_ets_zero_bw) |
| 200 | + bw_for_ets_zero_bw_tc = MLX5E_MAX_BW_ALLOC / num_ets_zero_bw; |
| 201 | + |
| 151 | 202 | for (i = 0; i <= max_tc; i++) { |
| 152 | 203 | switch (ets->tc_tsa[i]) { |
| 153 | 204 | case IEEE_8021QAZ_TSA_VENDOR: |
| @@ -157,12 +208,26 @@ static void mlx5e_build_tc_tx_bw(struct ieee_ets *ets, u8 *tc_tx_bw, · 3 unmodified lines |
| 157 | 208 | tc_tx_bw[i] = MLX5E_MAX_BW_ALLOC; |
| 158 | 209 | break; |
| 159 | 210 | case IEEE_8021QAZ_TSA_ETS: |
| 160 | | − tc_tx_bw[i] = ets->tc_tx_bw[i]; |
| 211 | + tc_tx_bw[i] = ets->tc_tx_bw[i] ? |
| 212 | + ets->tc_tx_bw[i] : |
| 213 | + bw_for_ets_zero_bw_tc; |
| 161 | 214 | break; |
| 162 | 215 | } |
| 163 | 216 | } |
| 217 | + |
| 218 | + /* Make sure the total bw for ets zero bw group is 100% */ |
| 219 | + if (last_ets_zero_bw_tc != -1) |
| 220 | + tc_tx_bw[last_ets_zero_bw_tc] += |
| 221 | + MLX5E_MAX_BW_ALLOC % num_ets_zero_bw; |
| 164 | 222 | } |
| 165 | 223 | |
| 224 | +/* If there are ETS BW 0, |
| 225 | + * Set ETS group # to 1 for all ETS non zero BW tcs. Their sum must be 100%. |
| 226 | + * Set group #0 to all the ETS BW 0 tcs and |
| 227 | + * equally splits the 100% BW between them |
| 228 | + * Report both group #0 and #1 as ETS type. |
| 229 | + * All the tcs in group #0 will be reported with 0% BW. |
| 230 | + */ |
| 166 | 231 | int mlx5e_dcbnl_ieee_setets_core(struct mlx5e_priv *priv, struct ieee_ets *ets) |
| 167 | 232 | { |
| 168 | 233 | struct mlx5_core_dev *mdev = priv->mdev; |
| @@ -188,7 +253,6 @@ int mlx5e_dcbnl_ieee_setets_core(struct mlx5e_priv *priv, struct ieee_ets *ets) · 19 unmodified lines |
| 188 | 253 | return err; |
| 189 | 254 | |
| 190 | 255 | memcpy(priv->dcbx.tc_tsa, ets->tc_tsa, sizeof(ets->tc_tsa)); |
| 191 | | − |
| 192 | 256 | return err; |
| 193 | 257 | } |
| 194 | 258 | |
| @@ -209,17 +273,9 @@ static int mlx5e_dbcnl_validate_ets(struct net_device *netdev, · 14 unmodified lines |
| 209 | 273 | } |
| 210 | 274 | |
| 211 | 275 | /* Validate Bandwidth Sum */ |
| 212 | | − for (i = 0; i < IEEE_8021QAZ_MAX_TCS; i++) { |
| 213 | | − if (ets->tc_tsa[i] == IEEE_8021QAZ_TSA_ETS) { |
| 214 | | − if (!ets->tc_tx_bw[i]) { |
| 215 | | − netdev_err(netdev, |
| 216 | | − "Failed to validate ETS: BW 0 is illegal\n"); |
| 217 | | − return -EINVAL; |
| 218 | | − } |
| 219 | | − |
| 276 | + for (i = 0; i < IEEE_8021QAZ_MAX_TCS; i++) |
| 277 | + if (ets->tc_tsa[i] == IEEE_8021QAZ_TSA_ETS) |
| 220 | 278 | bw_sum += ets->tc_tx_bw[i]; |
| 221 | | − } |
| 222 | | − } |
| 223 | 279 | |
| 224 | 280 | if (bw_sum != 0 && bw_sum != 100) { |
| 225 | 281 | netdev_err(netdev, |
| @@ -533,8 +589,7 @@ static void mlx5e_dcbnl_getpgtccfgtx(struct net_device *netdev, · 307 unmodified lines |
| 533 | 589 | static void mlx5e_dcbnl_getpgbwgcfgtx(struct net_device *netdev, |
| 534 | 590 | int pgid, u8 *bw_pct) |
| 535 | 591 | { |
| 536 | | − struct mlx5e_priv *priv = netdev_priv(netdev); |
| 537 | | − struct mlx5_core_dev *mdev = priv->mdev; |
| 592 | + struct ieee_ets ets; |
| 538 | 593 | |
| 539 | 594 | if (pgid >= CEE_DCBX_MAX_PGS) { |
| 540 | 595 | netdev_err(netdev, |
| @@ -542,8 +597,8 @@ static void mlx5e_dcbnl_getpgbwgcfgtx(struct net_device *netdev, · 1 unmodified line |
| 542 | 597 | return; |
| 543 | 598 | } |
| 544 | 599 | |
| 545 | | − if (mlx5_query_port_tc_bw_alloc(mdev, pgid, bw_pct)) |
| 546 | | − *bw_pct = 0; |
| 600 | + mlx5e_dcbnl_ieee_getets(netdev, &ets); |
| 601 | + *bw_pct = ets.tc_tx_bw[pgid]; |
| 547 | 602 | } |
| 548 | 603 | |
| 549 | 604 | static void mlx5e_dcbnl_setpfccfg(struct net_device *netdev, |
| @@ -739,8 +794,6 @@ static void mlx5e_ets_init(struct mlx5e_priv *priv) · 189 unmodified lines |
| 739 | 794 | ets.prio_tc[i] = i; |
| 740 | 795 | } |
| 741 | 796 | |
| 742 | | − memcpy(priv->dcbx.tc_tsa, ets.tc_tsa, sizeof(ets.tc_tsa)); |
| 743 | | − |
| 744 | 797 | /* tclass[prio=0]=1, tclass[prio=1]=0, tclass[prio=i]=i (for i>1) */ |
| 745 | 798 | ets.prio_tc[0] = 1; |
| 746 | 799 | ets.prio_tc[1] = 0; |