nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

linux/dim: Rename externally exposed macros

Browse source 
Renamed macros in use by external drivers.

Signed-off-by: Tal Gilboa <talgi@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
This commit is contained in:
Tal Gilboa 2018-11-05 12:07:52 +02:00 committed by Saeed Mahameed
parent 449986ea92
commit c002bd529d
8 changed files with 27 additions and 27 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/net/ethernet/broadcom/bcmsysport.c
View file

@ -1099,7 +1099,7 @@ static void bcm_sysport_dim_work(struct work_struct *work)
net_dim_get_rx_moderation(dim->mode, dim->profile_ix); net_dim_get_rx_moderation(dim->mode, dim->profile_ix);
bcm_sysport_set_rx_coalesce(priv, cur_profile.usec, cur_profile.pkts); bcm_sysport_set_rx_coalesce(priv, cur_profile.usec, cur_profile.pkts);
dim->state = NET_DIM_START_MEASURE; dim->state = DIM_START_MEASURE;
} }
/* RX and misc interrupt routine */ /* RX and misc interrupt routine */
@ -1440,7 +1440,7 @@ static void bcm_sysport_init_dim(struct bcm_sysport_priv *priv,
struct bcm_sysport_net_dim *dim = &priv->dim; struct bcm_sysport_net_dim *dim = &priv->dim;
INIT_WORK(&dim->dim.work, cb); INIT_WORK(&dim->dim.work, cb);
dim->dim.mode = NET_DIM_CQ_PERIOD_MODE_START_FROM_EQE; dim->dim.mode = DIM_CQ_PERIOD_MODE_START_FROM_EQE;
dim->event_ctr = 0; dim->event_ctr = 0;
dim->packets = 0; dim->packets = 0;
dim->bytes = 0; dim->bytes = 0;

2
drivers/net/ethernet/broadcom/bnxt/bnxt.c
View file

@ -7810,7 +7810,7 @@ static void bnxt_enable_napi(struct bnxt *bp)
if (bp->bnapi[i]->rx_ring) { if (bp->bnapi[i]->rx_ring) {
INIT_WORK(&cpr->dim.work, bnxt_dim_work); INIT_WORK(&cpr->dim.work, bnxt_dim_work);
cpr->dim.mode = NET_DIM_CQ_PERIOD_MODE_START_FROM_EQE; cpr->dim.mode = DIM_CQ_PERIOD_MODE_START_FROM_EQE;
} }
napi_enable(&bp->bnapi[i]->napi); napi_enable(&bp->bnapi[i]->napi);
} }

2
drivers/net/ethernet/broadcom/bnxt/bnxt_dim.c
View file

@ -28,5 +28,5 @@ void bnxt_dim_work(struct work_struct *work)
cpr->rx_ring_coal.coal_bufs = cur_moder.pkts; cpr->rx_ring_coal.coal_bufs = cur_moder.pkts;
bnxt_hwrm_set_ring_coal(bnapi->bp, bnapi); bnxt_hwrm_set_ring_coal(bnapi->bp, bnapi);
dim->state = NET_DIM_START_MEASURE; dim->state = DIM_START_MEASURE;
} }

4
drivers/net/ethernet/broadcom/genet/bcmgenet.c
View file

@ -1928,7 +1928,7 @@ static void bcmgenet_dim_work(struct work_struct *work)
net_dim_get_rx_moderation(dim->mode, dim->profile_ix); net_dim_get_rx_moderation(dim->mode, dim->profile_ix);
bcmgenet_set_rx_coalesce(ring, cur_profile.usec, cur_profile.pkts); bcmgenet_set_rx_coalesce(ring, cur_profile.usec, cur_profile.pkts);
dim->state = NET_DIM_START_MEASURE; dim->state = DIM_START_MEASURE;
} }
/* Assign skb to RX DMA descriptor. */ /* Assign skb to RX DMA descriptor. */
@ -2085,7 +2085,7 @@ static void bcmgenet_init_dim(struct bcmgenet_rx_ring *ring,
struct bcmgenet_net_dim *dim = &ring->dim; struct bcmgenet_net_dim *dim = &ring->dim;
INIT_WORK(&dim->dim.work, cb); INIT_WORK(&dim->dim.work, cb);
dim->dim.mode = NET_DIM_CQ_PERIOD_MODE_START_FROM_EQE; dim->dim.mode = DIM_CQ_PERIOD_MODE_START_FROM_EQE;
dim->event_ctr = 0; dim->event_ctr = 0;
dim->packets = 0; dim->packets = 0;
dim->bytes = 0; dim->bytes = 0;

2
drivers/net/ethernet/mellanox/mlx5/core/en_dim.c
View file

@ -38,7 +38,7 @@ mlx5e_complete_dim_work(struct net_dim *dim, struct net_dim_cq_moder moder,
struct mlx5_core_dev *mdev, struct mlx5_core_cq *mcq) struct mlx5_core_dev *mdev, struct mlx5_core_cq *mcq)
{ {
mlx5_core_modify_cq_moderation(mdev, mcq, moder.usec, moder.pkts); mlx5_core_modify_cq_moderation(mdev, mcq, moder.usec, moder.pkts);
dim->state = NET_DIM_START_MEASURE; dim->state = DIM_START_MEASURE;
} }
void mlx5e_rx_dim_work(struct work_struct *work) void mlx5e_rx_dim_work(struct work_struct *work)

