Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/112253/?format=api
{ "id": 112253, "url": "https://patches.dpdk.org/api/patches/112253/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20220602015304.710197-15-jin.liu@corigine.com/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20220602015304.710197-15-jin.liu@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20220602015304.710197-15-jin.liu@corigine.com", "date": "2022-06-02T01:53:04", "name": "[14/14] net/nfp: modify RSS logic", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "365c191f84b5a240897c396ae9b224966708cbb3", "submitter": { "id": 2670, "url": "https://patches.dpdk.org/api/people/2670/?format=api", "name": "Jin Liu", "email": "jin.liu@corigine.com" }, "delegate": { "id": 319, "url": "https://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20220602015304.710197-15-jin.liu@corigine.com/mbox/", "series": [ { "id": 23295, "url": "https://patches.dpdk.org/api/series/23295/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=23295", "date": "2022-06-02T01:52:50", "name": "Add support of NFP3800 chip and firmware with NFDk", "version": 1, "mbox": "https://patches.dpdk.org/series/23295/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/112253/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/112253/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id E799EA0548;\n\tThu, 2 Jun 2022 03:55:54 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 1DB6E42BAC;\n\tThu, 2 Jun 2022 03:55:13 +0200 (CEST)", "from NAM11-DM6-obe.outbound.protection.outlook.com\n (mail-dm6nam11on2131.outbound.protection.outlook.com [40.107.223.131])\n by mails.dpdk.org (Postfix) with ESMTP id CD91B42BA7\n for <dev@dpdk.org>; Thu, 2 Jun 2022 03:55:11 +0200 (CEST)", "from DM6PR13MB3004.namprd13.prod.outlook.com (2603:10b6:5:191::21)\n by DM4PR13MB5858.namprd13.prod.outlook.com (2603:10b6:8:46::6) with Microsoft\n SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n 15.20.5314.11; Thu, 2 Jun 2022 01:55:10 +0000", "from DM6PR13MB3004.namprd13.prod.outlook.com\n ([fe80::d902:ed7d:82bb:c753]) by DM6PR13MB3004.namprd13.prod.outlook.com\n ([fe80::d902:ed7d:82bb:c753%4]) with mapi id 15.20.5314.013; Thu, 2 Jun 2022\n 01:55:10 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=jLlrba/0/hbI8iJXorRjvTpSffPMYiEnH6oDgZ1LIfXUTJQc5eEHc8sBVMMS3KJ3/PXWYUt9s8gWKFZLV8PK/VByhK0ck2Y1+q1lF5aCUw5wNUGBg+k9qd5i8xKo/MqzXqL1Xp2tQwnYZ3vDRdaA5NVzOo+BtuZorJ0sxOTIILVGP7NuymJiuRbhnduJ+pURaDlQDgLkLEWgUAgYqQ0D4q4icGEHYydxkxqPJMjQkRK1/SQPAQJhcXohvhzLLVIWOSMjcWxJK4vWUxU/evzOfM9h9PUU+4CbfsJwTdqKC/QjsYfNUnvut88evgZzW098Y83ggP602YsS5m08OWecqg==", "ARC-Message-Signature": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=arcselector9901;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;\n bh=totDLpgkclqp5hRt1FjaRX6T4eRA8X2uUonn91MoJF8=;\n b=Qo1XChdApy3OJ34yL25AUlR4ZH1wkYsceSvjEeW8cJuHA/7PpzWIMV6SiH3bycGWBa/qwjfppNobyLQ+27iMSqXFZ3/ArIiDP4oEw+L3hiPwljY22RFNnnfjtrsd9x5JUTkHu4v+0WaI3jzxKdlrqVAeiyHzXppvZfOUQ9fEdVOxkud9FNoJlui2H6nb0mdeizH9chrYyX3my+R2OGZ4uwEOr82ratCk9d1saudwq9d8n5ZAdQCnX2Lzu19CiO+25EH9GHuplDMF3TbEYTqaHFr37qEi4heQasWu+WGD7VhVTcS/54qS65ihRVJSVGlKh56ms76Wma1AnIf3fvHSIw==", "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass\n smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com;\n dkim=pass header.d=corigine.com; arc=none", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=totDLpgkclqp5hRt1FjaRX6T4eRA8X2uUonn91MoJF8=;\n b=UmG/bkkOlDUseUFoGOJX8FfbZs46QQ78hib2/S/gBKRgFvyjwE//e7vVEgemkTV50tVf+yVdZW1JH34y9OEWMPmqKKD4GXp09dHK4kYHQd2+TbT+SkplzKfr7zvBGQ5pds+2Mct2jbJd2ujSfR9s3bBWHYqrv/4zgNyQhuRAL3M=", "Authentication-Results": "dkim=none (message not signed)\n header.d=none;dmarc=none action=none header.from=corigine.com;", "From": "Jin Liu <jin.liu@corigine.com>", "To": "dev@dpdk.org", "Cc": "niklas.soderlund@corigine.com, Jin Liu <jin.liu@corigine.com>,\n Diana Wang <na.wang@corigine.com>, Peng Zhang <peng.zhang@corigine.com>,\n Chaoyong He <chaoyong.he@corigine.com>", "Subject": "[PATCH 14/14] net/nfp: modify RSS logic", "Date": "Thu, 2 Jun 2022 03:53:04 +0200", "Message-Id": "<20220602015304.710197-15-jin.liu@corigine.com>", "X-Mailer": "git-send-email 2.27.0", "In-Reply-To": "<20220602015304.710197-1-jin.liu@corigine.com>", "References": "<20220602015304.710197-1-jin.liu@corigine.com>", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "X-ClientProxiedBy": "LO4P123CA0457.GBRP123.PROD.OUTLOOK.COM\n (2603:10a6:600:1aa::12) To DM6PR13MB3004.namprd13.prod.outlook.com\n (2603:10b6:5:191::21)", "MIME-Version": "1.0", "X-MS-PublicTrafficType": "Email", "X-MS-Office365-Filtering-Correlation-Id": "0fab5eeb-78e9-4168-429e-08da443aed3b", "X-MS-TrafficTypeDiagnostic": "DM4PR13MB5858:EE_", "X-Microsoft-Antispam-PRVS": "\n <DM4PR13MB58589171937BB809455F10A194DE9@DM4PR13MB5858.namprd13.prod.outlook.com>", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n fpjQuch1R32jeO2dbqsYC6IjDEY5pdjzF84sVgrgUo+RDlfFL9xmvq7vpvZXPjAnZ0HN+Jw3l68HqB7GHYDXKSlptmkpTI6qpHb5G+TwIoV4No8ijB9lyGpSOePMPTh2BCw7IYpi7rtw97vL1s0utvmLwAYAxuQEtyWwgz3LX0mLU+K4KVeC0JckON6J6yUeFBq6oGjiyrSiWGQDqWta7xenyXoHd4X7hQf1oziqXUoBTCXFXcwDO7KWk2nHjaY/ZHOXU4GziGeckuKV/rQRE5pTy7oazBmKruz5zKZW0RQ/cAOAs5yEMjpVnjsPwe8VwogXAotP3iOLXJxPIIzTwRiGCz2DbOUpwF6bzGn8KIywxTfmvVyaOLo4vLHX/SzwzAy5U3D6bXTon22Q8I7+ReEe2U8O7UtnrJvTnQSopNl7Yl++cZzpP/6fYkBwBsStCX01sTHV/76XySHomsHH+xrLK0kIhd51rXovqUSLzRIUCQT5bWWuykS1HwzHD+6Ej0os7rlCXq+vSUb0Ii0Ed3+LllVDqPZBIEc7KSFHLjcPzurQDv1Nsqx/xItta7jHiyqGQDHOrSG3/nvcZlnMM10j8xLxiMVC6ec7rbJwfnVSx6+s0E610SieqYds1vxc/Icq7w2MmJmRt0mDM/xwQfgmFUU10E5W9DMSg2KwSzbc1VE7o3GXZFmUOjjJIJhG8txseBo73qfYwjhlPDtb9A==", "X-Forefront-Antispam-Report": "CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;\n IPV:NLI; SFV:NSPM; H:DM6PR13MB3004.namprd13.prod.outlook.com; PTR:; CAT:NONE;\n SFS:(13230001)(4636009)(346002)(366004)(396003)(136003)(376002)(39840400004)(36756003)(186003)(66574015)(83380400001)(5660300002)(4326008)(44832011)(8936002)(2906002)(6916009)(54906003)(1076003)(107886003)(6506007)(316002)(2616005)(41300700001)(8676002)(66946007)(66476007)(6666004)(66556008)(26005)(6512007)(52116002)(38100700002)(38350700002)(86362001)(6486002)(508600001);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "=?utf-8?q?DiyhPmqO7gUCnJrmjlg7vHjBXKcN?=\n\t=?utf-8?q?6+Eck8M4kjgJQaKcLjcs/uO/nzpSH5ednAQLxWNOptyK1JEnnvYhX1cOXzi8+Gg1e?=\n\t=?utf-8?q?7SWXcQqUAneUsWWUPjQuc48h4O09U7wAwQP5cxzZRUZwd2f+wPH55ypVV7sB1/ybf?=\n\t=?utf-8?q?e+ngDpPvm+kt+1NPJJ2lT+JPozb2Dps6HNBMMoavOjbWPDGcz5g0/dpcdMfhu1RaV?=\n\t=?utf-8?q?IqayDmlPp9FyV5gSVcVU8KbCjL6yafuq2ZK5N6Wanf3JRjRKT26WYEIEt7/ubLIX5?=\n\t=?utf-8?q?RgIemFW++k+P4v5ZqlPndFSfdfuXN6Y4iJAAVHa8uTywSgpNpev5YP6VYPkcGFea3?=\n\t=?utf-8?q?nyuDIzvyA4yNDW2ehePczfg2Q42qwicbfkGTvFuuNDju8uUYgE7HVpnQkEoY33II6?=\n\t=?utf-8?q?sToEl821IQZPtJDADsKbEvY3WHCi5oLi29bIstcc3cbkL5wn9hffIEIEf/BwdlvQc?=\n\t=?utf-8?q?7dzJ9gL8HD1d6a7/g+8oidYs5hFdPTM+hq4Gr1/EcAzzH4NYB/uRzgNf4T6tzFivk?=\n\t=?utf-8?q?83o6wd9qqgmgND1GkY17smDs97x8p+ISSPCx+g2aLJWXTM6IuZajKBXRIn8/vXzPp?=\n\t=?utf-8?q?tvQ4tNxhnc/Hb30R9b+6o/7z/d9/pownZT4hTRgCCsJjX7SwGEmLEW6LYTO6AufRV?=\n\t=?utf-8?q?l1+4qbSUC2ZM1mj/X4o4IbEdb4dDjzGuslVGJs0/ExzPkUzO6LQo1Hi2aiVWnIYNf?=\n\t=?utf-8?q?YBCGp/eRubJjviJS31LcQXvhDcY/6beeZ7LHDDaa9aVuUw8nEiUvjnqxB2Ld+J30m?=\n\t=?utf-8?q?FNid4m6S4DXq+uGdpvnccPkJguTmdjSejnbGM5HXcCErbXB+gR4X7yJ4LK53t5qsp?=\n\t=?utf-8?q?8Jmu5wSVT7TBMfCGVZE466QgdIbA3iPIU6y6K6mLT17NsWydJLDxrl38+3mONVhVW?=\n\t=?utf-8?q?Qk0S246sUaIBcPFLxznwcCm4vlwQ+euvV48ykwSMb0I9ToZmRNL5k2xCE0AI+PciH?=\n\t=?utf-8?q?wFf80smAdjyYcmLFpo9888iJ3CL5PD/CZgpTOqPi5KBlFU2Z7CPX4u/uD7y7UDR2f?=\n\t=?utf-8?q?27nDXUNG/ngUu+gB8T4F/JdzHJZOiTfuVe1fnHK3Xml4dLNFcVxgxzloJ1Yg9fEr7?=\n\t=?utf-8?q?/c2uDh00qZbVy4FNDO2+XjRsqC7Kzt7WsAz9W7q247jcsfbLUh5ajQNz2yg8d1wBx?=\n\t=?utf-8?q?2owzUno577eolZ3abejlXHXkFUd76AHTTho4Bdc2DGyD8dKSYG2uO9c/wX9lVaCfR?=\n\t=?utf-8?q?MeIioU0unXLMc8baTJmI6/NYfTMTQnCZENJNsz2tBXbFpHarD5EBHZZ4PzZ7Ww7GK?=\n\t=?utf-8?q?MxF0FkCCYHj0qk7X4VUGB+yjXf7AYhbcOkZbPgsbk3zjv4YB7kyq0Ojno2pL9aP/z?=\n\t=?utf-8?q?KTqgPgLWN3YPUXjVXnA+xCTy71/FLQmuujDnd8bnykqGsP+yf0bzSeYs1/y+ZHNaY?=\n\t=?utf-8?q?dYOB8vy/83kdIhhJZOBsdz4GeUgSDo6whJ+5pug23gkETUhbNgA5+TqLiFdLSXqSh?=\n\t=?utf-8?q?13vzL4RN15T17TxR4NEcsvtp//rE6QHBdGTeDrxpJMFOsc8AHqJN8NGqFyEDlQ+WO?=\n\t=?utf-8?q?suHQsXHsFlpuoZLrUIqTWav7dw+6PSMONgyLq5bpFtAhi0q0+ECTl3PECHKkuf2yJ?=\n\t=?utf-8?q?Bh8xEf47sG2MSPhvrQeHVCL93X3MW8oj9/w0jtZ2OlpsswAGqg0gTBd9IPPW00x/C?=\n\t=?utf-8?q?4PNYdfZZ2SNZVkALzd5XCDpAzA9VD+rA=3D=3D?=", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 0fab5eeb-78e9-4168-429e-08da443aed3b", "X-MS-Exchange-CrossTenant-AuthSource": "DM6PR13MB3004.namprd13.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "02 Jun 2022 01:55:10.7722 (UTC)", "X-MS-Exchange-CrossTenant-FromEntityHeader": "Hosted", "X-MS-Exchange-CrossTenant-Id": "fe128f2c-073b-4c20-818e-7246a585940c", "X-MS-Exchange-CrossTenant-MailboxType": "HOSTED", "X-MS-Exchange-CrossTenant-UserPrincipalName": "\n C1Uc4kOVYxKQAtwjzjLySB7kaO7UAex+20NxahMdCMHvyi+b5Q7O0qt758IGA5HZdrJCela+eec33zZdfs2ciQ==", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "DM4PR13MB5858", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "Modify RSS-related interface functions, as the NFDK firmware support\nfeature NFP_NET_CFG_CTRL_RSS2 rather than NFP_NET_CFG_CTRL_RSS.\n\nSigned-off-by: Jin Liu <jin.liu@corigine.com>\nSigned-off-by: Diana Wang <na.wang@corigine.com>\nSigned-off-by: Peng Zhang <peng.zhang@corigine.com>\nSigned-off-by: Chaoyong He <chaoyong.he@corigine.com>\nSigned-off-by: Niklas Söderlund <niklas.soderlund@corigine.com>\n---\n drivers/net/nfp/nfp_common.c | 12 ++++++------\n drivers/net/nfp/nfp_ctrl.h | 1 +\n drivers/net/nfp/nfp_ethdev.c | 12 +++++++++++-\n drivers/net/nfp/nfp_ethdev_vf.c | 12 +++++++++++-\n drivers/net/nfp/nfp_rxtx.c | 2 +-\n 5 files changed, 30 insertions(+), 9 deletions(-)", "diff": "diff --git a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c\nindex 58e20081fc..c2515cf413 100644\n--- a/drivers/net/nfp/nfp_common.c\n+++ b/drivers/net/nfp/nfp_common.c\n@@ -171,7 +171,7 @@ nfp_net_configure(struct rte_eth_dev *dev)\n \n \t/* Checking RX mode */\n \tif (rxmode->mq_mode & RTE_ETH_MQ_RX_RSS &&\n-\t !(hw->cap & NFP_NET_CFG_CTRL_RSS)) {\n+\t !(hw->cap & NFP_NET_CFG_CTRL_RSS_ANY)) {\n \t\tPMD_INIT_LOG(INFO, \"RSS not supported\");\n \t\treturn -EINVAL;\n \t}\n@@ -752,7 +752,7 @@ nfp_net_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)\n \t\t.nb_mtu_seg_max = NFP_TX_MAX_MTU_SEG,\n \t};\n \n-\tif (hw->cap & NFP_NET_CFG_CTRL_RSS) {\n+\tif (hw->cap & NFP_NET_CFG_CTRL_RSS_ANY) {\n \t\tdev_info->rx_offload_capa |= RTE_ETH_RX_OFFLOAD_RSS_HASH;\n \n \t\tdev_info->flow_type_rss_offloads = RTE_ETH_RSS_IPV4 |\n@@ -1053,7 +1053,7 @@ nfp_net_reta_update(struct rte_eth_dev *dev,\n \tuint32_t update;\n \tint ret;\n \n-\tif (!(hw->ctrl & NFP_NET_CFG_CTRL_RSS))\n+\tif (!(hw->ctrl & NFP_NET_CFG_CTRL_RSS_ANY))\n \t\treturn -EINVAL;\n \n \tret = nfp_net_rss_reta_write(dev, reta_conf, reta_size);\n@@ -1081,7 +1081,7 @@ nfp_net_reta_query(struct rte_eth_dev *dev,\n \n \thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \n-\tif (!(hw->ctrl & NFP_NET_CFG_CTRL_RSS))\n+\tif (!(hw->ctrl & NFP_NET_CFG_CTRL_RSS_ANY))\n \t\treturn -EINVAL;\n \n \tif (reta_size != NFP_NET_CFG_RSS_ITBL_SZ) {\n@@ -1179,7 +1179,7 @@ nfp_net_rss_hash_update(struct rte_eth_dev *dev,\n \trss_hf = rss_conf->rss_hf;\n \n \t/* Checking if RSS is enabled */\n-\tif (!(hw->ctrl & NFP_NET_CFG_CTRL_RSS)) {\n+\tif (!(hw->ctrl & NFP_NET_CFG_CTRL_RSS_ANY)) {\n \t\tif (rss_hf != 0) { /* Enable RSS? */\n \t\t\tPMD_DRV_LOG(ERR, \"RSS unsupported\");\n \t\t\treturn -EINVAL;\n@@ -1214,7 +1214,7 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev,\n \n \thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \n-\tif (!(hw->ctrl & NFP_NET_CFG_CTRL_RSS))\n+\tif (!(hw->ctrl & NFP_NET_CFG_CTRL_RSS_ANY))\n \t\treturn -EINVAL;\n \n \trss_hf = rss_conf->rss_hf;\ndiff --git a/drivers/net/nfp/nfp_ctrl.h b/drivers/net/nfp/nfp_ctrl.h\nindex e73715e2aa..372d537462 100644\n--- a/drivers/net/nfp/nfp_ctrl.h\n+++ b/drivers/net/nfp/nfp_ctrl.h\n@@ -119,6 +119,7 @@\n #define NFP_NET_CFG_MACADDR 0x0024\n \n #define NFP_NET_CFG_CTRL_LSO_ANY (NFP_NET_CFG_CTRL_LSO | NFP_NET_CFG_CTRL_LSO2)\n+#define NFP_NET_CFG_CTRL_RSS_ANY (NFP_NET_CFG_CTRL_RSS | NFP_NET_CFG_CTRL_RSS2)\n \n /*\n * Read-only words (0x0030 - 0x0050):\ndiff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c\nindex 238b2b5451..bd7dd30f10 100644\n--- a/drivers/net/nfp/nfp_ethdev.c\n+++ b/drivers/net/nfp/nfp_ethdev.c\n@@ -123,7 +123,17 @@ nfp_net_start(struct rte_eth_dev *dev)\n \tif (rxmode->mq_mode & RTE_ETH_MQ_RX_RSS) {\n \t\tnfp_net_rss_config_default(dev);\n \t\tupdate |= NFP_NET_CFG_UPDATE_RSS;\n-\t\tnew_ctrl |= NFP_NET_CFG_CTRL_RSS;\n+\t\tswitch (NFD_CFG_CLASS_VER_of(hw->ver)) {\n+\t\tcase NFP_NET_CFG_VERSION_DP_NFD3:\n+\t\t\tnew_ctrl |= NFP_NET_CFG_CTRL_RSS;\n+\t\t\tbreak;\n+\t\tcase NFP_NET_CFG_VERSION_DP_NFDK:\n+\t\t\tnew_ctrl |= NFP_NET_CFG_CTRL_RSS2;\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\tPMD_INIT_LOG(ERR, \"nfp_net: no fw version match\");\n+\t\t\treturn -ENODEV;\n+\t\t}\n \t}\n \n \t/* Enable device */\ndiff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c\nindex bb8206c4f6..8769f07be4 100644\n--- a/drivers/net/nfp/nfp_ethdev_vf.c\n+++ b/drivers/net/nfp/nfp_ethdev_vf.c\n@@ -95,7 +95,17 @@ nfp_netvf_start(struct rte_eth_dev *dev)\n \tif (rxmode->mq_mode & RTE_ETH_MQ_RX_RSS) {\n \t\tnfp_net_rss_config_default(dev);\n \t\tupdate |= NFP_NET_CFG_UPDATE_RSS;\n-\t\tnew_ctrl |= NFP_NET_CFG_CTRL_RSS;\n+\t\tswitch (NFD_CFG_CLASS_VER_of(hw->ver)) {\n+\t\tcase NFP_NET_CFG_VERSION_DP_NFD3:\n+\t\t\tnew_ctrl |= NFP_NET_CFG_CTRL_RSS;\n+\t\t\tbreak;\n+\t\tcase NFP_NET_CFG_VERSION_DP_NFDK:\n+\t\t\tnew_ctrl |= NFP_NET_CFG_CTRL_RSS2;\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\tPMD_INIT_LOG(ERR, \"nfp_net: no fw version match\");\n+\t\t\treturn -ENODEV;\n+\t\t}\n \t}\n \n \t/* Enable device */\ndiff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c\nindex fd3ee40aa5..43db8db7c3 100644\n--- a/drivers/net/nfp/nfp_rxtx.c\n+++ b/drivers/net/nfp/nfp_rxtx.c\n@@ -138,7 +138,7 @@ nfp_net_set_hash(struct nfp_net_rxq *rxq, struct nfp_net_rx_desc *rxd,\n \tuint32_t hash = 0;\n \tuint32_t hash_type = 0;\n \n-\tif (!(hw->ctrl & NFP_NET_CFG_CTRL_RSS))\n+\tif (!(hw->ctrl & NFP_NET_CFG_CTRL_RSS_ANY))\n \t\treturn;\n \n \t/* this is true for new firmwares */\n", "prefixes": [ "14/14" ] }