From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tal Gilboa Subject: Re: [PATCH net-next v2 06/10] net/mlx5e: Change Mellanox references in DIM code Date: Sun, 7 Jan 2018 11:44:48 +0200 Message-ID: <4de12484-6718-0926-e134-e9266dbcbe26@mellanox.com> References: <1515193094-9554-1-git-send-email-andy@greyhouse.net> <1515193094-9554-7-git-send-email-andy@greyhouse.net> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Cc: mchan@broadcom.com, ogerlitz@mellanox.com, Andy Gospodarek To: Andy Gospodarek , netdev@vger.kernel.org Return-path: Received: from mail-eopbgr00072.outbound.protection.outlook.com ([40.107.0.72]:27263 "EHLO EUR02-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751396AbeAGJo5 (ORCPT ); Sun, 7 Jan 2018 04:44:57 -0500 In-Reply-To: <1515193094-9554-7-git-send-email-andy@greyhouse.net> Content-Language: en-US Sender: netdev-owner@vger.kernel.org List-ID: On 1/6/2018 12:58 AM, Andy Gospodarek wrote: > From: Andy Gospodarek > > Change all appropriate mlx5_am* and MLX5_AM* references to net_dim and > NET_DIM, respectively, in code that handles dynamic interrupt > moderation. Also change all references from 'am' to 'dim' when used as > local variables. > > Signed-off-by: Andy Gospodarek > Acked-by: Tal Gilboa > Acked-by: Saeed Mahameed > > --- > drivers/net/ethernet/mellanox/mlx5/core/en.h | 12 +- > drivers/net/ethernet/mellanox/mlx5/core/en_dim.c | 14 +- > .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 12 +- > drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 52 ++-- > drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 4 +- > drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 2 +- > drivers/net/ethernet/mellanox/mlx5/core/net_dim.c | 284 ++++++++++----------- > drivers/net/ethernet/mellanox/mlx5/core/net_dim.h | 63 +++-- > 8 files changed, 232 insertions(+), 211 deletions(-) > > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en.h b/drivers/net/ethernet/mellanox/mlx5/core/en.h > index 121f280..732f275 100644 > --- a/drivers/net/ethernet/mellanox/mlx5/core/en.h > +++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h > @@ -115,6 +115,9 @@ > #define MLX5E_PARAMS_DEFAULT_MIN_RX_WQES 0x80 > #define MLX5E_PARAMS_DEFAULT_MIN_RX_WQES_MPW 0x2 > > +#define MLX5E_CQ_PERIOD_MODE_START_FROM_EQE 0x0 > +#define MLX5E_CQ_PERIOD_MODE_START_FROM_CQE 0x1 > + This enum should be defined under include/linux/mlx5/mlx5_ifc.h: enum { MLX5_CQ_PERIOD_MODE_START_FROM_EQE = 0x0, MLX5_CQ_PERIOD_MODE_START_FROM_CQE = 0x1, MLX5_CQ_PERIOD_NUM_MODES }; We already include this in the relevant files. This was changed in patch 01/10, please revert.