From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id D445345A68; Tue, 22 Oct 2024 20:29:39 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C7AD940654; Tue, 22 Oct 2024 20:29:39 +0200 (CEST) Received: from egress-ip11a.ess.de.barracuda.com (egress-ip11a.ess.de.barracuda.com [18.184.203.234]) by mails.dpdk.org (Postfix) with ESMTP id EB0E24060B for ; Tue, 22 Oct 2024 20:29:37 +0200 (CEST) Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03lp2177.outbound.protection.outlook.com [104.47.51.177]) by mx-outbound40-26.eu-central-1c.ess.aws.cudaops.com (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 22 Oct 2024 18:29:37 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=uHa9oS+DN2wC9cl7muaWMcysfEni8UY1Bzxz57OL9ZnOFBGlDPY7E85B9IGVO7/Tz9YOA7L/XX2vqiDoT6J0Npr93bVE9v+hQ+f8t9Kflsok8KYACZS43LaN9x11Y/lFV2kbrKPshQ4UJMtGAcmRtD6KCDlkBGsAUEALvu9Gp5H3GerPqe1Qf2dzFSZ9BJg6juGyCS4WysiAPS9peY5tBoXL05mEXYaIiew12UhMt2MoGQkWN/JT16UXV/3qX3VFjWPjgBA3fFqD0JJ+zccdWMg7Oy4fhLBpTErI66sNqwqgqNNEsNThImlGh/4P09qvv0gmXm8D/Xswt1vzl7zLlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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; bh=e5XVJbCeTTx0bhYm7XS72FjUdUaWC5p2Zxm9Yo1Ft0s=; b=Kln3De4cu7fxPVqIpdvnal8aOXJi4CUOeHSfFn2aYIpAZdBBPxlmR1BOMOi1bwjtrs5oSD/Ft8RF8l/ete3jSFLkz1YpL1HmV5Xhsq2EGanoK/1F1Py08Erhl9+/mRniZHws2wsTNKdJwek8V7Sp1fmCCJ8dixiJuW83xkjZi/W884z4/OGMKlYvQMzE1K/BCpjMnt31aYwICdejs+v+iaLarX1kuctNXblNqH2RAFlKJl4lVN9LPT8q1famkYAj59gNnViy7GSMaAUR0oFIqfMtP8+hR3hwFgSsv04TZLv2fyX1tF8JE2KIMBEZ7bT90ck9dSI4lP4hIwZcRAOGtA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=fail (sender ip is 178.72.21.4) smtp.rcpttodomain=dpdk.org smtp.mailfrom=napatech.com; dmarc=fail (p=reject sp=reject pct=100) action=oreject header.from=napatech.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=napatech.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=e5XVJbCeTTx0bhYm7XS72FjUdUaWC5p2Zxm9Yo1Ft0s=; b=WNWGJdPpV6VH4FOfl3YgVB3eTDqYY0XZQRumLr9pzOivlt/Ij01hKeGbAm2teJJdVimu/myGudwEWokE8bVToCYfNxXtJc310VPVzKphKMBhXQYw81k9GGMw0njpqlPYgwf4ixkam10YXXTuwmcW+G60B4DEnezMbx5VhVH4e1w= Received: from DB9PR06CA0022.eurprd06.prod.outlook.com (2603:10a6:10:1db::27) by AS8P190MB1288.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:2e5::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8093.16; Tue, 22 Oct 2024 16:57:12 +0000 Received: from DU2PEPF0001E9C2.eurprd03.prod.outlook.com (2603:10a6:10:1db:cafe::ee) by DB9PR06CA0022.outlook.office365.com (2603:10a6:10:1db::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.29 via Frontend Transport; Tue, 22 Oct 2024 16:57:12 +0000 X-MS-Exchange-Authentication-Results: spf=fail (sender IP is 178.72.21.4) smtp.mailfrom=napatech.com; dkim=none (message not signed) header.d=none;dmarc=fail action=oreject header.from=napatech.com; Received-SPF: Fail (protection.outlook.com: domain of napatech.com does not designate 178.72.21.4 as permitted sender) receiver=protection.outlook.com; client-ip=178.72.21.4; helo=localhost.localdomain; Received: from localhost.localdomain (178.72.21.4) by DU2PEPF0001E9C2.mail.protection.outlook.com (10.167.8.71) with Microsoft SMTP Server id 15.20.8093.14 via Frontend Transport; Tue, 22 Oct 2024 16:57:12 +0000 From: Serhii Iliushyk To: dev@dpdk.org Cc: mko-plv@napatech.com, sil-plv@napatech.com, ckm@napatech.com, andrew.rybchenko@oktetlabs.ru, ferruh.yigit@amd.com, stephen@networkplumber.org, Danylo Vodopianov Subject: [PATCH v2 63/73] net/ntnic: add scrub registers Date: Tue, 22 Oct 2024 18:55:20 +0200 Message-ID: <20241022165541.3186140-64-sil-plv@napatech.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20241022165541.3186140-1-sil-plv@napatech.com> References: <20241021210527.2075431-1-sil-plv@napatech.com> <20241022165541.3186140-1-sil-plv@napatech.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU2PEPF0001E9C2:EE_|AS8P190MB1288:EE_ Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 5134500c-b811-4c67-71ee-08dcf2ba92f4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|1800799024|376014|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?uJPAgNAHRQofWQPK+eX7pnnvZdExWu2FdhdC4BAUERgUxMaZNzQYGxZeBgRq?= =?us-ascii?Q?VQ98/rmXoiWeVYlwTF+59bgnmZ633cWXKURkvnQxHfTMM5L1IrtOwI1yOMqa?= =?us-ascii?Q?wp1BznpVG7dM6mfp89GnLvprQ8yFJapF69lvWRiR0nCfPlHz/oMv8DhE3dWX?= =?us-ascii?Q?FuY2B3JTiAGU1nke7gC6DZiGE3Uku6n0Xx0agLRIt/rTzZ0wVxTkJzv/bepV?= =?us-ascii?Q?b9/zbzSCZXasvc9xizzgGg5c2ALWtgtTCu4jA1MEfc8ZxyKZ0ZqhrcJ7Nck1?= =?us-ascii?Q?e+mL4hlLjz+ANuMA08ZDdUZyB+JPmVlvveM09xzt0arVpNRfdmDa9b9MX8vI?= =?us-ascii?Q?7Zubtf6ZKt/2P8xFy0PS8u7AEVMHq7YRnK0MZ02DjSk/YefT8J7rB3uZ1RWX?= =?us-ascii?Q?V8LXUbWnkwSDFM/fUGC959O2gfLKCVVZ45QsXrivN3sqwRuvn4xR9gtGOQjI?= =?us-ascii?Q?spojA5UJLrU/WckFMCxEN+63CxBaZfe7wwYXnVfmwQk7lq+C+jZ7RhQVhHdg?= =?us-ascii?Q?uYL0ebW4DkfUxFY4LR22tJwz+lhrnjqDgu9nAEOEr9XCFcLu2O16BYuF63RO?= =?us-ascii?Q?HgipzvQr+Sgcfpivf1XBTk+syopHrz+swGnmGzNpOo+4EMoqCimwBOIYLytw?= =?us-ascii?Q?FRSHC2aB0dZXzEuIUXdyk2UIe9B4v9xubB4BQTe193dyG54GNEd8cDieH1EQ?= =?us-ascii?Q?lYLNhMms+C8ylwn2qYAXBljM3f/gN46cxnfoegH5sCi/bc674TwvRQ8MVoks?= =?us-ascii?Q?JrhyGwjpbVYjDFnH5M9v44KBya5HdbEeHkOhgpJVx9DNQBYYxtJqGnCZifnR?= =?us-ascii?Q?DmgNQ4XiMBG3bbX3MlTUKX0D7UsKewvsuEf6IZCbB7YUW83nhnp0XWSfeMHl?= =?us-ascii?Q?qnriDcS7kITm++Mv0cvp8XgLzTBVc7Hm7A2AFGcMMb85WqRopsuEqcZN7iXU?= =?us-ascii?Q?5u5mpJWSWD/ZbWzHAd+8aReKF+nqf4XHxYoYgO3P3w1t+o+9nAY1A9K7HohH?= =?us-ascii?Q?NiHuUv0JLkNm5yHnguThYrGETd5mpZVOzvYs7yJP5ehgRjQ4iciPO71uGcfZ?= =?us-ascii?Q?WeWpvAg00yTRjOcVbEkvI5kmUAxhcWfPfwMf2pH1mCEz41P6tAFS5dLG1zFX?= =?us-ascii?Q?cBxExiITeqVnbE5SImeE9PiV0Qtd7let0MXm8RszSrYp3iKM2nOzPkT2h7ck?= =?us-ascii?Q?AacCtji3Q97qwHtjWIc53MD2VFOqURI0KyMoq1DizO0g8ycW39PD9w/ktHlo?= =?us-ascii?Q?efPb833fXJCLqpZ/TW5/vGJFe6LfJw+PsBxvnZHI9XjZ+Q1KzxwWfJDTJchh?= =?us-ascii?Q?4HpkqsCCpqGnlcLBcc5IGw3ICPC+NVjHfx66mSuiNLFj3/M6qyEfERi7Hmek?= =?us-ascii?Q?o0vZDo6uaQ6cB9LsTOuImvTae5/Io3bP/7MDUp53w3iLSatE8g=3D=3D?= X-Forefront-Antispam-Report: CIP:178.72.21.4; CTRY:DK; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:localhost.localdomain; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(82310400026)(1800799024)(376014)(36860700013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: GJpBcSz0Wb/tCIEpRXp1Qd7wroVeLwQ+Mu7mqi7a9cfyxkHJeRhT9feRGoJ14LTyXDE3mbTBxcv3+wtN2XPeSOGvf6dHjpGKcmEEsXL0Pa3IuNtT3kRHbWSvzRGhFNP12lVsWKNj75BTM2iYJ6KdUfDq//4osK3QYK8qjH2SX8cP14qy+jTx4Y59qc28uAEjmFZzFQVqpDz4AuMZNe51/2mFeg2GkgRaTO9Txfxe2lqEL21isEIIg4pnZlhVc2Oi6T1A6Dynwo1P/OXx9HcjuhibweKch0afLN0P82KYkW13sK6RYA52735P+OoU5YfrwBsNqNhXYaSngdFIsFIzvxoh8lmYxUJzNHufekv4hze8yLXJvAbioEBURq6TrRHpsf15KFqu24FjxskHlN8blLTVUCqxvwRjOgkuqgUliwuIslfO1uNuXXE1zs2iuNhXpbMPcrn160WOwU8twJNTvpLRlhpaMtGK7LrQNxM5YDnlgmP+avPWVYJ6A3oUWDOj76TVXQBaZ6F9LEIqQxLlgBJQFXHjxC2gH0C7OEJByaRztYH/jZo6peJmcY1bfZeZf5hO7LMbw/sjVQgw9WOmBlXXhECB7gMF0iCMsi5Jt3sfgPA7TgRvBXIU6n3Pz5ZVgMBxMOh0jUANlITJomMqWsSybgB2G2zT33lmTHHAklM= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2024 16:57:12.0131 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5134500c-b811-4c67-71ee-08dcf2ba92f4 X-MS-Exchange-CrossTenant-Id: c4540d0b-728a-4233-9da5-9ea30c7ec3ed X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=c4540d0b-728a-4233-9da5-9ea30c7ec3ed; Ip=[178.72.21.4]; Helo=[localhost.localdomain] X-MS-Exchange-CrossTenant-AuthSource: DU2PEPF0001E9C2.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8P190MB1288 X-OriginatorOrg: napatech.com X-BESS-ID: 1729621777-310266-12661-16859-1 X-BESS-VER: 2019.1_20241018.1852 X-BESS-Apparent-Source-IP: 104.47.51.177 X-BESS-Parts: H4sIAAAAAAACA4uuVkqtKFGyUioBkjpK+cVKVsZmFkZAVgZQ0DzRONXM1DTNMs k8LdXCxNzAIMXQ3DzFwtg81dQozchIqTYWANQUzAVBAAAA X-BESS-Outbound-Spam-Score: 0.00 X-BESS-Outbound-Spam-Report: Code version 3.2, rules version 3.2.2.259903 [from cloudscan10-0.eu-central-1a.ess.aws.cudaops.com] Rule breakdown below pts rule name description ---- ---------------------- -------------------------------- 0.00 BSF_BESS_OUTBOUND META: BESS Outbound X-BESS-Outbound-Spam-Status: SCORE=0.00 using account:ESS113687 scores of KILL_LEVEL=7.0 tests=BSF_BESS_OUTBOUND X-BESS-BRTS-Status: 1 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Danylo Vodopianov Scrub fields were added to the fpga map file Remove duplicated macro Signed-off-by: Danylo Vodopianov --- .../supported/nthw_fpga_9563_055_049_0000.c | 17 ++++++++++++++++- drivers/net/ntnic/ntnic_ethdev.c | 3 --- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/drivers/net/ntnic/nthw/supported/nthw_fpga_9563_055_049_0000.c b/drivers/net/ntnic/nthw/supported/nthw_fpga_9563_055_049_0000.c index 620968ceb6..f1033ca949 100644 --- a/drivers/net/ntnic/nthw/supported/nthw_fpga_9563_055_049_0000.c +++ b/drivers/net/ntnic/nthw/supported/nthw_fpga_9563_055_049_0000.c @@ -728,7 +728,7 @@ static nthw_fpga_field_init_s flm_lrn_data_fields[] = { { FLM_LRN_DATA_PRIO, 2, 691, 0x0000 }, { FLM_LRN_DATA_PROT, 8, 320, 0x0000 }, { FLM_LRN_DATA_QFI, 6, 704, 0x0000 }, { FLM_LRN_DATA_QW0, 128, 192, 0x0000 }, { FLM_LRN_DATA_QW4, 128, 64, 0x0000 }, { FLM_LRN_DATA_RATE, 16, 416, 0x0000 }, - { FLM_LRN_DATA_RQI, 1, 710, 0x0000 }, + { FLM_LRN_DATA_RQI, 1, 710, 0x0000 }, { FLM_LRN_DATA_SCRUB_PROF, 4, 712, 0x0000 }, { FLM_LRN_DATA_SIZE, 16, 432, 0x0000 }, { FLM_LRN_DATA_STAT_PROF, 4, 687, 0x0000 }, { FLM_LRN_DATA_SW8, 32, 32, 0x0000 }, { FLM_LRN_DATA_SW9, 32, 0, 0x0000 }, { FLM_LRN_DATA_TEID, 32, 368, 0x0000 }, { FLM_LRN_DATA_VOL_IDX, 3, 684, 0x0000 }, @@ -782,6 +782,18 @@ static nthw_fpga_field_init_s flm_scan_fields[] = { { FLM_SCAN_I, 16, 0, 0 }, }; +static nthw_fpga_field_init_s flm_scrub_ctrl_fields[] = { + { FLM_SCRUB_CTRL_ADR, 4, 0, 0x0000 }, + { FLM_SCRUB_CTRL_CNT, 16, 16, 0x0000 }, +}; + +static nthw_fpga_field_init_s flm_scrub_data_fields[] = { + { FLM_SCRUB_DATA_DEL, 1, 12, 0 }, + { FLM_SCRUB_DATA_INF, 1, 13, 0 }, + { FLM_SCRUB_DATA_R, 4, 8, 0 }, + { FLM_SCRUB_DATA_T, 8, 0, 0 }, +}; + static nthw_fpga_field_init_s flm_status_fields[] = { { FLM_STATUS_CACHE_BUFFER_CRITICAL, 1, 12, 0x0000 }, { FLM_STATUS_CALIB_FAIL, 3, 3, 0 }, @@ -921,6 +933,8 @@ static nthw_fpga_register_init_s flm_registers[] = { { FLM_RCP_CTRL, 8, 32, NTHW_FPGA_REG_TYPE_WO, 0, 2, flm_rcp_ctrl_fields }, { FLM_RCP_DATA, 9, 403, NTHW_FPGA_REG_TYPE_WO, 0, 19, flm_rcp_data_fields }, { FLM_SCAN, 2, 16, NTHW_FPGA_REG_TYPE_WO, 0, 1, flm_scan_fields }, + { FLM_SCRUB_CTRL, 10, 32, NTHW_FPGA_REG_TYPE_WO, 0, 2, flm_scrub_ctrl_fields }, + { FLM_SCRUB_DATA, 11, 14, NTHW_FPGA_REG_TYPE_WO, 0, 4, flm_scrub_data_fields }, { FLM_STATUS, 1, 17, NTHW_FPGA_REG_TYPE_MIXED, 0, 9, flm_status_fields }, { FLM_STAT_AUL_DONE, 41, 32, NTHW_FPGA_REG_TYPE_RO, 0, 1, flm_stat_aul_done_fields }, { FLM_STAT_AUL_FAIL, 43, 32, NTHW_FPGA_REG_TYPE_RO, 0, 1, flm_stat_aul_fail_fields }, @@ -3058,6 +3072,7 @@ static nthw_fpga_prod_param_s product_parameters[] = { { NT_FLM_PRESENT, 1 }, { NT_FLM_PRIOS, 4 }, { NT_FLM_PST_PROFILES, 16 }, + { NT_FLM_SCRUB_PROFILES, 16 }, { NT_FLM_SIZE_MB, 12288 }, { NT_FLM_STATEFUL, 1 }, { NT_FLM_VARIANT, 2 }, diff --git a/drivers/net/ntnic/ntnic_ethdev.c b/drivers/net/ntnic/ntnic_ethdev.c index 9c286a4f35..263b3ee7d4 100644 --- a/drivers/net/ntnic/ntnic_ethdev.c +++ b/drivers/net/ntnic/ntnic_ethdev.c @@ -47,9 +47,6 @@ const rte_thread_attr_t thread_attr = { .priority = RTE_THREAD_PRIORITY_NORMAL } #define SG_HW_RX_PKT_BUFFER_SIZE (1024 << 1) #define SG_HW_TX_PKT_BUFFER_SIZE (1024 << 1) -/* Max RSS queues */ -#define MAX_QUEUES 125 - #define NUM_VQ_SEGS(_data_size_) \ ({ \ size_t _size = (_data_size_); \ -- 2.45.0