Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9c872f2 authored by Andy Gospodarek's avatar Andy Gospodarek Committed by David S. Miller
Browse files

net/mlx5e: Move generic functions to new file 



These functions were identified as ones that could be made generic and
used by multiple drivers.  Most of the contents of en_rx_am.c are moved
to net_dim.c.

Signed-off-by: default avatarAndy Gospodarek <gospo@broadcom.com>
Acked-by: default avatarTal Gilboa <talgi@mellanox.com>
Acked-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f5e7f67d

drivers/net/ethernet/mellanox/mlx5/core/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ mlx5_core-$(CONFIG_MLX5_FPGA) += fpga/cmd.o fpga/core.o fpga/conn.o fpga/sdk.o \ 
		fpga/ipsec.o



mlx5_core-$(CONFIG_MLX5_CORE_EN) += en_main.o en_common.o en_fs.o en_ethtool.o \

		en_tx.o en_rx.o en_rx_am.o en_txrx.o en_stats.o vxlan.o \

		en_arfs.o en_fs_ethtool.o en_selftest.o

		en_tx.o en_rx.o en_dim.o en_txrx.o en_stats.o vxlan.o \

		en_arfs.o en_fs_ethtool.o en_selftest.o net_dim.o



mlx5_core-$(CONFIG_MLX5_MPFS) += lib/mpfs.o

drivers/net/ethernet/mellanox/mlx5/core/en.h

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
#include "wq.h"

#include "mlx5_core.h"

#include "en_stats.h"

#include "en_dim.h"

#include "net_dim.h"



#define MLX5_SET_CFG(p, f, v) MLX5_SET(create_flow_group_in, p, f, v)

drivers/net/ethernet/mellanox/mlx5/core/en_dim.c

0 → 100644
+47 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2016, Mellanox Technologies. All rights reserved.

 *

 * This software is available to you under a choice of one of two

 * licenses.  You may choose to be licensed under the terms of the GNU

 * General Public License (GPL) Version 2, available from the file

 * COPYING in the main directory of this source tree, or the

 * OpenIB.org BSD license below:

 *

 *     Redistribution and use in source and binary forms, with or

 *     without modification, are permitted provided that the following

 *     conditions are met:

 *

 *      - Redistributions of source code must retain the above

 *        copyright notice, this list of conditions and the following

 *        disclaimer.

 *

 *      - Redistributions in binary form must reproduce the above

 *        copyright notice, this list of conditions and the following

 *        disclaimer in the documentation and/or other materials

 *        provided with the distribution.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

 * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

 * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

 * SOFTWARE.

 */



#include "en.h"



void mlx5e_rx_am_work(struct work_struct *work)

{

	struct mlx5e_rx_am *am = container_of(work, struct mlx5e_rx_am,

					      work);

	struct mlx5e_rq *rq = container_of(am, struct mlx5e_rq, am);

	struct mlx5e_cq_moder cur_profile = mlx5e_am_get_profile(am->mode,

								 am->profile_ix);



	mlx5_core_modify_cq_moderation(rq->mdev, &rq->cq.mcq,

				       cur_profile.usec, cur_profile.pkts);



	am->state = MLX5E_AM_START_MEASURE;

}

drivers/net/ethernet/mellanox/mlx5/core/en_rx_am.c→drivers/net/ethernet/mellanox/mlx5/core/net_dim.c

+3 −16
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2016, Mellanox Technologies. All rights reserved.

 * Copyright (c) 2017-2018, Broadcom Limited. All rights reserved.

 *

 * This software is available to you under a choice of one of two

 * licenses.  You may choose to be licensed under the terms of the GNU
@@ -32,11 +33,11 @@ 


#include "en.h"



#define MLX5E_PARAMS_AM_NUM_PROFILES 5

/* Adaptive moderation profiles */

#define MLX5E_AM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE 256

#define MLX5E_RX_AM_DEF_PROFILE_CQE 1

#define MLX5E_RX_AM_DEF_PROFILE_EQE 1

#define MLX5E_PARAMS_AM_NUM_PROFILES 5



/* All profiles sizes must be MLX5E_PARAMS_AM_NUM_PROFILES */

#define MLX5_AM_EQE_PROFILES { \
@@ -61,7 +62,7 @@ profile[MLX5_CQ_PERIOD_NUM_MODES][MLX5E_PARAMS_AM_NUM_PROFILES] = { 
	MLX5_AM_CQE_PROFILES,

};



static inline struct mlx5e_cq_moder mlx5e_am_get_profile(u8 cq_period_mode, int ix)

struct mlx5e_cq_moder mlx5e_am_get_profile(u8 cq_period_mode, int ix)

{

	struct mlx5e_cq_moder cq_moder;
@@ -82,7 +83,6 @@ struct mlx5e_cq_moder mlx5e_am_get_def_profile(u8 rx_cq_period_mode) 
	return mlx5e_am_get_profile(rx_cq_period_mode, default_profile_ix);

}





static bool mlx5e_am_on_top(struct mlx5e_rx_am *am)

{

	switch (am->tune_state) {
@@ -273,19 +273,6 @@ static void mlx5e_am_calc_stats(struct mlx5e_rx_am_sample *start, 
					delta_us);

}



void mlx5e_rx_am_work(struct work_struct *work)

{

	struct mlx5e_rx_am *am = container_of(work, struct mlx5e_rx_am,

					      work);

	struct mlx5e_rq *rq = container_of(am, struct mlx5e_rq, am);

	struct mlx5e_cq_moder cur_profile = profile[am->mode][am->profile_ix];



	mlx5_core_modify_cq_moderation(rq->mdev, &rq->cq.mcq,

				       cur_profile.usec, cur_profile.pkts);



	am->state = MLX5E_AM_START_MEASURE;

}



void mlx5e_rx_am(struct mlx5e_rx_am *am,

		 u16 event_ctr,

		 u64 packets,

drivers/net/ethernet/mellanox/mlx5/core/en_dim.h→drivers/net/ethernet/mellanox/mlx5/core/net_dim.h

+2 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013-2015, Mellanox Technologies, Ltd.  All rights reserved.

 * Copyright (c) 2017-2018, Broadcom Limited

 * Copyright (c) 2017-2018, Broadcom Limited.  All rights reserved.

 *

 * This software is available to you under a choice of one of two

 * licenses.  You may choose to be licensed under the terms of the GNU
@@ -98,5 +98,6 @@ void mlx5e_rx_am(struct mlx5e_rx_am *am, 
		 u64 bytes);

void mlx5e_rx_am_work(struct work_struct *work);

struct mlx5e_cq_moder mlx5e_am_get_def_profile(u8 rx_cq_period_mode);

struct mlx5e_cq_moder mlx5e_am_get_profile(u8 cq_period_mode, int ix);



#endif /* MLX5_AM_H */