From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751814AbdH0NPN (ORCPT ); Sun, 27 Aug 2017 09:15:13 -0400 Received: from mail-bl2nam02on0084.outbound.protection.outlook.com ([104.47.38.84]:23184 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751419AbdH0NNy (ORCPT ); Sun, 27 Aug 2017 09:13:54 -0400 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=fail action=none header.from=nxp.com; From: Madalin Bucur To: , CC: , Subject: [PATCH v4 4/7] dpaa_eth: enable Rx hashing control Date: Sun, 27 Aug 2017 16:13:40 +0300 Message-ID: <1503839623-3906-5-git-send-email-madalin.bucur@nxp.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1503839623-3906-1-git-send-email-madalin.bucur@nxp.com> References: <1503839623-3906-1-git-send-email-madalin.bucur@nxp.com> Reply-To: X-EOPAttributedMessage: 0 X-Matching-Connectors: 131483132318918732;(91ab9b29-cfa4-454e-5278-08d120cd25b8);() X-Forefront-Antispam-Report: CIP:192.88.168.50;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(336005)(39380400002)(39860400002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(106466001)(105606002)(498600001)(5003940100001)(77096006)(189998001)(36756003)(4326008)(85426001)(2950100002)(97736004)(76176999)(33646002)(6666003)(68736007)(50986999)(43066003)(305945005)(47776003)(3450700001)(54906002)(48376002)(8936002)(2906002)(50226002)(53936002)(104016004)(8676002)(356003)(5660300001)(50466002)(81156014)(81166006)(626005)(86362001)(309714004);DIR:OUT;SFP:1101;SCL:1;SRVR:DM2PR03MB557;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BY2FFO11FD043;1:ekylE/BLjmhiZsBR8D60S0yv7OU1EezFHQrsFfIQaPDt1IK19Plxo24bjMK+a4FELtWN+TZx/C1yaZD2x7/zJo8qZ2KTBGHzV9eWLfB2kkjT2nUPwv/hGjFGfRqHswZP MIME-Version: 1.0 Content-Type: text/plain X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6f6b8a9b-583d-4169-284c-08d4ed4d764a X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(300000503095)(300135400095)(2017052603199)(201703131430075)(201703131517081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095);SRVR:DM2PR03MB557; X-Microsoft-Exchange-Diagnostics: 1;DM2PR03MB557;3:ZA2+gIMCUK1Ee+l5yIs7q63YzpJT4ViFTHY92wTcvva0i2ExMoUYj8bS6rxt6rG1fSJfl8kCk8Y7XAayzm95BxAF9KKn/Tv/RpUXN9qPMTvi4HnWG01zprkXTEl1SIVa48D7y7ZKsC4Vjn2njHf5ZAdU1M4xQpnqq1eZhuqb6nsw7h2K5V42Mjk3kwqTijWaOY8fQ4/dlwHfiyW4NrrodnjXP+HoimhrQVxK+wsarDqszBQ7KgwfgVtcewvKDt1kaf1eFnjKHzlE18R4aTywep8IN6+zSfWxzffbmxBJL0+mi0zSmo0fwbHYDsHTEXqWusybzSBRKmmmIV9Bl/GUVS8eOwf95hA2gXhlFEWgnfM=;25:tU/8I6JBXXuNz5B7aDF9SDYni1De8CHcwn1Dubkn0LdvjpybjYuAWu7orEL/kBoCvYfI0MLhmS2azjqq3PCl7i/zXKYMZ7FIJfko2Rk3Nc8Sq3W0a5BwGeC6leXOvDKH41a+onkWt38LxGdbfeK80RSjiSmtB/bWSnw2uZtIwxWgzNCNtY1MT4c/sk2OqGP7SmdwP2ao0RYaZlFFvhBGpKkrSIXRyDaCYY3WRyxpoB9c4ZyDOF+ifUsQeXMRSPuDiyEN7II43eVlPO6ZGpwaWca7ln2MswY2S2SuNcuDKa/47eA8ajj0fCefx//BNueSJa0VXSNdTvjKxN9BJdSR0w== X-MS-TrafficTypeDiagnostic: DM2PR03MB557: X-Microsoft-Exchange-Diagnostics: 1;DM2PR03MB557;31:1WtdBX4ajL0R2tTH+Amh7VC0llpw9rYjThfu/MgcS3FH5XLkllyNt4wjKiZlbO/9GuhSTw44s85lQxww7G7oZ1Vxc+gwghiT/ystSKP/01r/HCCX5S6ywLLIOCAERc4Z9/a+ANcps/ZBYTFgF9i7XRf2EIPJ1lf8FqqaamUPHcFrm+fcXU+gTCwLK2PKShMGtO6HhJZ1Xzys6AppbJdmLy2C58AST5dQcavrD4iPbgc=;4:nhoXrH/TcaoCwc76U+Ir9tTN01j+jou+RdGyJfC3RDJuNE7Wa8W1r9RPdMZnzLD6nOI89Oir1FQaMVuPcJ3Jq4nmBhIn0oXAvHxqb6N/1azxdPsscKS391S6MCj/uqBok8hNE3+aM9QhXljQ2VA5swsVe79epdzyYuO9jtWlphYSaqwkjQ7Eo+src1qbvRoiRNyxmWxfmTgvSIAUvqKxtyye7u4+m1rEDDe8JM29vVFmSZ0r4XxF5Cezp82LXbqg1kH1twlNTqnTt56RW+t0AAYUG96Ell4IYRpiI0fw5As= X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(601004)(2401047)(13018025)(8121501046)(13016025)(5005006)(3002001)(10201501046)(93006095)(93001095)(100000703101)(100105400095)(6055026)(6096035)(20161123563025)(20161123561025)(20161123565025)(20161123556025)(20161123559100)(201703131430075)(201703131448075)(201703131433075)(201703161259150)(201703151042153)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:DM2PR03MB557;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:DM2PR03MB557; X-Forefront-PRVS: 0412A98A59 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DM2PR03MB557;23:8GEbB2rYw+SuWKFYa4SV79FXmye+KBAhXZKF5LZThw?= =?us-ascii?Q?NBg+jv6OMhYw7l1yQeJe+/5TmGZra5YWQNXLvQcuw8hrSMcDtdA42BTZvr6Q?= =?us-ascii?Q?ZB+LyJ0eNR3sm5BjfDZtoh4EwOa8xe1ynLkCPOD+VPSUS/6lecdO5PK/FQ/v?= =?us-ascii?Q?EbLwyT+9zQNyKeSILDtWKEfCl7UqwvRNBMMrF8O6AMih2WvKMPhdIhMCcfv1?= =?us-ascii?Q?XD2owmrcQUEjDz9hq+/hnh/6ur6JzYRxO4nQbpUfsGTNfAlMuJ0Pp7HAu5jh?= =?us-ascii?Q?F7mvbZSVz7zZJF+TL7qyjClrGeydHoG6SFAoegoW46w9HV9nET/eFnuvP3cE?= =?us-ascii?Q?DTAip71a3jj6g/gSkbuk2lWAXEAVkQuK8WHSg5CIAtYkHCeLO16275KA9Xc/?= =?us-ascii?Q?673JVe3O0A5JaaQB4bFwdhTlbNyqKRYQyJzZXqimYROMmM0xC57D9Qv/j2G2?= =?us-ascii?Q?0nysJGd0xopYz85Q+A4RIhIvWREThblyeknV9LRmVkwTuAzYqx9ggI+xf4l2?= =?us-ascii?Q?t03B2N4sdeEcgY+x890ekxJC9duPRqMsSQ5eoO1XMSSvtj0OM5RPeWnUQczi?= =?us-ascii?Q?dXRWT9Fv33lP/hjTtihgKwBziIr3BdKVQryJiyXrSiQ+ILfzAYJKsVf8rqpk?= =?us-ascii?Q?dO7oM1a8rGWOZJvobYEzMV55QZEkzhEOiDKXne1KgjkMWrQWTHWkDzu7qj5G?= =?us-ascii?Q?VVaRGBQGkpiII0W7RswwLDGtm2SpcBnNO0DiplwiNLB/oNGdQYT86/SlDx9r?= =?us-ascii?Q?8Qp02iTJMkGAxG7C2P/Rc1D3i9hgPV97q7J1O93KMLDA9eORGsT1b4/rq9mk?= =?us-ascii?Q?04nm5puzW6isi/CrMwZaHbo+Tbh+ml6heFCG5p3YqdNY2GyXN/RDTzVCFVbe?= =?us-ascii?Q?xyWiOUBtZ3Q1qRtsuXfHqmUSIOV9iE+xFvQWeWNu9rUmtRzNhC4qd//XdZyX?= =?us-ascii?Q?KCjYvqHnSOKvyrSNSPbZkmLfK33GtcdO8TAUBEW7dyluSQOKPlWRVPvri4W8?= =?us-ascii?Q?ZD5XuZWqmGjykjeUn6Lc/ZHHOKtW4pgdnr7uxfqROkP6FIrS9l7/LlLofN82?= =?us-ascii?Q?7Voe0+5dYJAUST1QwY62nbzZJz8nRWeqDGTXKefDdy8JNGipFEroADqrHHmZ?= =?us-ascii?Q?i7MyoHFpw=3D?= X-Microsoft-Exchange-Diagnostics: 1;DM2PR03MB557;6:e1f+2dVYOEPyciOuLe66kvFXNbfnC3ViZuK29H8kLy1Pm7RXePis0d6/2R0KvVPCx6fZHXJ+OG457rB1MxIAmxZYSFz29H1x5zEXikG0SUNxmOlZtdXxZ5oImj5CD7D58YWGaCMgVC6N5XDdbNxzhb+2UdTI/FAbsL2/F5jW9nHFuPlPq7u9NYw6d1K9BjM582lLIfjwPn1iusCYyaWso9W7tWv4Et33EnWmk0HL3eBbqNAqOhYyyKKEc6W9VSJD7wmVa5dEZ8Q4+m26Ht00hZVLQYY7SMnjzhK3KTVTSNXC4gX5qC12YL7HhYyvp/ooKLK4BlDVgIyb2OpmZ8XDJg==;5:Lb8U67ML83OWn2PBlgYj8QPuULgCv445UO7awYroA8N+8z6dJ/UpcmcWuEXKz/HQAv+gomEFWGSJXo4H0bb+RtWUIxJ7I3fk784Ddrx701R7P1ZlXu+bRtXt+f5xwHMoHVOwORbJXRf3lkOtT8A9bQ==;24:eLA1CIHZf/o9aTO81NVMpX+b2E9pt9WNbAE5xI1ysx0P8I3lmRG1NCGuC1/MfeyL2PePG9MgMg26CUHjB4VYitA6LGBmAZZVlJPASFoMC2w=;7:tqVuBGDxosmXsZandy8Cyawoss99ha1REBO5oK51CeKqUAaZndxjzOoy5cLr+EKguqxuWxy+FJ4AcvnE4ViAizkyEKltD3YQbyocRv2LHcDh8zZEiyIwbJWUr1oiIqf5Dzd0UL7DC8/6MGQjguaa/Gv6p3Gl4YRT8cEVbAxw2TY0rHhspUDw0mFKfvuPIC6tGUuTFI7G/LPlTDxegYVINuMqarSNIihrSsPr6QEJvZo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2017 13:13:51.7046 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e;Ip=[192.88.168.50];Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR03MB557 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Allow ethtool control of the Rx flow hashing. By default RSS is enabled, this allows to turn it off by bypassing the FMan Keygen block and sending all traffic on the default Rx frame queue. Signed-off-by: Madalin Bucur --- drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c | 113 +++++++++++++++++++++ 1 file changed, 113 insertions(+) diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c b/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c index aad825088..965f652 100644 --- a/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c +++ b/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c @@ -399,6 +399,117 @@ static void dpaa_get_strings(struct net_device *net_dev, u32 stringset, memcpy(strings, dpaa_stats_global, size); } +static int dpaa_get_hash_opts(struct net_device *dev, + struct ethtool_rxnfc *cmd) +{ + cmd->data = 0; + + switch (cmd->flow_type) { + case TCP_V4_FLOW: + case TCP_V6_FLOW: + case UDP_V4_FLOW: + case UDP_V6_FLOW: + cmd->data |= RXH_L4_B_0_1 | RXH_L4_B_2_3; + /* Fall through */ + case IPV4_FLOW: + case IPV6_FLOW: + case SCTP_V4_FLOW: + case SCTP_V6_FLOW: + case AH_ESP_V4_FLOW: + case AH_ESP_V6_FLOW: + case AH_V4_FLOW: + case AH_V6_FLOW: + case ESP_V4_FLOW: + case ESP_V6_FLOW: + cmd->data |= RXH_IP_SRC | RXH_IP_DST; + break; + default: + cmd->data = 0; + break; + } + + return 0; +} + +static int dpaa_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd, + u32 *unused) +{ + int ret = -EOPNOTSUPP; + + switch (cmd->cmd) { + case ETHTOOL_GRXFH: + ret = dpaa_get_hash_opts(dev, cmd); + break; + default: + break; + } + + return ret; +} + +static void dpaa_set_hash(struct net_device *net_dev, bool enable) +{ + struct mac_device *mac_dev; + struct fman_port *rxport; + struct dpaa_priv *priv; + + priv = netdev_priv(net_dev); + mac_dev = priv->mac_dev; + rxport = mac_dev->port[0]; + + fman_port_use_kg_hash(rxport, enable); +} + +static int dpaa_set_hash_opts(struct net_device *dev, + struct ethtool_rxnfc *nfc) +{ + int ret = -EINVAL; + + /* we support hashing on IPv4/v6 src/dest IP and L4 src/dest port */ + if (nfc->data & + ~(RXH_IP_SRC | RXH_IP_DST | RXH_L4_B_0_1 | RXH_L4_B_2_3)) + return -EINVAL; + + switch (nfc->flow_type) { + case TCP_V4_FLOW: + case TCP_V6_FLOW: + case UDP_V4_FLOW: + case UDP_V6_FLOW: + case IPV4_FLOW: + case IPV6_FLOW: + case SCTP_V4_FLOW: + case SCTP_V6_FLOW: + case AH_ESP_V4_FLOW: + case AH_ESP_V6_FLOW: + case AH_V4_FLOW: + case AH_V6_FLOW: + case ESP_V4_FLOW: + case ESP_V6_FLOW: + dpaa_set_hash(dev, !!nfc->data); + ret = 0; + break; + default: + break; + } + + return ret; +} + +static int dpaa_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd) +{ + int ret = -EOPNOTSUPP; + + switch (cmd->cmd) { + case ETHTOOL_SRXFH: + ret = dpaa_set_hash_opts(dev, cmd); + break; + default: + break; + } + + return ret; +} + const struct ethtool_ops dpaa_ethtool_ops = { .get_drvinfo = dpaa_get_drvinfo, .get_msglevel = dpaa_get_msglevel, @@ -412,4 +523,6 @@ const struct ethtool_ops dpaa_ethtool_ops = { .get_strings = dpaa_get_strings, .get_link_ksettings = dpaa_get_link_ksettings, .set_link_ksettings = dpaa_set_link_ksettings, + .get_rxnfc = dpaa_get_rxnfc, + .set_rxnfc = dpaa_set_rxnfc, }; -- 2.1.0