From patchwork Wed Nov 7 18:31:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gal Pressman X-Patchwork-Id: 994428 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="T3+a04Aw"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42qw4H5ym2z9sDJ for ; Thu, 8 Nov 2018 05:31:59 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728295AbeKHEDd (ORCPT ); Wed, 7 Nov 2018 23:03:33 -0500 Received: from mail-ed1-f68.google.com ([209.85.208.68]:35106 "EHLO mail-ed1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726726AbeKHEDd (ORCPT ); Wed, 7 Nov 2018 23:03:33 -0500 Received: by mail-ed1-f68.google.com with SMTP id e18-v6so2860525eds.2 for ; Wed, 07 Nov 2018 10:31:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=3rMIhxMeah0l8GwTmY+zIRWWtU1hIpcX15sUR3UYP6Y=; b=T3+a04Aw6XWD94neQh7SKbBtTtdt6EpEuZsoHfEkOAq1ItBwV0MnEA+m156DnV4s93 cvyIjgfUpVv6x+TEZN+MQFJ3k9SDbaOkmrtB51EmmhA7WXQqwON6T/62jg40UNjOl01p dHqK7OhSZibgv7vBTaDLmBfA+AzG/hQcAndgE8xL1jtk1POgVuJELMJXDcpHDj832apU TyhaG/EZODi+f7FLzpKRpLr0a+X5kqeMdbhgr5XwNgXZ3Pl4jiqCw0S8cOmwwA47WIpi 4s6QcnXahlZnrpuS9GKHardfnyj1DU0ZvOc9bwkeskz6EgFYJMEQOyTLgnbubtF3pJ2G SC5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=3rMIhxMeah0l8GwTmY+zIRWWtU1hIpcX15sUR3UYP6Y=; b=da78mHJm9XXo6hLl98q5SVxdS0WkYvUmP9tyC3MDJBEetoywZe8rVG3oyWqwD1fX/y TPyDhUBvCYuBPIcMSA7PEu3ca7Z3Pv8wK3EVL4K+AeaMOfbGb46NXNGkaSbg26MSx1Xg STfZ3fXALqnykUp+IheiKkLg8bjbWEw4CJz3P0cYpAtV9sp6KvfuV1sM0Xfi4MS7AtnI VWQiX2SoAg+copZRTGQvGx7BpbXbDbDlQ/rrfsjSkiReh0/q0jQlsHeypbb0KSZ8gmsv xlSdYQ6mX96/5dLt8QO2L3Vzo64En9iMustUZP4YjLr8srE/Ba8onk/2ENIOMoU+5AH5 dd2A== X-Gm-Message-State: AGRZ1gKx7pRs66J9wt68gOvLJpiKsaryIozwaifni7mpvXcxl4rpQ4On 99k/SQeNCxAQ/E4SFufZQLA= X-Google-Smtp-Source: AJdET5flPa6q8WytHBr8oEc5VK7f7iXJ5PNorTZVuoM+p3rvIBx+obeoAgpiEGidbIqTSSqeiGoDyA== X-Received: by 2002:a50:ba81:: with SMTP id x1-v6mr1120620ede.191.1541615515908; Wed, 07 Nov 2018 10:31:55 -0800 (PST) Received: from a-314bh6t9fh21n.eu-west-1.compute.internal (ec2-52-214-2-46.eu-west-1.compute.amazonaws.com. [52.214.2.46]) by smtp.gmail.com with ESMTPSA id 42-v6sm412654edz.82.2018.11.07.10.31.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Nov 2018 10:31:54 -0800 (PST) From: Gal Pressman To: Saeed Mahameed , David Miller Cc: netdev@vger.kernel.org, Gal Pressman Subject: [PATCH net-next 1/2] net/mlx5e: Cleanup unused defines Date: Wed, 7 Nov 2018 20:31:36 +0200 Message-Id: <20181107183137.16774-1-pressmangal@gmail.com> X-Mailer: git-send-email 2.14.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Remove couple of defines that are no longer used. Signed-off-by: Gal Pressman --- drivers/net/ethernet/mellanox/mlx5/core/en.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en.h b/drivers/net/ethernet/mellanox/mlx5/core/en.h index d7fbd5b6ac95..c49c87615686 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h @@ -147,9 +147,6 @@ struct page_pool; MLX5_UMR_MTT_ALIGNMENT)) #define MLX5E_UMR_WQEBBS \ (DIV_ROUND_UP(MLX5E_UMR_WQE_INLINE_SZ, MLX5_SEND_WQE_BB)) -#define MLX5E_ICOSQ_MAX_WQEBBS MLX5E_UMR_WQEBBS - -#define MLX5E_NUM_MAIN_GROUPS 9 #define MLX5E_MSG_LEVEL NETIF_MSG_LINK From patchwork Wed Nov 7 18:31:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gal Pressman X-Patchwork-Id: 994429 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="O7WxkOLB"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42qw4J4CM2z9sDT for ; Thu, 8 Nov 2018 05:32:00 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728306AbeKHEDe (ORCPT ); Wed, 7 Nov 2018 23:03:34 -0500 Received: from mail-ed1-f68.google.com ([209.85.208.68]:38822 "EHLO mail-ed1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726864AbeKHEDd (ORCPT ); Wed, 7 Nov 2018 23:03:33 -0500 Received: by mail-ed1-f68.google.com with SMTP id a2-v6so9663271edi.5 for ; Wed, 07 Nov 2018 10:31:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mwmS1i1jQSlHIz8v1vYLTNeLtLCmnM7kMFunOA6Manc=; b=O7WxkOLBnEe9J/OyD3fmCULs6lGVeIL6HV2zQ1plehzQmvntv6HaP4VZQ0brLNkipG Ji6Vo9kSpQSdH9BWMtL5aHxWm96WVyNqR7BVu6geUeEUR5AypkoIJfDJBxEevQ54tmhI oEDH96ZnLsi8nyUcbsmbSsS7ZCiVxG7QRA/FL4OMoXiUI0VMRpOnmzuo2o1bbVwfdBRa 2K0ypM6RniR1mJvfdDL3hW8swj5xZrYW2S6RgOFUuj6Tx3ciVaUIdGezXSup0i5umChq BFRKQwLlBFhPsVKH1Fo8wBCuKShUwpo6P3/Gahf9eJS4vvqiOXyqbWtC6OPJ/sUJGS28 wWfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mwmS1i1jQSlHIz8v1vYLTNeLtLCmnM7kMFunOA6Manc=; b=FbvnHGgDK1lf3xbVd/f2du2qomT0VM6HH3ydYDGYWKbYHypKrOcWGJxgc4i8kduSkp 7lQ+IEpMqnRiQm5Y71b/HF/EUmcZWVhV5/+OHkYsWAqBAnu2/X2Gq+AkKvcWomTjLN3G Hoh4F4muhUaT+Fxp2GyqM3oqGGNNVkFXkN78BnYRwyxTyeEPUrLsib23e1zjlMI1zUIP ewFsUVYsODAVyn8cX4XtiWXt8qDb2MyXWp+m3SIkuZvpbRp1qmzObBDA+kwdLAwD8pxl P/N9One2XWQL+MFDj5a2CrW01dos6F8dYHAyPO8ixTNebkwsFlDX/0fcSuVNs4iU3bIW WTJA== X-Gm-Message-State: AGRZ1gI5uQs8h1aeHV2dAHOchixsjbGFTFf+22v3eXiEe4/xT8EthVVV UcO/U+S7HsKj/uuMSzORGC8= X-Google-Smtp-Source: AJdET5dASk/Zgq2yVOtZJ1CD60C5sVGwocEnoXrZ4LH5URYlRfRWooqHDavsXbr1RIGB+CCvz1WcWA== X-Received: by 2002:a17:906:a984:: with SMTP id jr4-v6mr890738ejb.90.1541615516708; Wed, 07 Nov 2018 10:31:56 -0800 (PST) Received: from a-314bh6t9fh21n.eu-west-1.compute.internal (ec2-52-214-2-46.eu-west-1.compute.amazonaws.com. [52.214.2.46]) by smtp.gmail.com with ESMTPSA id 42-v6sm412654edz.82.2018.11.07.10.31.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Nov 2018 10:31:56 -0800 (PST) From: Gal Pressman To: Saeed Mahameed , David Miller Cc: netdev@vger.kernel.org, Gal Pressman Subject: [PATCH net-next 2/2] net/mlx5: Fix offsets of ifc reserved fields Date: Wed, 7 Nov 2018 20:31:37 +0200 Message-Id: <20181107183137.16774-2-pressmangal@gmail.com> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20181107183137.16774-1-pressmangal@gmail.com> References: <20181107183137.16774-1-pressmangal@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix wrong offsets of reserved fields in ifc file. Issues found using pahole. Signed-off-by: Gal Pressman --- include/linux/mlx5/mlx5_ifc.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h index dbff9ff28f2c..79b77fc62271 100644 --- a/include/linux/mlx5/mlx5_ifc.h +++ b/include/linux/mlx5/mlx5_ifc.h @@ -349,7 +349,7 @@ struct mlx5_ifc_flow_table_prop_layout_bits { u8 reformat_l3_tunnel_to_l2[0x1]; u8 reformat_l2_to_l3_tunnel[0x1]; u8 reformat_and_modify_action[0x1]; - u8 reserved_at_14[0xb]; + u8 reserved_at_15[0xb]; u8 reserved_at_20[0x2]; u8 log_max_ft_size[0x6]; u8 log_max_modify_header_context[0x8]; @@ -586,7 +586,7 @@ struct mlx5_ifc_flow_table_eswitch_cap_bits { u8 fdb_multi_path_to_table[0x1]; u8 reserved_at_1d[0x1]; u8 multi_fdb_encap[0x1]; - u8 reserved_at_1e[0x1e1]; + u8 reserved_at_1f[0x1e1]; struct mlx5_ifc_flow_table_prop_layout_bits flow_table_properties_nic_esw_fdb; @@ -829,7 +829,7 @@ struct mlx5_ifc_vector_calc_cap_bits { struct mlx5_ifc_calc_op calc2; struct mlx5_ifc_calc_op calc3; - u8 reserved_at_e0[0x720]; + u8 reserved_at_c0[0x720]; }; enum { @@ -5566,7 +5566,7 @@ struct mlx5_ifc_modify_nic_vport_context_out_bits { struct mlx5_ifc_modify_nic_vport_field_select_bits { u8 reserved_at_0[0x12]; u8 affiliation[0x1]; - u8 reserved_at_e[0x1]; + u8 reserved_at_13[0x1]; u8 disable_uc_local_lb[0x1]; u8 disable_mc_local_lb[0x1]; u8 node_guid[0x1]; @@ -9024,7 +9024,7 @@ struct mlx5_ifc_dcbx_param_bits { u8 dcbx_cee_cap[0x1]; u8 dcbx_ieee_cap[0x1]; u8 dcbx_standby_cap[0x1]; - u8 reserved_at_0[0x5]; + u8 reserved_at_3[0x5]; u8 port_number[0x8]; u8 reserved_at_10[0xa]; u8 max_application_table_size[6];