From patchwork Sun Feb 26 09:09:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Talat Batheesh X-Patchwork-Id: 734194 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3vYDpZ09P3z9sNr; Wed, 1 Mar 2017 23:12:22 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="KvIjP4yX"; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1cj37A-0005YP-72; Wed, 01 Mar 2017 12:12:16 +0000 Received: from mail-db5eur01on0040.outbound.protection.outlook.com ([104.47.2.40] helo=EUR01-DB5-obe.outbound.protection.outlook.com) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1chuqP-0007ot-Ts for kernel-team@lists.canonical.com; Sun, 26 Feb 2017 09:10:18 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=VE6rE4f3sGq4KkHJ6ngKvuGbdMfGFj/A6A0Jjfpw5T4=; b=KvIjP4yXvN6rcGQWaKpbbvkqAKtl5XvX2QWz4uUgcjAfk99ZZXnzW77vB6P9hQswfwwM65VPtBUNkpccQCdUGU9z3aBrWbE0UJzkPTu+tZWjbD+UoeKvXymINkE+fZC0y5v4rQTIxi0OjlILcKgtXHEo2s9ZKB0XSTOeAGwLaGQ= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=talatb@mellanox.com; Received: from dev-h-vrt-005.mth.labs.mlnx (193.47.165.251) by HE1PR05MB1306.eurprd05.prod.outlook.com (10.162.250.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.919.13; Sun, 26 Feb 2017 09:10:15 +0000 From: Talat Batheesh To: Subject: [PATCH 02/18] net/mlx5: Push min-inline mode resolution helper into the core Date: Sun, 26 Feb 2017 11:09:47 +0200 Message-ID: <1488100203-31976-2-git-send-email-talatb@mellanox.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1488100203-31976-1-git-send-email-talatb@mellanox.com> References: <1488100203-31976-1-git-send-email-talatb@mellanox.com> MIME-Version: 1.0 X-Originating-IP: [193.47.165.251] X-ClientProxiedBy: AM4PR02CA0026.eurprd02.prod.outlook.com (10.165.239.164) To HE1PR05MB1306.eurprd05.prod.outlook.com (10.162.250.151) X-MS-Office365-Filtering-Correlation-Id: 0f5bc87d-db08-44d8-03c9-08d45e27477a X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081); SRVR:HE1PR05MB1306; X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB1306; 3:rv15ghOjrQS0F83OQkCWLcz2JPCK6hYoMc7Wr8XObIWOAuEirRb15mvcH3b6JOcfc5SYkkutImRQ7WbL9aTCTuLp/a3ST4fOp27s5azg4BA3iCj1UiyIHl15Kr3rRYAaAwXRpq4ZzMxchy+winL5kWeivQLvIVQ5NhlRe74IZXGAc1aFylSmYxWMZ/n18rOlh2H+jlaoOtE0VMUvR0wTEgiV/QD4I087+LR2ZfSzgd4T1lVA3oI4alRtYzAx1IlE4OmBjlIcNI7Zdpj0K5xTycCTL/RBGH85AKN9BoDtQsM=; 25:1TlIGzuYDi9FVF62LmgJ35ZBTAuHHkMMLpP+owvpveOINkuM1suHFoXNRbzWpE058dz6E3rtTwJnkQ1+F6UVA4JF/SMWdDioYiCfjOfcBZPpbmkmvBx1AjA+UAT7z8ytY0umrB1dF7ZaoYH9lu6Yoy89g4cMWVtkOwQV4HiLy8jnX4+Of/KHwjYH5cFdiZlj2unEqSr1wQlF/eIJzjmCC8Y1LqJvhoAYNprBuCyTxJ2puq3MjEXKjNf9rAvxdghOFzbeLr3Gf1stOeSBMnW0MMPd8g+OPosjbzG7KrnnupQ+WovuViGaxlx+k1HIrqxi0lOqQOnPlDfUSIaXNo2/h7NIqgxgEkrVya3MwVqxXnY6mZBtuF02Mfd0L7tGHjru7a4Cl1Cu6pxksSXAI5aP1Uj2WcgdfIQ746h5jMZQggLSE7KFGj97C6yG9YYeCTQEWzacLsWZ/uNwxcML751IjA== X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB1306; 31:qmd8eCwXJQyWBhSSBmthsPCiQdkxBxAjAULdPHXd6Bh+KsER53rnvsqOe2XZruKkCetEc6yCUdnJJ3WX7Hg6cYcHT7IgL0r0Q5P9gQDfev5cbj2dJQ5Vv9peFgPR3WuUoHUCWjn46YqsRVTliC5ROUEQqrnpO0r5B9d0PUJQFtGMMKU6TVauNratcTLxv3+qsRIZuq+1dafgJedwGJR26p5H2CDayFK5Te71waL47i/oa9prn4EqQEMA3N2wuv8U; 20:C0wFB+McOVQnN+b+y4rAo/a/F7rHjCpOzEkH2WqiN8K/8mns63RqJMl+pFr24Zqmwakh5IlCnY3UB04iOYoZcvGKoBnnFwNOx5cnjx20cinlP0SLNbAvPUcSppfL08d1NdlZcKt/TbgfshKalJZfl39lDKKFpystGk/ULSpV3TtE2m7v5p/zzdStKjhidQU91x2wSRIdvUDnhLqHo/IjO6TSyKs576e0CjqCinhtoUlE13EaOMIS+5kvYzpEvzaJWzRzuencxioXbkFLF259INcQ0e+yqjPN3PNBqghGCa3fnDhgemWUxt3sEaXjd05TwpMmc0wPbnr2Ub+ZbV89+ykBgyYECTTqg6X3Mf8rsFSLuM0Mi4bm11HvWZCWjgK7m9DGd7Og1L4NSddPS5zWx+X3372QkRxytSPub7theg+nvCs8rjmEOb911YpSBoQQGgzmrsVkFQG86WtH+9eNfq981IYsGUkUPWIZvXnyhfZAPYPtwfGlHn2pel9o07Gw X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(211254476889703)(24339691489775); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6055026)(6041248)(20161123558025)(20161123562025)(20161123555025)(20161123560025)(20161123564025)(6072148); SRVR:HE1PR05MB1306; BCL:0; PCL:0; RULEID:; SRVR:HE1PR05MB1306; X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB1306; 4:G86xIATiIJ5T1pH62cgs2+hmYHuOqe5Ex6NokDRQXNfL/NZj+mrVl/fyJPoj9/aTd+Yovxc14tTffF48slgwcrwLAFWmBLV72zKxnmKO8MLc2YXfhT8IQtsoBxBjC36GWGoBnE1RgaD7hBytWBjxtvXj1PavbIXfeLRxmmUntPqW7Nbbs7kIUUfl/atipr4EKBtGtvtefNIe7pHTydjP0m5+tfMg1je1ArdlxeX1TYD1zeWxNeTEcSOCB3QUMBoUd+qNbUeL2gSNUz5l8qFtk8dRjaRkEfhlDNQ0wJ7aQqKTquTIX3KBjez1SHIB0f8XoK2jQhT8FYKN3LSl3FCqdx9aKGomSjMQyvvTt+twTkETayqHBbBvkHriv+ODVLzA3C+KaXfYEr39eLlopjs/g+lSLUrQ6l/hhyXvmVRc7W6lsRIY0DXgxddeM8Fx3GrTbZuF+FpteXhHeA1Ld4SSvJKReae9flZ9vM7jMXOUr/sYRulpooEskhTam7P/bLTotk7ISP/awOESAtGl9h0ZRrpzn3LWoZaDf9d/1rrExpViaxiWr77yjeHaG6sd8BK+2r8/Ntc3BX+ZNqySyVYBo61HW/vz1AaveF0S3voWeMvpoTAvHwsqFiX2QgKRscGMjWCranLENmvCIAaNYJzvLbJk8jUheRXXaa1cHT3aILGsKCmmxfUvfgHY4cnJaOwAtplwOW/Gy7HSqgT1iOc15Q== X-Forefront-PRVS: 0230B09AC4 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(7916002)(39410400002)(39450400003)(39850400002)(39840400002)(199003)(189002)(68736007)(81166006)(8676002)(6512007)(81156014)(50226002)(3846002)(6116002)(50466002)(6506006)(48376002)(66066001)(6306002)(25786008)(47776003)(6666003)(2950100002)(5003940100001)(6916009)(6486002)(36756003)(5660300001)(101416001)(189998001)(92566002)(7736002)(107886003)(110136004)(33646002)(97736004)(105586002)(38730400002)(106356001)(2351001)(305945005)(76176999)(50986999)(4326007)(53936002)(2906002)(86362001)(42186005)(450100001); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR05MB1306; H:dev-h-vrt-005.mth.labs.mlnx; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR05MB1306; 23:lmjnrL1Zku9/LC1NN7xhcvL5UUi+p6jcn0jR3le0I?= =?us-ascii?Q?jejxzMUZhuunwm4jVBSj+Q94tzLIg9OaGPbuUxZh55KS0YlTZ00M8oC6pRgw?= =?us-ascii?Q?2KUCHjEWDUfA9kZ3WPHEWVBIxD8lY61rr0iCd2FblFMdlhTAu7fe3cK7Kaxi?= =?us-ascii?Q?TYKomZnOefPKCk/q7nhbEZOP55c29LlGNiy6CzcGVNMhrWxtYeCtWxVVBXJQ?= =?us-ascii?Q?c2h+O2mEXivTuyyi7Hkk7wb9IfTb/nSwbYV7cTsZAQ1XQeWq2PihFdoEbs2H?= =?us-ascii?Q?Cl6tgAEvzC3toNtmSc4LNsLfprp7zkYFMTolG1sujMBs2+b5dCefXrX4NSM8?= =?us-ascii?Q?ECdJJzR+YxElimuQ0vVoZaByG6CfQo7sRlp2Jxi0D3AJ49vn1GoXS68qp81h?= =?us-ascii?Q?ucTD1u261skZ+lwHBXQi7wodREPAB2mkbw8g4LSvJWagoj9m3nK8+OgjZ9bz?= =?us-ascii?Q?bGRVjskq0oYfUkQWMD9H3Wlx2Na3f/JTpc7lELigU5TqmLWf7mc+bCxn4lh1?= =?us-ascii?Q?1LBG6p8fLRLUpVB9dWHE1GpNnTbSsXXmOLW3uqNTq+Har2nNmhuCYQLW01qg?= =?us-ascii?Q?dl+6+sd1jrTpNFn0vJUO4Jy/gzIoIMyz8ket1XZgWYCj72yC7VOsHi11xK5N?= =?us-ascii?Q?0K108WF8faHLV1Jc4zANg9a39Grh1bGMcfxzTVknPLWC7bv/N6/bcXSga2/Q?= =?us-ascii?Q?H3FiTnWU8XBb6fCdLmfSQ8EPXsM3FKNXuQDIByFMATrFBHYVDPCRWccD+WK8?= =?us-ascii?Q?AikrUMXW7WgshASoEpzXvhx1+J3QWa77RTXs+DlXIE4qVrkJzfE+E9etHfgq?= =?us-ascii?Q?qir/MGBijwaoQJuMtdEOuFHQK/eipIF2I+7lPynBLYlFAEXBgRuSNVgQHcmM?= =?us-ascii?Q?rCMf6iYY4x1khjMokgZSXd3c5pkZyC9/sPzB6CVOqhMXo0FpZVTuy8uKJD8i?= =?us-ascii?Q?fM1nbmO/vat8wTHbkINaoOmOufx4wCHHEfvm1qu/EJxrmgNf+n6Cce88f/MH?= =?us-ascii?Q?xbXnkCk4cGnoijl0fOCmLQsFMpClXKM4ohLsN+1SHgLYbkGMoKlTuxRjRG3R?= =?us-ascii?Q?otHrob/cEUMUPdoN27i7TNm/dw3TEei+6SK/m6EvR4Ddm3V3P/bQUZ/M+lLS?= =?us-ascii?Q?v1rs5Hx889Cx71idm3pX2JjL+0PeIwq6AcqGdDTNaGuTDsTAK1ynSib1UmO4?= =?us-ascii?Q?d1mehV9AR5dXMh9u8pTO5EYe2xhCTI8hH+MiZxu/i5aPdMQ9+H17Z/svgpJl?= =?us-ascii?Q?pa+ARlnjPh6qZI683+q8DSjJqCOVkEoSUIwsSii?= X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB1306; 6:iegxd1dIRMdsADYkcoctnFx8/fvwSEptEtVI3T1daBUjImO3Lg3Z75TZHzt1j/qror3eiqvFYMmFSerpTqrOorGVy0j7GgqYeXT6PypcauixvtqEYUuRpLC/kFTYrjumc88fr8yd2/sgs+GzAdpdhVe76KxX/S0eggVd+lDxFh7nhawBjvadMyXf4bbkLY3oJsQCmuoS4WPkTgEdMKCAsQ1V5IRtu0m5RHURmYKlm5mu3hrJx6hRP1mB0CscK965NdTUxkeNj8izyF4wMNvtFqyonPMrn84nKErNra0iuXSyRbxGa4HgXF9e3GRbGdyAI71jMZC7GCyRt13rzilNNVZvsYa89dPida54z8QKe9fPOZP7kU49DLZN1aQJ1VlLDOmqBrm6Tbb1ZcHy6CWmizJNtJZfEAuzey/YpkUCtVw=; 5:8LFaSlroZ4JT9fzvHK+3rXOtejQvtvk6LS074VVop+OuOQBgWKLW9nHT/SYAslu5lI37FYIt40AieKGsY3s2A5KZm3XhLQuBGL+o5yc6pXfOCRdlPKuMHs67v31EA7BoCWsjeIGAYmVRx96pC86TurbcB7/KaIoXpq/WjcUU7s4=; 24:+JbcVLJoSQPSBw6zg3wQ8/TJVc6Oc0rdL+J7B2jLM152VPKj0Z8mI8ssocdACgiXNYnx+itPIFtgd07fl3ZHwDyyrqRv2XHhs4ZmhaQ3LDo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB1306; 7:pqsq7qQE3OSbWJC1fYl3GRXNgAttq9Y1AcgWe3E7w/0tXswWv+LWHWW7BnU0gcvtsSLMgafm6VJwu0zvcGICvuXxcNjiknoWjVHtZs2iGx60We+XwyNqsTKTptby5rnf776w82af764N2B2cpjYYbIbFXtUr5eW84/BNLOZucdp46xQSStq8V8GUqCdKG3DtMHEDPQPhu2IilYXz700EMMoxHPWObTORhJel3/7egsokL/ATSmWMBHiG4GNo2BfxMVHzNKxE2Sdszp/6Nvs5HFwa9TC7Snu3jVUYmpg2teYTn+50zQsXPcOfcuqitJKYB559KDIrADW5d6Oy2fv/5g== X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2017 09:10:15.7092 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR05MB1306 X-Mailman-Approved-At: Wed, 01 Mar 2017 12:12:14 +0000 Cc: talatb@mellanox.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com From: Or Gerlitz BugLink: https://bugs.launchpad.net/ubuntu/1668019 So we can use that from the IB driver too in downstream patches. This patch doesn't change any functionality. Signed-off-by: Or Gerlitz Signed-off-by: Saeed Mahameed (cherry picked from commit 8c7245a60ef8f8c4a427349690c5a141cfed6217) Signed-off-by: Talat Batheesh --- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 18 +----------------- drivers/net/ethernet/mellanox/mlx5/core/vport.c | 17 +++++++++++++++++ include/linux/mlx5/vport.h | 1 + 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c index f14ca33..9b3bc23 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c @@ -3432,22 +3432,6 @@ void mlx5e_set_rx_cq_mode_params(struct mlx5e_params *params, u8 cq_period_mode) MLX5E_PARAMS_DEFAULT_RX_CQ_MODERATION_USEC_FROM_CQE; } -static void mlx5e_query_min_inline(struct mlx5_core_dev *mdev, - u8 *min_inline_mode) -{ - switch (MLX5_CAP_ETH(mdev, wqe_inline_mode)) { - case MLX5_CAP_INLINE_MODE_L2: - *min_inline_mode = MLX5_INLINE_MODE_L2; - break; - case MLX5_CAP_INLINE_MODE_VPORT_CONTEXT: - mlx5_query_nic_vport_min_inline(mdev, 0, min_inline_mode); - break; - case MLX5_CAP_INLINE_MODE_NOT_REQUIRED: - *min_inline_mode = MLX5_INLINE_MODE_NONE; - break; - } -} - u32 mlx5e_choose_lro_timeout(struct mlx5_core_dev *mdev, u32 wanted_timeout) { int i; @@ -3507,7 +3491,7 @@ static void mlx5e_build_nic_netdev_priv(struct mlx5_core_dev *mdev, priv->params.tx_cq_moderation.pkts = MLX5E_PARAMS_DEFAULT_TX_CQ_MODERATION_PKTS; priv->params.tx_max_inline = mlx5e_get_max_inline_cap(mdev); - mlx5e_query_min_inline(mdev, &priv->params.tx_min_inline_mode); + mlx5_query_min_inline(mdev, &priv->params.tx_min_inline_mode); priv->params.num_tc = 1; priv->params.rss_hfunc = ETH_RSS_HASH_XOR; diff --git a/drivers/net/ethernet/mellanox/mlx5/core/vport.c b/drivers/net/ethernet/mellanox/mlx5/core/vport.c index 7129c30..15c2294 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/vport.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/vport.c @@ -127,6 +127,23 @@ int mlx5_query_nic_vport_min_inline(struct mlx5_core_dev *mdev, } EXPORT_SYMBOL_GPL(mlx5_query_nic_vport_min_inline); +void mlx5_query_min_inline(struct mlx5_core_dev *mdev, + u8 *min_inline_mode) +{ + switch (MLX5_CAP_ETH(mdev, wqe_inline_mode)) { + case MLX5_CAP_INLINE_MODE_L2: + *min_inline_mode = MLX5_INLINE_MODE_L2; + break; + case MLX5_CAP_INLINE_MODE_VPORT_CONTEXT: + mlx5_query_nic_vport_min_inline(mdev, 0, min_inline_mode); + break; + case MLX5_CAP_INLINE_MODE_NOT_REQUIRED: + *min_inline_mode = MLX5_INLINE_MODE_NONE; + break; + } +} +EXPORT_SYMBOL_GPL(mlx5_query_min_inline); + int mlx5_modify_nic_vport_min_inline(struct mlx5_core_dev *mdev, u16 vport, u8 min_inline) { diff --git a/include/linux/mlx5/vport.h b/include/linux/mlx5/vport.h index ec35157..656c70b 100644 --- a/include/linux/mlx5/vport.h +++ b/include/linux/mlx5/vport.h @@ -51,6 +51,7 @@ int mlx5_query_nic_vport_mac_address(struct mlx5_core_dev *mdev, u16 vport, u8 *addr); int mlx5_query_nic_vport_min_inline(struct mlx5_core_dev *mdev, u16 vport, u8 *min_inline); +void mlx5_query_min_inline(struct mlx5_core_dev *mdev, u8 *min_inline); int mlx5_modify_nic_vport_min_inline(struct mlx5_core_dev *mdev, u16 vport, u8 min_inline); int mlx5_modify_nic_vport_mac_address(struct mlx5_core_dev *dev,