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 58E5B45BC0; Tue, 29 Oct 2024 18:18:44 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 90879432AC; Tue, 29 Oct 2024 18:17:21 +0100 (CET) Received: from egress-ip42b.ess.de.barracuda.com (egress-ip42b.ess.de.barracuda.com [18.185.115.246]) by mails.dpdk.org (Postfix) with ESMTP id 9C6C342FD9 for ; Tue, 29 Oct 2024 18:17:11 +0100 (CET) Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02lp2112.outbound.protection.outlook.com [104.47.11.112]) by mx-outbound43-199.eu-central-1c.ess.aws.cudaops.com (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 29 Oct 2024 17:17:09 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=eePSfWqLoI3MS7mUEzL4Wjs/X6D3lwTt1pFQKicxqpHssKdAfD0o73oRN82R9wYV+CmO2/384UeL5oADYdWnMCGjF4/TZ8UT6/+O+72TGUHWPKhOuEVVsndCTPC/J18JsPz77qZCqa2eCbOQvBN2SdVEjAMf2YNo2cFcGe2B5bFsVDYW5YplxT2BlgM4XOrtmsAU0M3HjjH1+yC9JKOsiUcUcUA+seAg2fzvR08FwtTAmLA9QCilFYtUHB7Db3PCgplcG9vO1M5+03NTpyTCFq+zXzIQ7Dibxh95nDs5m4KPWkkMHw3VKU9SvlUABMEiIqj3Qd3gxqTZXorRe6EPMA== 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=MGgK2TGo4TnQMRx7vQttbTMd6dzfEEnWl60Jf3AlDZU=; b=JlRU8+LkyOa+HULZjbJ9uu58eax6GJtjYl/Mh++RrqynmS07f3SEFBkBVLek1Dmr6EXfrqr2JdHAvbPIaMU2+bUwfYrc2wyBb0PRpHrj+/4WcN9LBujcOIWw2phIvAk8/0I6Emm6L/i1VF6MiGIkg6tBZpniVFXnN6+moD+zONOyiU7zg5tuCBcvrcRBYpJR5UUCS6tfDMZGVoxTVnxQYB7QGE88jyRDAO/DK78wMrMCPZCQRyOMMCn3zdPDEK/tMIfRrrgCkWZ6kDArVaql3M/ri9vQZ1rRpb23EpyewIaBVRqVVyH+BJmnTknMSSwf3m2PfrxPutbwCOXm4HSbZg== 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=MGgK2TGo4TnQMRx7vQttbTMd6dzfEEnWl60Jf3AlDZU=; b=QV8tRyqOSNhXcGVggmXp4obmq/4Xk60yjgrlHvlOi5LmxJvIsPRIYlwevnFBfrdrq4MFpYIWIi05GhYLnmWBNjwHWCyuSrOVWObMjhUECqAC5B+ov8XwVN9BqbwFfWDohYaBTXFuCNqJ8i12AC68+o0kbf+NDE6LRXuD2M3AbjE= Received: from DUZPR01CA0193.eurprd01.prod.exchangelabs.com (2603:10a6:10:4b6::14) by PA4P190MB1246.EURP190.PROD.OUTLOOK.COM (2603:10a6:102:10f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8093.32; Tue, 29 Oct 2024 16:43:54 +0000 Received: from DU2PEPF00028D06.eurprd03.prod.outlook.com (2603:10a6:10:4b6:cafe::55) by DUZPR01CA0193.outlook.office365.com (2603:10a6:10:4b6::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8093.29 via Frontend Transport; Tue, 29 Oct 2024 16:43:54 +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 DU2PEPF00028D06.mail.protection.outlook.com (10.167.242.166) with Microsoft SMTP Server id 15.20.8114.16 via Frontend Transport; Tue, 29 Oct 2024 16:43:54 +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 v4 63/86] net/ntnic: add scrub registers Date: Tue, 29 Oct 2024 17:42:07 +0100 Message-ID: <20241029164243.1648775-64-sil-plv@napatech.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20241029164243.1648775-1-sil-plv@napatech.com> References: <20241021210527.2075431-1-sil-plv@napatech.com> <20241029164243.1648775-1-sil-plv@napatech.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU2PEPF00028D06:EE_|PA4P190MB1246:EE_ Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: b79c0a27-0ceb-4cf1-b058-08dcf838e073 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|376014|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?QAQfnYCuRnt46Ep/efNGXXeIYL0JwqKoOS/aUX8Z2sKElDmQf7ZL9bJO7/v8?= =?us-ascii?Q?xAzCgn/I+sUem50RffWGrL6DUkosd/OU/ybo1u2vXbvI/W03zBvM5b8SzKI9?= =?us-ascii?Q?oTolsNNnuLoGvF1Tg5DU0sH3TiOUMx3U8Y2y6l5Y5R5kZBVdoAJsbr8ZcK1n?= =?us-ascii?Q?X5US2Fy01pTCLSw7TDvwhZI0w6JACz9AFYBqm8BSTaiveLl6RMRp2/Nzml4x?= =?us-ascii?Q?S3sqhAWh5upRf3ZIhmVbrYaWrgOnze8umPIpdCxDhzYuP8q0eg826+hIgk0i?= =?us-ascii?Q?tRFAcVR/k5rWtk93Q6+dr1ppx7XjmnJwuMwINnExZ7VCyZG7E1KIg19BZGgS?= =?us-ascii?Q?Dja01Hpc0xpe3T7kB2NpuskXa5ciedYCDTPsAwOISNel+1MkI5D5DM+PPhkZ?= =?us-ascii?Q?lfL7tFaHArW2kHY65cM1KW2jT3BWffVi9yKRWDVaL/OzziTQzOgXlV//vKsg?= =?us-ascii?Q?siUx8N9S6sf1hPxzqX/v+y2U9hRer8nzgbdY2Ji0dTLVe5+31PlU/8xVbRxG?= =?us-ascii?Q?xtapzj/EZ2eZFZMW9+nru0yoQywqK8OaaYWUOKiGsOPhXqrV4scEj248PnK5?= =?us-ascii?Q?+JoayQI/kEZmBqKuBaTysJWX5LRreDz0Oh4cJOZt3hjFvMeZwqcAwhNdBvPH?= =?us-ascii?Q?mfG3PdPxYIHHhvoJbvBmdtVLke1cRajw+qmXmALlDCZ/Lr4/Yk2j4hQdUrOS?= =?us-ascii?Q?ZpZw0SvCvNZsg2AArK3ApFT04M4GEshicknctbktlS+XRgT4/RXnjn/dixJp?= =?us-ascii?Q?mp/rFXYlvOWbK0ysKHLPbhW/jZjETiWuhhm/6KkH3kdSfRBJK3XGIO4Kgmxl?= =?us-ascii?Q?r12DdiSIETucaEkgRPD81tXcn++54bQE4j3EhXdWpqDvcXncMVEz6sD7CSGA?= =?us-ascii?Q?Ps946P94OJSyf1DJT93aP1J/9ddnpSAk80Na899bHvNnefLduvwHZ/MS9aUQ?= =?us-ascii?Q?JIOVzbqdCRY13DTXlFvdE+oL25LAdGO3zBJivpXpZWlDUzxfat3D3Lr8uCRB?= =?us-ascii?Q?DrP8f8p/1n4h62CgaNHNkR0QpE0xkU+ZbZYjhH8Y10hlZCYi/qRom7ag6wrZ?= =?us-ascii?Q?IdQXl1NNgGvdwzaFfFoJ+ANxCUsi8EVhPbSd47cTgYIw0FcjY2FInitle7yQ?= =?us-ascii?Q?HnRrjNJ2ZCi34pcfr+TsC9QZeGQ1zwTeFNC+H3ZKSqeIyFnRssjDkjDzsWB5?= =?us-ascii?Q?61GT6/QsPh19gTS5BUhpQBppZd5o+wxw5K1Idbgh/rrV7N2wjlcUtN5syJhe?= =?us-ascii?Q?42q9+DQ/LXLszDmN+MXS2O8M0ofSFNV0JDILLxHAK482zlEyP7egDSYc20p0?= =?us-ascii?Q?NeHQstxL7IHmePqMG7cgF+Ch9OM0tkm/dCwQYgoRdaSpTPJc0UcoPVqS6WTD?= =?us-ascii?Q?ked82IQdP38yJkvS5hLMUm99D12VGnmePus0KdOEqE+wwuox5Q=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)(376014)(36860700013)(1800799024); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: IAzB59Blrbay0bG+5uEpfFZE0cS487s0yeIQK8gy4WLehIoXG/etz9naudUJuTZVv17H3MLckbENLiSaitCGN71cKL0hZvFV1fsTm0dA7QQiJBwPOPSq/UkY7wOZdqj6R5rdeaoJyhG/HM6wr++xrHZe/u62fWOOWGJjW2u8aXVY8VBJwRvoue2Voge3aJaqlHVlitAdLChe/gu8QZad8C9rvUenV14CypdJVzNFn+I+9wZPd579PhBBasDq4pBhfC1dDAp2l82Z0Kq4Ce2xiXleOMGiNyKoI0sQnhbnNZGS2gNcA9p35eNf/ETrJ72SgVaOhN52gQUg8KGZIiYsDXjyXXo6rcrQAyoNVJOBYSBpOohbejwhDKwOYwQxIe3WAt352gZ10c6k7tpBIDPHEr7Sils3HZjtcPHeE23flpDftsqDbXtVw1vlKO5NVrVarJFRwZ13SMOa1Zbk+zMJrMSioifdjZtvF2uztamB0ywqm3HfeC12mtTOPrghF9Cr/ivB1yYNXHBHUzEtf0BKCqVw5rvXEPcBQZpDxw3xr4M4bh1U2xZtY+3bVCebJZE8CynCBj6wWIqLEVkQl8uQwHg190cEa3i3DiN7kBUAv/vraVijivpSvXehp5ToPMj3Wj3EBQ5od7TXf3Kx61OkaNnouq3B8TZkuCwryASfhp4= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Oct 2024 16:43:54.4334 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b79c0a27-0ceb-4cf1-b058-08dcf838e073 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: DU2PEPF00028D06.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4P190MB1246 X-OriginatorOrg: napatech.com X-BESS-ID: 1730222229-311207-12661-29631-1 X-BESS-VER: 2019.1_20241018.1852 X-BESS-Apparent-Source-IP: 104.47.11.112 X-BESS-Parts: H4sIAAAAAAACA4uuVkqtKFGyUioBkjpK+cVKVsZmFkZAVgZQ0MIizcDQxNQi2S TJwMTQ3CDFLDUx1dIyNdXQKDHJ0sxMqTYWAIx2b4dBAAAA X-BESS-Outbound-Spam-Score: 0.00 X-BESS-Outbound-Spam-Report: Code version 3.2, rules version 3.2.2.260064 [from cloudscan19-202.eu-central-1b.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 4a0dafeff0..a212b3ab07 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