Besides GL(Gap Limiting), QL(Quantity Limiting) can be modified dynamically when DIM is supported. So rename gl_adapt_enable as adapt_enable in struct hns3_enet_coalesce.
Unified · Split
| @@ -211,8 +211,8 @@ void hns3_set_vector_coalesce_rl(struct hns3_enet_tqp_vector *tqp_vector, · 210 unmodified lines | |||
| 211 | * GL and RL(Rate Limiter) are 2 ways to acheive interrupt coalescing | 211 | * GL and RL(Rate Limiter) are 2 ways to acheive interrupt coalescing |
| 212 | */ | 212 | */ |
| 213 | 213 | ||
| 214 | if (rl_reg > 0 && !tqp_vector->tx_group.coal.gl_adapt_enable && | 214 | if (rl_reg > 0 && !tqp_vector->tx_group.coal.adapt_enable && |
| 215 | !tqp_vector->rx_group.coal.gl_adapt_enable) | 215 | !tqp_vector->rx_group.coal.adapt_enable) |
| 216 | /* According to the hardware, the range of rl_reg is | 216 | /* According to the hardware, the range of rl_reg is |
| 217 | * 0-59 and the unit is 4. | 217 | * 0-59 and the unit is 4. |
| 218 | */ | 218 | */ |
| @@ -273,8 +273,8 @@ static void hns3_vector_coalesce_init(struct hns3_enet_tqp_vector *tqp_vector, · 54 unmodified lines | |||
| 273 | * | 273 | * |
| 274 | * Default: enable interrupt coalescing self-adaptive and GL | 274 | * Default: enable interrupt coalescing self-adaptive and GL |
| 275 | */ | 275 | */ |
| 276 | tx_coal->gl_adapt_enable = 1; | 276 | tx_coal->adapt_enable = 1; |
| 277 | rx_coal->gl_adapt_enable = 1; | 277 | rx_coal->adapt_enable = 1; |
| 278 | 278 | ||
| 279 | tx_coal->int_gl = HNS3_INT_GL_50K; | 279 | tx_coal->int_gl = HNS3_INT_GL_50K; |
| 280 | rx_coal->int_gl = HNS3_INT_GL_50K; | 280 | rx_coal->int_gl = HNS3_INT_GL_50K; |
| @@ -3384,14 +3384,14 @@ static void hns3_update_new_int_gl(struct hns3_enet_tqp_vector *tqp_vector) · 3103 unmodified lines | |||
| 3384 | tqp_vector->last_jiffies + msecs_to_jiffies(1000))) | 3384 | tqp_vector->last_jiffies + msecs_to_jiffies(1000))) |
| 3385 | return; | 3385 | return; |
| 3386 | 3386 | ||
| 3387 | if (rx_group->coal.gl_adapt_enable) { | 3387 | if (rx_group->coal.adapt_enable) { |
| 3388 | rx_update = hns3_get_new_int_gl(rx_group); | 3388 | rx_update = hns3_get_new_int_gl(rx_group); |
| 3389 | if (rx_update) | 3389 | if (rx_update) |
| 3390 | hns3_set_vector_coalesce_rx_gl(tqp_vector, | 3390 | hns3_set_vector_coalesce_rx_gl(tqp_vector, |
| 3391 | rx_group->coal.int_gl); | 3391 | rx_group->coal.int_gl); |
| 3392 | } | 3392 | } |
| 3393 | 3393 | ||
| 3394 | if (tx_group->coal.gl_adapt_enable) { | 3394 | if (tx_group->coal.adapt_enable) { |
| 3395 | tx_update = hns3_get_new_int_gl(tx_group); | 3395 | tx_update = hns3_get_new_int_gl(tx_group); |
| 3396 | if (tx_update) | 3396 | if (tx_update) |
| 3397 | hns3_set_vector_coalesce_tx_gl(tqp_vector, | 3397 | hns3_set_vector_coalesce_tx_gl(tqp_vector, |
| @@ -436,7 +436,7 @@ struct hns3_enet_coalesce { · 435 unmodified lines | |||
| 436 | u16 int_gl; | 436 | u16 int_gl; |
| 437 | u16 int_ql; | 437 | u16 int_ql; |
| 438 | u16 int_ql_max; | 438 | u16 int_ql_max; |
| 439 | u8 gl_adapt_enable:1; | 439 | u8 adapt_enable:1; |
| 440 | u8 ql_enable:1; | 440 | u8 ql_enable:1; |
| 441 | u8 unit_1us:1; | 441 | u8 unit_1us:1; |
| 442 | enum hns3_flow_level_range flow_level; | 442 | enum hns3_flow_level_range flow_level; |
| @@ -1105,9 +1105,9 @@ static int hns3_get_coalesce_per_queue(struct net_device *netdev, u32 queue, · 1104 unmodified lines | |||
| 1105 | rx_vector = priv->ring[queue_num + queue].tqp_vector; | 1105 | rx_vector = priv->ring[queue_num + queue].tqp_vector; |
| 1106 | 1106 | ||
| 1107 | cmd->use_adaptive_tx_coalesce = | 1107 | cmd->use_adaptive_tx_coalesce = |
| 1108 | tx_vector->tx_group.coal.gl_adapt_enable; | 1108 | tx_vector->tx_group.coal.adapt_enable; |
| 1109 | cmd->use_adaptive_rx_coalesce = | 1109 | cmd->use_adaptive_rx_coalesce = |
| 1110 | rx_vector->rx_group.coal.gl_adapt_enable; | 1110 | rx_vector->rx_group.coal.adapt_enable; |
| 1111 | 1111 | ||
| 1112 | cmd->tx_coalesce_usecs = tx_vector->tx_group.coal.int_gl; | 1112 | cmd->tx_coalesce_usecs = tx_vector->tx_group.coal.int_gl; |
| 1113 | cmd->rx_coalesce_usecs = rx_vector->rx_group.coal.int_gl; | 1113 | cmd->rx_coalesce_usecs = rx_vector->rx_group.coal.int_gl; |
| @@ -1268,9 +1268,9 @@ static void hns3_set_coalesce_per_queue(struct net_device *netdev, · 154 unmodified lines | |||
| 1268 | tx_vector = priv->ring[queue].tqp_vector; | 1268 | tx_vector = priv->ring[queue].tqp_vector; |
| 1269 | rx_vector = priv->ring[queue_num + queue].tqp_vector; | 1269 | rx_vector = priv->ring[queue_num + queue].tqp_vector; |
| 1270 | 1270 | ||
| 1271 | tx_vector->tx_group.coal.gl_adapt_enable = | 1271 | tx_vector->tx_group.coal.adapt_enable = |
| 1272 | cmd->use_adaptive_tx_coalesce; | 1272 | cmd->use_adaptive_tx_coalesce; |
| 1273 | rx_vector->rx_group.coal.gl_adapt_enable = | 1273 | rx_vector->rx_group.coal.adapt_enable = |
| 1274 | cmd->use_adaptive_rx_coalesce; | 1274 | cmd->use_adaptive_rx_coalesce; |
| 1275 | 1275 | ||
| 1276 | tx_vector->tx_group.coal.int_gl = cmd->tx_coalesce_usecs; | 1276 | tx_vector->tx_group.coal.int_gl = cmd->tx_coalesce_usecs; |