From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andy Gospodarek Subject: Re: [PATCH net-next v2 06/10] net/mlx5e: Change Mellanox references in DIM code Date: Mon, 8 Jan 2018 09:18:13 -0500 Message-ID: <20180108141813.GB87664@C02RW35GFVH8.dhcp.broadcom.net> References: <1515193094-9554-1-git-send-email-andy@greyhouse.net> <1515193094-9554-7-git-send-email-andy@greyhouse.net> <4de12484-6718-0926-e134-e9266dbcbe26@mellanox.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: netdev@vger.kernel.org, mchan@broadcom.com, ogerlitz@mellanox.com, Andy Gospodarek To: Tal Gilboa Return-path: Received: from mail-qk0-f194.google.com ([209.85.220.194]:40598 "EHLO mail-qk0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756997AbeAHOSR (ORCPT ); Mon, 8 Jan 2018 09:18:17 -0500 Received: by mail-qk0-f194.google.com with SMTP id d18so3864740qke.7 for ; Mon, 08 Jan 2018 06:18:17 -0800 (PST) Content-Disposition: inline In-Reply-To: <4de12484-6718-0926-e134-e9266dbcbe26@mellanox.com> Sender: netdev-owner@vger.kernel.org List-ID: On Sun, Jan 07, 2018 at 11:44:48AM +0200, Tal Gilboa wrote: > > > 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. > Ah yes. I'd forgotten I moved that out of there to start and I'll move it back. Thanks!