Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/113294/?format=api
{ "id": 113294, "url": "http://patches.dpdk.org/api/patches/113294/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20220623022615.3628093-14-jin.liu@corigine.com/", "project": { "id": 1, "url": "http://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": "<20220623022615.3628093-14-jin.liu@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20220623022615.3628093-14-jin.liu@corigine.com", "date": "2022-06-23T02:26:15", "name": "[v4,13/13] net/nfp: modify RSS logic", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "487c43791f0a8021eecdec04553784ca4aca77ff", "submitter": { "id": 2670, "url": "http://patches.dpdk.org/api/people/2670/?format=api", "name": "Jin Liu", "email": "jin.liu@corigine.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20220623022615.3628093-14-jin.liu@corigine.com/mbox/", "series": [ { "id": 23707, "url": "http://patches.dpdk.org/api/series/23707/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=23707", "date": "2022-06-23T02:26:02", "name": "Add support of NFP3800 chip and firmware with NFDk", "version": 4, "mbox": "http://patches.dpdk.org/series/23707/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/113294/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/113294/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 C55CFA0545;\n\tThu, 23 Jun 2022 04:28:17 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 5380842B98;\n\tThu, 23 Jun 2022 04:27:32 +0200 (CEST)", "from NAM10-MW2-obe.outbound.protection.outlook.com\n (mail-mw2nam10on2124.outbound.protection.outlook.com [40.107.94.124])\n by mails.dpdk.org (Postfix) with ESMTP id BCDA542B92\n for <dev@dpdk.org>; Thu, 23 Jun 2022 04:27:28 +0200 (CEST)", "from DM6PR13MB3004.namprd13.prod.outlook.com (2603:10b6:5:191::21)\n by MN2PR13MB3535.namprd13.prod.outlook.com (2603:10b6:208:169::12) with\n Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.15; Thu, 23 Jun\n 2022 02:27:27 +0000", "from DM6PR13MB3004.namprd13.prod.outlook.com\n ([fe80::ac31:a36a:cc15:cd35]) by DM6PR13MB3004.namprd13.prod.outlook.com\n ([fe80::ac31:a36a:cc15:cd35%7]) with mapi id 15.20.5373.015; Thu, 23 Jun 2022\n 02:27:27 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=S8x17Ca8Kue+uMScjIAzd02PcGSx8g6YYhjjYPFYr359SIC/tSy5bprgRl56lycHDdVt5khEtGjCp7XqdL+NO64abTA2YgJ9Tk2ATaRxTuB7C/Q625r/j7+zbwqxHlEa88h5WzL7JqP3SHBkYllLxe2lJUY8XiqT2AI53WNUj9OwbIZbAnwZwUGrMaLQi6z0/KaSa8n85K7NJQwwZSGBVhXbD3o9Yr3/mRF1jOMc709mXfR8xKAA2EhS23hz6yxe5Vron9MxJrRmF48gh/D9lzt2OelDrJ7xs6C43kasOhvkiSAAXN3OtvCa5iZbGZmKJu1+uniAt/k8DoUfbfqB+Q==", "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=kbiIdy9GYlaYOdYqzFu+5Gi4H8XtelBFlrwwvfmoFxw=;\n b=EGwn5ioElSdjOPNx+JHhEQq4P1gKmcNNjmq7QALUeEgnkkC/RP42EkZR/TYdOJ4eoJ+7e/16UNLQGpq/FNcUTptodeV66X7ST4CfXBg8F5Vm6EYyIwZCWpQua3EPF0p/k7ZyWgfy7tjBdle0nme0w9dBpaN0F7WTm7dDpJcIB8cqsAc9yswJStz2OjHajrjNSNLCccjLq/Vr/P9lqVM+dY0+Lu5DYli+qG9so9mU2/ap/bCciAW5EPFsO+IJXySEXun5qV8YCtDm+tXp0TUSW8gRJuCF2DXj85ghLFuH2iENYNKkKnNpHLVMlNECqIxSsDitqaOfn/eUU1R0pYtOrQ==", "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=kbiIdy9GYlaYOdYqzFu+5Gi4H8XtelBFlrwwvfmoFxw=;\n b=n1bIA06knDdr7MWfWSvy01bouBXTtcR7H8KcxXNjEuWcImYtqPEzpmJIb2p4+F2lMimVHHfHWCn1A1isRBYaprl2I7KvOcZe5r1kRNqzKcEgrzCosLFHMyrOZzGJ69iU6NNZ6sb1eVxEpUWfTiri3lBncDMTJ1oq24CRYV1no/E=", "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 v4 13/13] net/nfp: modify RSS logic", "Date": "Thu, 23 Jun 2022 04:26:15 +0200", "Message-Id": "<20220623022615.3628093-14-jin.liu@corigine.com>", "X-Mailer": "git-send-email 2.27.0", "In-Reply-To": "<20220623022615.3628093-1-jin.liu@corigine.com>", "References": "<20220617093444.2004000-1-jin.liu@corigine.com>\n <20220623022615.3628093-1-jin.liu@corigine.com>", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "X-ClientProxiedBy": "LO4P265CA0222.GBRP265.PROD.OUTLOOK.COM\n (2603:10a6:600:33a::10) 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": "b097e502-50a1-45f3-83fe-08da54bfea1f", "X-MS-TrafficTypeDiagnostic": "MN2PR13MB3535:EE_", "X-Microsoft-Antispam-PRVS": "\n <MN2PR13MB3535D5568473CAF11E6E748094B59@MN2PR13MB3535.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 h8ij3cyE6rhe8l2iv9eB8nN1NG49paTOOEGR7k1ATWdbLNpRnorpSX8beDjHI9zlE3ea6+DFDyeXpEnPkjZHZrGpwNs2mM2xBCvhAMHJflkAxixZJ3rY8b6afH/ViBNweK7ZuDKPZSQVcw1YkhX6/GKBvNt+aSJqeE+5zukQmg2eH23zhCi9ZP1BCSYcfs2jTgM06TnSCGEIPIlhLCuKivmFT9edGoX7mwia+vKtqVgLTt/GDZwEJWcrJ7ZSB/2ydfTOcKjUuQxsaxc6lhMCOXKBzv9Q2ASLogAieg/2rU5QKPNnBQItGcCDln4RtinnniV9k3/IliNU0gfQjo2GSVKpT0dWqCQUIJtMpTf90opJFnpd7qATKlrvN0+cGsA+zEK/be6hF9m1WcRqSh6E9CpZjn6RCNPBN40Jxd9KGl4PX5FnkfBc493kPnx1PzqKxsvwDN3ZhD5kIwuQ0+0sQNWBjXqR3w2W6/6QZC14PWM+D8GLG8kxC64wx4KrXAv95Op7LRyPVInZG+bsw20WpfcKPOsyq63ZAekeB2M7ow0ax0UrrMGi78hMIpMrbHWhb7SsgQSUGJsKcOYXMri4hz5UJr9R6rPdctVjmMXliEZRUlGa6FkqMEn/TusiAO0OpHgjThpTUdrI0v+JjtYuXck1T316JYF5cfIqAZWhyFgn0pSWMtvx4E3sJxk2ydrkaz8lzU7B8Bziz49nyyMkJmXV3ZzltCQshyTqu30MxQ1/qQYq0y+yclYvIgeWRwEOivzsqpoes+JtYHN/yW9mMUX+F1hXySKNO13XmkvCHoXl8rOrE8pviEtO8rDGB34F", "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:(13230016)(4636009)(376002)(366004)(346002)(136003)(396003)(39830400003)(6666004)(107886003)(1076003)(38100700002)(38350700002)(6486002)(36756003)(66574015)(8936002)(54906003)(2616005)(6916009)(5660300002)(316002)(66556008)(52116002)(6506007)(186003)(66946007)(8676002)(4326008)(66476007)(41300700001)(86362001)(6512007)(26005)(83380400001)(478600001)(2906002)(44832011);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "=?utf-8?q?JhKZ7WSU4n/7FedNhCVgGbrWRPnO?=\n\t=?utf-8?q?54naBItGSUe999dMXx05RCwozo84S3FbdLDQx7XNXgm2F64rAWlm5oW7ONg1v9Cpg?=\n\t=?utf-8?q?zzzbvO5jiQ6vhc5DBctN+Vb4ylVv9L5e8+t+GI/ddhIfgq0Eaq5vGOjuUvln/5Cb3?=\n\t=?utf-8?q?ZVoJTBfxa/VcXns8kg4phGj78PSHC7G5s2mS2eEhGnohqSHoiM7qwbJ9/bg8bBAdm?=\n\t=?utf-8?q?FHtAT1PFaORBP7J+eUuOi83RuRe5FNJeMYbRJRW0d7u/sge02ojBc5UMij7xNg6gA?=\n\t=?utf-8?q?tRC4rqLHYiUlKTLFTFvl6oGBIvV/AZUuIXP2cPusRm9X1eFjE/J7Abvz2/HPhU2KO?=\n\t=?utf-8?q?YsdlcnSEmyAI0uY7VasLu9iYGeZC930AWYYKq3Zc3rCt7HDTe7Xuzo7/7YP4LfhZA?=\n\t=?utf-8?q?zlM2wq7lLttsdcz6pZJAxuRCtVwum2aSWCJcOW9Y1wHm3xh/6m72Y78YHKTLLGMvt?=\n\t=?utf-8?q?CXal5NirZbhswL92LMfyGP3Ntio0XqsKuejkh9mu+SufB4r5vCMOW6nm1+D8TLpXE?=\n\t=?utf-8?q?O3v868imZwrq2ZY42zjiGpZRZ3481EO8YlqnU+h1Yi2kJHG4nxGcEk88/2THbsrgU?=\n\t=?utf-8?q?0+XUY3pizbIexgHNDLxlp8d8gZrkOuXV9iEvwSZlJ7DDZKntFrvFQyEFUbiKwxNyy?=\n\t=?utf-8?q?g4xoehqC+0f+Z8I2e58G8Ce6CtZ+5EGnjJIkZKX62iaPPIdX4l3z6/3zI0I3sbIOo?=\n\t=?utf-8?q?82VpmHV5YwZTtQyferBjUdbahFfFCPYnDBZkmEbBdexmRpHd95r9rcP+aoNRrxQm+?=\n\t=?utf-8?q?KtA1fMEbCuZaHuosuOdxm/wTf3RqYCwPmiUoZ9ioyb4nRIZ+maV+9YisqlRu2hUeD?=\n\t=?utf-8?q?7eUDJuozuSO2SWWxpFN1IDyQvB8OV/xXVmKoDKNdblZMHsjwBn82YeeSIGtFlMYgS?=\n\t=?utf-8?q?Bki/CY7CKBy65OfovKwisUXnkp2ZEsjqcAECHD0nxRmrnikRvm0LUDLNBRQIwqNmE?=\n\t=?utf-8?q?uG9NOGGk3Bog9c2bQZjxXWCVebn4brPbTW8fhb3zlcT33pijjTrYfaBhDIdGsSBgi?=\n\t=?utf-8?q?SdhmJ/CKeoWOhksM9oYwc1l6+qY0n+OsRQ+ifOUBYcDQMoRPd7rmLAC3REV2+Ahjh?=\n\t=?utf-8?q?OPnnuFETLPXw2+FwKLE4D/qtEmUpFJXgufEOJwbJfP8YKnBf1WGGCrOcJ43tr1Amx?=\n\t=?utf-8?q?yk96+e/tQdJFxlmcbARMaXbFSlVVaWzMA+C7bhEFSHjl51Mdg4YY1vOxhoyuQ7PV3?=\n\t=?utf-8?q?08JaGuqYP59ho1fhr+axQcRjM62sRRWgsiEGwHZiyUS8dkYTCJTalblm+djRy7G4P?=\n\t=?utf-8?q?C2QY5KZImwY5dqfYLHUmCw3V8uvPBhCBmLVTZ66TtNt7qvMRuPq0eCfaq2tryPwWd?=\n\t=?utf-8?q?P7kz6Zph6sRcvDGIJCJt1KNFYIWv6odG7jTjzbqE+VyMP8IU1iMuWg+xNyHOPxyaV?=\n\t=?utf-8?q?YgOIatcW1F9+dgeyO2Hc8X/+IQVw/Z0uuaHGmcDB7qVNf+3mc1lbZnIG+uszgkhju?=\n\t=?utf-8?q?bTibtmAX0RQ2bly0yLc8csanvg+EPCP84PnC0LMszW3acrStyaS2xuUB2ULfwBYm7?=\n\t=?utf-8?q?UdnxdfJP9fUX?=", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n b097e502-50a1-45f3-83fe-08da54bfea1f", "X-MS-Exchange-CrossTenant-AuthSource": "DM6PR13MB3004.namprd13.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "23 Jun 2022 02:27:27.2266 (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 td+oD3YDLAju26BKLaCI9/TIdRGXqEc7Cqflje1+bdm2tzQSmGXAWHO3LDIixi4TtyDtGIyKcgWxR6Yx2jqQng==", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "MN2PR13MB3535", "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": "Now NFP NIC support two type of RSS logic, NFP_NET_CFG_CTRL_RSS and\nNFP_NET_CFG_CTRL_RSS2, use NFP_NET_CFG_CTRL_RSS2 if NIC capability\nsupport, otherwise use 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 | 5 ++++-\n drivers/net/nfp/nfp_ethdev_vf.c | 5 ++++-\n drivers/net/nfp/nfp_rxtx.c | 2 +-\n 5 files changed, 16 insertions(+), 9 deletions(-)", "diff": "diff --git a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c\nindex 755c5ec4d9..0e55f0c792 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@@ -769,7 +769,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@@ -1080,7 +1080,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@@ -1108,7 +1108,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@@ -1206,7 +1206,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@@ -1241,7 +1241,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 b6817c10da..673a17c26c 100644\n--- a/drivers/net/nfp/nfp_ethdev.c\n+++ b/drivers/net/nfp/nfp_ethdev.c\n@@ -123,7 +123,10 @@ 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\tif (hw->cap & NFP_NET_CFG_CTRL_RSS2)\n+\t\t\tnew_ctrl |= NFP_NET_CFG_CTRL_RSS2;\n+\t\telse\n+\t\t\tnew_ctrl |= NFP_NET_CFG_CTRL_RSS;\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 66a1c0a36b..3f4ad3e7ab 100644\n--- a/drivers/net/nfp/nfp_ethdev_vf.c\n+++ b/drivers/net/nfp/nfp_ethdev_vf.c\n@@ -95,7 +95,10 @@ 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\tif (hw->cap & NFP_NET_CFG_CTRL_RSS2)\n+\t\t\tnew_ctrl |= NFP_NET_CFG_CTRL_RSS2;\n+\t\telse\n+\t\t\tnew_ctrl |= NFP_NET_CFG_CTRL_RSS;\n \t}\n \n \t/* Enable device */\ndiff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c\nindex 63729261c8..8429b44de0 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": [ "v4", "13/13" ] }