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 34ED245BB5; Wed, 23 Oct 2024 20:35:28 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2364B42F45; Wed, 23 Oct 2024 20:35:28 +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 9F27642F45 for ; Wed, 23 Oct 2024 20:35:25 +0200 (CEST) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05lp2113.outbound.protection.outlook.com [104.47.17.113]) by mx-outbound15-83.eu-central-1a.ess.aws.cudaops.com (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 23 Oct 2024 18:35:24 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=prW3utZiLm159JzmRUfUnkQcJ/Dvz6vwFSrFsz2hCNZa9+JqWnnM6ZSd6K6mFnGEs2s5Vhk1vqyRhovAHTGdoTsZU3QPOCmyXachHdMdCSAi/7YHuNovvcknHjgpn8DV62Ycd+nLoIm+RFy03OLdL8KPwxmRXOJ05JweeeoeGt844B3lN5mPmCc6gqOAyWWau9PsHUdceEigsASwCaW2Aly5qkSNR2Mw+rJ06HiM9LLq5laoC7D2kO/21oUWtczALcRu8/jgzBN+C2TFEF/4Ul97xTaGXAUZqsB2kZfmTIXyVv/9UQMAHijTgMpzWoO99Ttc+1Pr8uZrjVSVPYlvzA== 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=iSjD1z6nT39TS06AT4tMFWmBUmVms06ktEevjokGHmmacOympDHs9Cr10k/lf6ii7SOOI85CnaE6q4Rj3kOorR6QnFQ2SGvMsgrGCe1lkQlsBLkTgxlvUUf10/1AepQ3gYgBVubGP970/KKdJShUetFEjF67Yapz88oY5arM5lviGqrFVsDXbrGEvaz9XA0ti5lyjVn6QS1PcRpu3plHwgYiNmQqKvJ5+nY0mQLtA5qfH86fiD2ZeEkQwIe08H41bzyRoVfxC24CgTMp131cvtkKa9BHJnUPRTPBHzwRhfhXetDh6M1G+3DJ+f1YbIEImw+FPko+pozmYeLMRHQTPA== 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=SuCh9QRIedehn3nU578Wyru5Qls1X8qEVqTeJMJAHM4BdfK+57TxL8DXfR75hhpKPzLCvUUPYlBsCcPM5/ckSzKWPkaNCFeRCfMDtEZyTDZ4yBtS1IkFB2TqlvaB+sNtohdN1tos6MZz9e6GtgEs4JxVSrtqm35WxdeRSAitp78= Received: from DU7PR01CA0007.eurprd01.prod.exchangelabs.com (2603:10a6:10:50f::7) by PAXP190MB1719.EURP190.PROD.OUTLOOK.COM (2603:10a6:102:281::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.28; Wed, 23 Oct 2024 17:01:40 +0000 Received: from DB5PEPF00014B9E.eurprd02.prod.outlook.com (2603:10a6:10:50f:cafe::80) by DU7PR01CA0007.outlook.office365.com (2603:10a6:10:50f::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8093.17 via Frontend Transport; Wed, 23 Oct 2024 17:01:40 +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 DB5PEPF00014B9E.mail.protection.outlook.com (10.167.8.171) with Microsoft SMTP Server id 15.20.8093.14 via Frontend Transport; Wed, 23 Oct 2024 17:01:39 +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, Danylo Vodopianov Subject: [PATCH v3 63/73] net/ntnic: add scrub registers Date: Wed, 23 Oct 2024 19:00:11 +0200 Message-ID: <20241023170032.314155-64-sil-plv@napatech.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20241023170032.314155-1-sil-plv@napatech.com> References: <20241021210527.2075431-1-sil-plv@napatech.com> <20241023170032.314155-1-sil-plv@napatech.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB5PEPF00014B9E:EE_|PAXP190MB1719:EE_ Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 811a085d-b5c2-4a02-1b49-08dcf3845d0f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|82310400026|376014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?zZlkJl/dDj17FTXlflBmAommqDZQP7J0Ji2CZa0vReWa0BrkmI696VgUvP3W?= =?us-ascii?Q?lA5DvObAMfTwRbuae8UP0yZuYyvieNMXFAj2tAxB9b/oKz0SzV9JUjgvqx7E?= =?us-ascii?Q?VNp48fK2QmYWbtlz/SwZRGx4xo1G4sHJEMpco8XiHgG+2ihJVolmWpbzwr8E?= =?us-ascii?Q?OJIJ306KZWWprZ28AZpHiB9GOb41ZPyQNBJiDL7LgUejZAKGuKMOTXk0cfiL?= =?us-ascii?Q?w0HLrbRthsdmmEozLyv23x796CGU9lZAJtn+PMqpM7cxg4e68FIKH5uPk2R7?= =?us-ascii?Q?k+4h82/yHgS5R7y/PWYleWTTXb9yVLgoYdaJ5ihkL2gRPyFeUfTXfcjQlgcM?= =?us-ascii?Q?YeNON3dbtdJj6TkfnvhAjk3THb9UiKixjadrlXkYMstwZsR9cWukTTz5p2Qj?= =?us-ascii?Q?+t3dzR782P4HAGjCCXa/cQjsMnwidDGax1dftqkNPJfEX2xwdo6Oo2BK5g+q?= =?us-ascii?Q?j4MUnFQCkx0w75Ad2xFPanQVkPVr6zIthD40DiEvqT7wnjziYK9OvnApzTlP?= =?us-ascii?Q?BNyxT2mqKQ1fUdYVh7sgNl7arqZAsIXHnCToPZcC/NBhYJ8q++8y7sgpU6A+?= =?us-ascii?Q?TefYOPL64T7giun55IPknqmh25tW8NTpo/fD5ElTTDGqAvRlZYOe+bMqdB8m?= =?us-ascii?Q?R9q5bxw3itg8kq+ZFWgQNqncm8+vGY3fVTKg4ZVpfr/IORP8BnmM/DygEqvA?= =?us-ascii?Q?xy0eZm4rv2sMFSlnq676fCDJQp7M68WTdST/to0L+HNmqvrLs2Ylkq+mE6ws?= =?us-ascii?Q?K1Ypp+OpaNljLL+gSTJGrU20Wc80OTEdVwKiFPyvldKrCl7C8cfdBvReinLi?= =?us-ascii?Q?eKDNqwK9IasDCx7gdMYWWKADeQHbZRns+qBbT58zF/RNbeLV1im2x1QEX6zz?= =?us-ascii?Q?zXGULoQGyhfzBZQne6WlFPgfZzJI4bo1eB6z5LCQmTVsdcDE8dchmMcJsKqK?= =?us-ascii?Q?BQP6hgzUIDo2asTQFjD7LT6dBUdjIIp5zk9w31n9+sNgL0JApm11h23xBmch?= =?us-ascii?Q?/fOE614RrmShiVL8+8/W2uhJd4iu+ud/0IzTBNU7P44HO2wEhNTGuSCGwg/M?= =?us-ascii?Q?YfqhLdfKXTwz+QDYDxu+ojJUcvdlSvcyZ+ArR6ujLIgqrSoBqi2iyKcJ3mrr?= =?us-ascii?Q?mGlASLEfEDmChXvVplXeGaHlA8w2XfbyxYBMBx9Rjr7AjEuJnyrnqHDrK8Rj?= =?us-ascii?Q?hUHc8tAVf9Wsh5YPUF61XFfGh1fEzIL5vRAGhKFIDRCmeWpM1KQRUoIQZmVn?= =?us-ascii?Q?h86RazYrqEWZkt8DzJPHaVHT76NiwW1JE5YGZZD7KRV+wI1c8Ns8DHklIW/8?= =?us-ascii?Q?EemdgOegBdkiKZD5vJ6z9kWeFVYuGz9CIJN/C9Maq5snswmJVXInqlbfc3d9?= =?us-ascii?Q?q1l0pVH+yD4y6o4qrMb7cQErBNvxnoq9L0iAUvSDiv7S9o4Tug=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)(36860700013)(82310400026)(376014)(1800799024); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: mdiryG+klZzGuaICzq32gcwozTEoMHnY+TIXdXGY/LkOByrM8UkWQKvcJlpXHhGR3Khfrjp/KYBn84/onpbthmMzesMfdBQbD4colKJ3lVxVK6vXvM2ac1fmAqonrtvqn0mtGEXcKYw5uhIX9CFtzg2DH/ctjfwSJVvxXV/rWkxJVYolnslZZJaHtrY1B61q1Uc9NB8IetqEq77RBlwiGAP19DKthH6uAEo8tp+o3U2jRoT2LPe0+vDL3zYpl57CGNoBCapNMStC0HOoH/V0WBXkcJzw4zz3NFEAyrX8sEM7DhdvydYGA44YRlJVRcyvgkyEHPnzSXebiP5oP0kMnWB6xHGVw7DRJuL3ngNNsWNycUX7rXHw6J6/3b3X5WG88rFcC/Aoey2r9nniL01/s41loWwjuZ7LfaarSFx+N1PKkCYA7meM+iGFzPc7gyv6t2fYY8GoP2J59rPpLNNxuas3ah3Zll+7nQUkc6IpBwIEhLZoNS/iUZmuDGBJ8396y9QC2hxUbRHYFOHCWxM1GqG/OULdOsQQ2M4z1VaxUFY1kU58R8r9jgte8LBWYINRVp/IFo7/NB9Lsd87IEshEGikF6W9607Bgz0O/ijHlQt7kvV3STSqteE8yD+cqMSFkHsnIUxdENQVlqtB/eO8ue6MlZOKCf56rmxip/MyqY4= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Oct 2024 17:01:39.9615 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 811a085d-b5c2-4a02-1b49-08dcf3845d0f 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: DB5PEPF00014B9E.eurprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXP190MB1719 X-OriginatorOrg: napatech.com X-BESS-ID: 1729708524-303923-12642-48153-1 X-BESS-VER: 2019.1_20241018.1852 X-BESS-Apparent-Source-IP: 104.47.17.113 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.259926 [from cloudscan10-18.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