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 6E5CB45BCC; Wed, 30 Oct 2024 23:15:43 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A043F4348E; Wed, 30 Oct 2024 23:15:36 +0100 (CET) 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 A05894340A for ; Wed, 30 Oct 2024 23:15:34 +0100 (CET) Received: from EUR03-VI1-obe.outbound.protection.outlook.com (mail-vi1eur03lp2111.outbound.protection.outlook.com [104.47.30.111]) by mx-outbound11-85.eu-central-1a.ess.aws.cudaops.com (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 30 Oct 2024 22:15:31 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=K6mwo5JBvYXbiHhQh5BHl/K5t+3302r7cFsM0EW0OVj9oyO8KYApKl/zh1jfn43ftBdMYsSoY89IZYFyasZAAvt3ya0DSTudlabaZcNehJXJB4yQ5YlZm3kvJEUpVvCV81gAMKUq/vmMqZcR83aPxc8p5K7hzhLPo+tyocyVJ2v173Hyl7fOKP1n6UnY9amojT5ZvyIgolz6ITGtt73ZzslpSsT/+DzRk6nACSBQyBqqjL7V0oQqvr6mPJPNUeNgNZ/GGZFPGFWi9e9LCX7Xm4CXs7CkGHyVce0DRP/4hyBjsB6pAzyfMXc9IOph5RW4gwBR9MzQ0P/yPIIJZI7dsA== 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=yiaV3ZkyQ8uJ9eAfSBPpfbUvQY0pekjHr4Xc6nDGtMJk6eXm7pHU1izPM2QvOmNyvlEI0C1GxKhAMAXoB07UzM2YIZfCnHYAgwbNWQwZH0jQ6bdwXM6TPLXGqV8SwWdYEw1NFuU5Aaj2U5BxuGwhMRHt9eiDRLyTc2WlgZ9Y8BpJMT6qZfbCEXuc7BRyTgrP6tCejiGfpmYtYU2RO2jjzz8vnsvxyb1gW2U7EGXu/6wRofNCtugOABkICKYYDURxOGXgnc2xSZNJUL6clIMik9znUDGuGURWbyszKadvcwXHqt8DORgEH1RkgNJBFEyuICYUVf44yipGa39QxGdpOA== 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=DHYZLK+XdrfnpW2pCS1cIQoA+0pvSEhwFis4KQZ/JYZxltrXUHT1is7AF6Hhc7cb30McV8pdEr1kbsnSiMDwSYhiDs4+gUzJBUCncU+DG26FgkcCm9W2s0S7deEqzqWcJJ0xoSp5bnemXSnV1H1vneensADH3BWOB90z7gCQAIY= Received: from DUZPR01CA0013.eurprd01.prod.exchangelabs.com (2603:10a6:10:3c3::6) by VI1P190MB0670.EURP190.PROD.OUTLOOK.COM (2603:10a6:800:128::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8093.32; Wed, 30 Oct 2024 21:40:54 +0000 Received: from DU2PEPF00028D13.eurprd03.prod.outlook.com (2603:10a6:10:3c3:cafe::8a) by DUZPR01CA0013.outlook.office365.com (2603:10a6:10:3c3::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8114.20 via Frontend Transport; Wed, 30 Oct 2024 21:40: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 DU2PEPF00028D13.mail.protection.outlook.com (10.167.242.27) with Microsoft SMTP Server id 15.20.8114.16 via Frontend Transport; Wed, 30 Oct 2024 21:40: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 v5 63/80] net/ntnic: add scrub registers Date: Wed, 30 Oct 2024 22:39:10 +0100 Message-ID: <20241030213940.3470062-64-sil-plv@napatech.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20241030213940.3470062-1-sil-plv@napatech.com> References: <20241021210527.2075431-1-sil-plv@napatech.com> <20241030213940.3470062-1-sil-plv@napatech.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU2PEPF00028D13:EE_|VI1P190MB0670:EE_ Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 0185e001-4c5a-4a64-b635-08dcf92b882a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|376014|36860700013|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?8mybL4HN1twq412ALKf5BrCga4BSDd9T2CX7JpAShsFd5wwztcDXt8f8oXCc?= =?us-ascii?Q?K7/WYnwbuSVL3J7dcXF1itZhVG1rkXLOBadRst3hP32IsisCoVk9Uo1tlqbE?= =?us-ascii?Q?90DNdEGlLPV1pIwnAxKyjTAUZjSxL8PdyBRVfqgYEbYEbVIGoBFTpDRalj+l?= =?us-ascii?Q?HziEh6kl0EAkeYILtW31rtw4UdPM95t+HmZ8XekJ0QCwBAb8sFA5f9JPobwU?= =?us-ascii?Q?+2Lbg3AyrPgy5uD6hMfZHOENfVHXvVnNG/EpFp9RReFhzzzKx2IHisjj5gMT?= =?us-ascii?Q?zevi0ldoxW0jlnG7ufEhhIdzUJ4680XLG9cmEzLhEGUvYCFTioRVTjgDu5tB?= =?us-ascii?Q?QMSRsec+NkgJfrbaG0CdC/av5+7jTHX2rHHSaTmNENajH4G2MQXZRgnQnCgZ?= =?us-ascii?Q?ogAIVKjpfcNiiqXsOlH0oOKjhg/JPIgVZlhlgcVyaKJ0wpb+/gbpO6u5NZiy?= =?us-ascii?Q?vVtNWti7XSoUqKyJXqC/sZNiQF47IfHhMFcLh4dJ8vu2zOJDqLp3uZ0+ncIE?= =?us-ascii?Q?KU7Ld1hImjkqUo9iS/gmcMlMhEHaCt6Qj+QlO2c3JgBmllcT0IuJ8mZnvwY6?= =?us-ascii?Q?5+ACXG6HOL2BFCYhNuulYcoQqKGHKUOKl4te2Z1bq18TdFyyxM4OY2L3gdiA?= =?us-ascii?Q?0XCovHnI2O+pqvESY1KkB+x5vguzdy0B0pVo39Vdrekh7w6EL1rCVhfv6mMt?= =?us-ascii?Q?J73YG60etKzhH3jGK1ZULOMBIyworxyria6K8tJDCR6QF6QpXTGX/BDFoV1R?= =?us-ascii?Q?GYJqAmImIvETsoQH2QRhh1mcrOreZNlNgM2WOdvY6VKkEAZAMzOJzzhg0a63?= =?us-ascii?Q?pDKM2Jg1b8mijX0S/Gy2R/ppaY97DHGogrBXqZPKRFCJkRR/SpONEwE+v25M?= =?us-ascii?Q?TpCUzndIsarEKF0ErlATtR/7p5HF3RYJvWxJMyql2s3MJBN0w2LhDUlquFHc?= =?us-ascii?Q?425RNb9Dh4poOxblcnIz8TAVOb4INmC9cWWqVFoJkjIwRtOWRoK3x6rNJdXX?= =?us-ascii?Q?RrC5cQQES4I8ivYAsyogZ8RhaExX37Ie69O6WPdmgC8mXiJjxnKh8jh+wWhM?= =?us-ascii?Q?GBYq6WEpE6cuQL/Tf2Yzaax1WlQwjghzWYQsTSYRMsAOVMH20EeRHaizwKpK?= =?us-ascii?Q?DHD6XyMxXg1nF4/EnYlAtYDpUF6FOmfubVTIO6c5tSB67zPAMwfZIKxBhKLG?= =?us-ascii?Q?NTzPofGQWG0R3MWG6XwJGiMq9L/1bUT4uBokDc+f+UgVjs3yEpUHMqD1tq/G?= =?us-ascii?Q?O+4qVphJdul0kd5QitjZzG2jx40tV69gjC51FCLBSiuSNEqPj8DXKnT30acV?= =?us-ascii?Q?b8yyb8pFYObTig3AP4jeKNhV10NnEDz5qGO6lzRJlPDMJkmeyMyY7MyO9rzj?= =?us-ascii?Q?7OxTPqqRkFmXblt0qL7zN057FYOqQcLBJMi13xqEuWlyyg6m7w=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)(1800799024)(376014)(36860700013)(82310400026); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: Yr0D9oDGHJ82wfcwC835pEY1yg2m3B1ud141Kje55KseBRgQwnjwZ8u4AQsUM/M5CshAF5UiOmA35wcQuUjKUIkN8ZWGfNudSb7e/pVUAn+/d0js3NhEthUPI3L16yQF1y6n4pWHTb89xwLJKShytkIbUh1x7D0sDMMMXD5CldrCuwzBkIi7jzeAF+iml/3UqfO2nvGKVJ4xePYI/EMHPy7XKco534nVNWKGejc80HjBvIqKiq7rLJ0lnusUIr4dGw1x30l19JjynY7Edv1hywVBhEarZ428fQnjmmmXZHjB8HoBVh53Y6COWGFyz3Ftu/dGHY/W3lHam/7+cH1jnlK9zKUiqpDxj2wjcfBMz57CKCRXqi4/I6fho1rZpIaRMEvjcXH++djCahjlzBjmWEYrRaYb7RjbwAuriCqi2PQzRLHZKbs5YcGqcok02NhPZvY+lWDaM6tpCMURxqf705GDOf3xfRA3BSGqxnvbMWYDLyw9NiHmBBXdK2NFAhGOiLf0xikmKVH1IkpyPpxk8mlaTVd9H3HRfWgiuRjfuxCuNmLOQu47iFykBAYq9wWZ3Jy8PZmhQPLik3ncFfLEaM0fiuyO5MI7NrH1AjnqyYzaszBKRB5kpEiHoZP88oRaKgOQG1rKfWB1cXNUIExJo/aFc8p2VG/sjbWaoGyanjs= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Oct 2024 21:40:54.0209 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0185e001-4c5a-4a64-b635-08dcf92b882a 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: DU2PEPF00028D13.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1P190MB0670 X-OriginatorOrg: napatech.com X-BESS-ID: 1730326531-302901-12798-44822-1 X-BESS-VER: 2019.1_20241018.1852 X-BESS-Apparent-Source-IP: 104.47.30.111 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.260092 [from cloudscan16-249.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