10
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
View file

@ -584,11 +584,11 @@ static int mlx5e_alloc_rq(struct mlx5e_channel *c,
switch (params->rx_cq_moderation.cq_period_mode) { switch (params->rx_cq_moderation.cq_period_mode) {
case MLX5_CQ_PERIOD_MODE_START_FROM_CQE: case MLX5_CQ_PERIOD_MODE_START_FROM_CQE:
rq->dim.mode = NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE; rq->dim.mode = DIM_CQ_PERIOD_MODE_START_FROM_CQE;
break; break;
case MLX5_CQ_PERIOD_MODE_START_FROM_EQE: case MLX5_CQ_PERIOD_MODE_START_FROM_EQE:
default: default:
rq->dim.mode = NET_DIM_CQ_PERIOD_MODE_START_FROM_EQE; rq->dim.mode = DIM_CQ_PERIOD_MODE_START_FROM_EQE;
} }
rq->page_cache.head = 0; rq->page_cache.head = 0;
@ -2151,7 +2151,7 @@ static void mlx5e_build_ico_cq_param(struct mlx5e_priv *priv,
mlx5e_build_common_cq_param(priv, param); mlx5e_build_common_cq_param(priv, param);
param->cq_period_mode = NET_DIM_CQ_PERIOD_MODE_START_FROM_EQE; param->cq_period_mode = DIM_CQ_PERIOD_MODE_START_FROM_EQE;
} }
static void mlx5e_build_icosq_param(struct mlx5e_priv *priv, static void mlx5e_build_icosq_param(struct mlx5e_priv *priv,
@ -4440,8 +4440,8 @@ static struct net_dim_cq_moder mlx5e_get_def_rx_moderation(u8 cq_period_mode)
static u8 mlx5_to_net_dim_cq_period_mode(u8 cq_period_mode) static u8 mlx5_to_net_dim_cq_period_mode(u8 cq_period_mode)
{ {
return cq_period_mode == MLX5_CQ_PERIOD_MODE_START_FROM_CQE ? return cq_period_mode == MLX5_CQ_PERIOD_MODE_START_FROM_CQE ?
NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE : DIM_CQ_PERIOD_MODE_START_FROM_CQE :
NET_DIM_CQ_PERIOD_MODE_START_FROM_EQE; DIM_CQ_PERIOD_MODE_START_FROM_EQE;
} }
void mlx5e_set_tx_cq_mode_params(struct mlx5e_params *params, u8 cq_period_mode) void mlx5e_set_tx_cq_mode_params(struct mlx5e_params *params, u8 cq_period_mode)

12
include/linux/dim.h
View file

@ -47,15 +47,15 @@ struct net_dim { /* Dynamic Interrupt Moderation */
}; };
enum { enum {
NET_DIM_CQ_PERIOD_MODE_START_FROM_EQE = 0x0, DIM_CQ_PERIOD_MODE_START_FROM_EQE = 0x0,
NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE = 0x1, DIM_CQ_PERIOD_MODE_START_FROM_CQE = 0x1,
NET_DIM_CQ_PERIOD_NUM_MODES DIM_CQ_PERIOD_NUM_MODES
}; };
enum { enum {
NET_DIM_START_MEASURE, DIM_START_MEASURE,
NET_DIM_MEASURE_IN_PROGRESS, DIM_MEASURE_IN_PROGRESS,
NET_DIM_APPLY_NEW_PROFILE, DIM_APPLY_NEW_PROFILE,
}; };
enum { enum {

18
include/linux/net_dim.h
View file

@ -78,13 +78,13 @@
} }
static const struct net_dim_cq_moder static const struct net_dim_cq_moder
rx_profile[NET_DIM_CQ_PERIOD_NUM_MODES][NET_DIM_PARAMS_NUM_PROFILES] = { rx_profile[DIM_CQ_PERIOD_NUM_MODES][NET_DIM_PARAMS_NUM_PROFILES] = {
NET_DIM_RX_EQE_PROFILES, NET_DIM_RX_EQE_PROFILES,
NET_DIM_RX_CQE_PROFILES, NET_DIM_RX_CQE_PROFILES,
}; };
static const struct net_dim_cq_moder static const struct net_dim_cq_moder
tx_profile[NET_DIM_CQ_PERIOD_NUM_MODES][NET_DIM_PARAMS_NUM_PROFILES] = { tx_profile[DIM_CQ_PERIOD_NUM_MODES][NET_DIM_PARAMS_NUM_PROFILES] = {
NET_DIM_TX_EQE_PROFILES, NET_DIM_TX_EQE_PROFILES,
NET_DIM_TX_CQE_PROFILES, NET_DIM_TX_CQE_PROFILES,
}; };
@ -101,7 +101,7 @@ net_dim_get_rx_moderation(u8 cq_period_mode, int ix)
static inline struct net_dim_cq_moder static inline struct net_dim_cq_moder
net_dim_get_def_rx_moderation(u8 cq_period_mode) net_dim_get_def_rx_moderation(u8 cq_period_mode)
{ {
u8 profile_ix = cq_period_mode == NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE ? u8 profile_ix = cq_period_mode == DIM_CQ_PERIOD_MODE_START_FROM_CQE ?
NET_DIM_DEF_PROFILE_CQE : NET_DIM_DEF_PROFILE_EQE; NET_DIM_DEF_PROFILE_CQE : NET_DIM_DEF_PROFILE_EQE;
return net_dim_get_rx_moderation(cq_period_mode, profile_ix); return net_dim_get_rx_moderation(cq_period_mode, profile_ix);
@ -119,7 +119,7 @@ net_dim_get_tx_moderation(u8 cq_period_mode, int ix)
static inline struct net_dim_cq_moder static inline struct net_dim_cq_moder
net_dim_get_def_tx_moderation(u8 cq_period_mode) net_dim_get_def_tx_moderation(u8 cq_period_mode)
{ {
u8 profile_ix = cq_period_mode == NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE ? u8 profile_ix = cq_period_mode == DIM_CQ_PERIOD_MODE_START_FROM_CQE ?
NET_DIM_DEF_PROFILE_CQE : NET_DIM_DEF_PROFILE_EQE; NET_DIM_DEF_PROFILE_CQE : NET_DIM_DEF_PROFILE_EQE;
return net_dim_get_tx_moderation(cq_period_mode, profile_ix); return net_dim_get_tx_moderation(cq_period_mode, profile_ix);
@ -247,7 +247,7 @@ static inline void net_dim(struct net_dim *dim,
u16 nevents; u16 nevents;
switch (dim->state) { switch (dim->state) {
case NET_DIM_MEASURE_IN_PROGRESS: case DIM_MEASURE_IN_PROGRESS:
nevents = BIT_GAP(BITS_PER_TYPE(u16), nevents = BIT_GAP(BITS_PER_TYPE(u16),
end_sample.event_ctr, end_sample.event_ctr,
dim->start_sample.event_ctr); dim->start_sample.event_ctr);
@ -255,17 +255,17 @@ static inline void net_dim(struct net_dim *dim,
break; break;
dim_calc_stats(&dim->start_sample, &end_sample, &curr_stats); dim_calc_stats(&dim->start_sample, &end_sample, &curr_stats);
if (net_dim_decision(&curr_stats, dim)) { if (net_dim_decision(&curr_stats, dim)) {
dim->state = NET_DIM_APPLY_NEW_PROFILE; dim->state = DIM_APPLY_NEW_PROFILE;
schedule_work(&dim->work); schedule_work(&dim->work);
break; break;
} }
/* fall through */ /* fall through */
case NET_DIM_START_MEASURE: case DIM_START_MEASURE:
net_dim_sample(end_sample.event_ctr, end_sample.pkt_ctr, end_sample.byte_ctr, net_dim_sample(end_sample.event_ctr, end_sample.pkt_ctr, end_sample.byte_ctr,
&dim->start_sample); &dim->start_sample);
dim->state = NET_DIM_MEASURE_IN_PROGRESS; dim->state = DIM_MEASURE_IN_PROGRESS;
break; break;
case NET_DIM_APPLY_NEW_PROFILE: case DIM_APPLY_NEW_PROFILE:
break; break;
} }
} }