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 4F7564320F; Fri, 27 Oct 2023 05:01:24 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8161640A6F; Fri, 27 Oct 2023 05:00:51 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2117.outbound.protection.outlook.com [40.107.244.117]) by mails.dpdk.org (Postfix) with ESMTP id A654442DA6 for ; Fri, 27 Oct 2023 05:00:37 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VznTt6EE/P2koHNN/jrYh7VQvVy4OLNkPnIN9ehf6KkbSQ6ssj5gpKjQx7//s5HQUFiRpJoXHBJ2Wel1Io8pA6rWOv6Je2jIbI9AtpkgJWWQwC5m0FywlBigGVwEcoEsuc34go3tw0ZxO/3kAwOe1vxXRqpFI7yd361zXHPd+39MJrdSQSlSQRjtfOSFfcYIoaF5JkiUtYEkiw8TCwmZ6rXdOqrOQXPycdYxjUsVV2Ug4Ngo3Rd9F/AqT0H5+E576FVMiWKndZDgF8tmQyz1mClE4s+vPW8i1Ph+yoSG3+i6Uqn/n51eCb7OE/T29QKicr1Wfoq5kPQwB/4uYoCnXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=R156Gls60QxOU7qWGoYnxXX00gHa1vcJCkb2LgmRnYg=; b=MIS534KNDVVUw2vGWj1elvLfPklXIdO/iOi0PqsvnrNMcIPd3R1YwpUbUZkG/D/qDERXZfsIQF37WGoDKkID2H2ehq0uMbcqUKtKVzBw9xV1Qu/dsXRp4ovLpKbyhujz05GeCpb9lzUHrzTJwvMfs5xbe92KBoSg5fZkM+CgvbFQsD/bPCtZF2keoWuvNBi+E6K6Y5ruN0PS1ygmxEAlf9/8VMWCJI2vkLyLnAYL/k1uABRcWqcORfN+gBZJbHen+gOvktvF+6CWnd45L8rfbOiP26t9GY1+j1NwzE6ucbBUOtP4IBNihvgoP54O9weDInJSpu1U4OhIdSgCh2KYmQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=R156Gls60QxOU7qWGoYnxXX00gHa1vcJCkb2LgmRnYg=; b=GuRYxDrRhgZ1QEAxp7tE+5IJhncixlePbs9Es3utMbDMnut4jM2MIm13md7xcFXTPefv8C4M+uEzF9mFzT6QOyJ0LQe5lRbObn7br8k3vwvT80mgPxPc9aMKu3bQMomm3cXagsewPeaT3RkH/z94ZeEVfPQZQrQMJWaSVMMZDyA= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by DM6PR13MB4493.namprd13.prod.outlook.com (2603:10b6:5:1b9::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.33; Fri, 27 Oct 2023 03:00:36 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::45b3:d83c:cff2:4a1b]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::45b3:d83c:cff2:4a1b%6]) with mapi id 15.20.6933.022; Fri, 27 Oct 2023 03:00:36 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Long Wu , Peng Zhang Subject: [PATCH v4 06/24] net/nfp: extract qcp data field Date: Fri, 27 Oct 2023 10:59:43 +0800 Message-Id: <20231027030001.602639-7-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231027030001.602639-1-chaoyong.he@corigine.com> References: <20231026064324.177531-1-chaoyong.he@corigine.com> <20231027030001.602639-1-chaoyong.he@corigine.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: BYAPR08CA0065.namprd08.prod.outlook.com (2603:10b6:a03:117::42) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|DM6PR13MB4493:EE_ X-MS-Office365-Filtering-Correlation-Id: 09a86d50-0347-4cc0-5ee8-08dbd698e45b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kkhkeBcbSRetxFSFMNqok1g9x4UbaychNi4s439v8FRH45We1/72x5U9K400vCtlJrnv/B20BQFEBrNwdVo/xiKVasJH2GKRiN1FkXiZqr56HeGWU61pwAdh+NBXwNu+PsyPaYr49NgG5cJN67J2f7ub0l0IaIbwVgrS90UFegj0bemu2HMfQVdwiEG5868PEcvi1CR6EJzJQkViZv4RQFQHl4dM2l5zacHlPVcr2WEu5JaPRUOAkqzcG7l7A/rBJbkr2U8jexbpcol7lyHQcpsA00tzuASRYqGANqyBMxMftDWA3bZPG9zLjTICrEvm4CzKJP9npSjd0fe1PFB1Iatz9xxoTdO+wC8RCkeoVk95kALGfZ6ILCOCEAeG6pk1Ol0Qb2gOM7Ph1X8no7pCxuR6IZYcEtwWn0QhA2jEJ3VbqSZU7itlJqTtiZdsj9+HePdOepGSuO7V5Z7Fz6DEM9irUrs6KD8QAQc/9b+VBEdeJPf7bLptoF04ZtTkyNlD6uxmE6Nf9GI1M0WalM2ElPVdqLMBzXOSpb2WQOceAjtmFj3KfMpMcNgYRnOu4wyOuR7pQjC7D14BfTBLZzeit14BJaKVdfvuzXVuTdNZ1xm0oFzweez7L1NlGcU6dcjqCp5IhWWdktizqQ2pkjQ9nUOs+mgkBRyxSQGvr/ip7t8= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(396003)(136003)(366004)(346002)(376002)(39840400004)(230922051799003)(186009)(1800799009)(64100799003)(451199024)(38350700005)(83380400001)(4326008)(52116002)(2906002)(38100700002)(107886003)(44832011)(8936002)(26005)(2616005)(1076003)(36756003)(8676002)(54906003)(6666004)(5660300002)(66476007)(6916009)(6506007)(316002)(6486002)(6512007)(41300700001)(66556008)(66946007)(86362001)(478600001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?w/t+4DhSWVwokePuM+J94KEeeWJT6rGjWTbQrtVX9XTWNwsqSAzZBTbjcKgz?= =?us-ascii?Q?c7tvHbt575urUvdQwZSL/NNpriCG9SDxZgtgKM7BHTvex4g/ceYtyD5T4I5c?= =?us-ascii?Q?zpAKI9o2wbihyXJIPIowMmBp4M+9e3tCagEHhSJJJg8N7mYSu7XhALbczcxY?= =?us-ascii?Q?eS8YZIasAGNkMNhMOCX/PNa6/SWIo0Zh8Htokkr/PrXSakFx9l+MbRFEaqb9?= =?us-ascii?Q?Nhb3ovf1fXOUZ+m4qA4NZcWR6ShMbShso4HuI6jMMzYI3mt+np7NoH0Dkcg3?= =?us-ascii?Q?DIs5FLptBy8akeL6hIDIb9qUUp7otMW/8tuob70gjcSIjIn1z6UcBnbXmCNA?= =?us-ascii?Q?0Q0/5uHcOD5/jO8EQopuH1Z9R1KyM4lR06EHJWdKjoWhpgIdxWx8+hCmcqQP?= =?us-ascii?Q?HeowqKLw1w4/6/ebSiVAMP2UO9/vqYQowzfp2UnAgg4Z00/rgb3uxZ39W0B4?= =?us-ascii?Q?6XcSLBZkTmQJiick+mN/0z4vto2osza9arKOTcvrdj2y75INOZS3dekL16Ca?= =?us-ascii?Q?49gNGm1JlyuAzy9MOPwsSw1d1Na/MsjMYnycF9mD7Q64mYtFAHk8yzIanIMA?= =?us-ascii?Q?ZeXv1kPs4RIGBvvsRgNGTxUHf4T8DVbiyAku0VAuxb6q1uOieikjmik6uCBl?= =?us-ascii?Q?7w82NC/3Bo6gbC1EGOlyg68XOLO7Q4snH+/FG9dZJH96oidAtZgHkqQrXab1?= =?us-ascii?Q?68DLPg+EAJqYEanGu2pahIpsY8kijAnWr5LpgF1r/cRXMXasjrblNdP9vT9c?= =?us-ascii?Q?ONIZXjAZI1/cEMbG4mfYyY/JFKcC2WovY7wrlLbd5UNFELj6TY7/yINvbAxC?= =?us-ascii?Q?iFtunmSU/RzDpYbWWX0v+vyzxtjQ2DLgK8iYaE3HYaPUZHbdHRbksc25s27S?= =?us-ascii?Q?0PDhgJrgO9HwAlTyjmmcOuTFB/IE4Fa5fWc62msINOtuPUdcS/ctrNlkIsJg?= =?us-ascii?Q?zk6nianYQXehcFEyBsQst94G3E7whUmWMYJ3IECo+Qd2vt+PtWis7jFXTCjV?= =?us-ascii?Q?Dywpv+I7cNTrDy3EvjVG56gVjnTZZgT+2u/8KMXEwrOx3Zw8cYJkQc0l5jdz?= =?us-ascii?Q?3slfc8awzEm0FklJXMlMwrQt2eG7WhioYvbRpGF2w9fSw5/x366b65E7Nc0G?= =?us-ascii?Q?gyMEELu+VSW2V2JIS/KT9sypwuUahVSdgoZP6NtBPBaZfR+QalnFA2lQ08FL?= =?us-ascii?Q?DquPkJuHP6nns+upR9uw6g38PJVCL6pAeY09vhJ5SToz9XMabEEuilC60FMK?= =?us-ascii?Q?4e0kMGRvN8D3wfHpeZDgoZxDWU4N2QkT8pv6CLgDJ1owfURPwU8Mc5G/sVKm?= =?us-ascii?Q?e/SJAWRC9Ts1sI3x4+Jo38g7WzfHYulrZwOYFS7T0Knplfg5V5A+TkbnOzmL?= =?us-ascii?Q?nKX5Y9o6cWy9yfIuoxa6lJ52MEcR5AEjWwUzSN9pvUNBVRc4HnoZhKDtXN0P?= =?us-ascii?Q?CKX6zgnkEt1zQhyUIpr4HzFEHrPF4fuKSEU/SDIIFiiiSvahgkPvnpABBib0?= =?us-ascii?Q?F0mRdGBBBCgJbY4pzT9S5WxS7uVmiVfKff6zDh3u7jJc8Y80YPfDCn5u70dN?= =?us-ascii?Q?J/aPQMTTdD+gYd3jHgRSyS7eWjV5EF5xyp3eNNA2hTpqpIsCumvXmIJZd2C4?= =?us-ascii?Q?gQ=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 09a86d50-0347-4cc0-5ee8-08dbd698e45b X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Oct 2023 03:00:36.0536 (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: n0QUHI1JtGrJXQlk93WkJ4XharP+3qyxW7RpdhVrkQMDNxZM95wiHuwWEoK/NKspH5mGRQhZ6eBxBS/+iGdJA7mRD72bjI0yiUIKSg++z+g= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR13MB4493 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 Extract the 'qcp_cfg' data field into the super class, prepare for the upcoming common library. Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/nfp_net_common.c | 8 ++++---- drivers/net/nfp/nfp_net_common.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c index 77c0652642..cb64fa13c5 100644 --- a/drivers/net/nfp/nfp_net_common.c +++ b/drivers/net/nfp/nfp_net_common.c @@ -206,14 +206,14 @@ __nfp_net_reconfig(struct nfp_net_hw *hw, struct timespec wait; PMD_DRV_LOG(DEBUG, "Writing to the configuration queue (%p)...", - hw->qcp_cfg); + hw->super.qcp_cfg); - if (hw->qcp_cfg == NULL) { + if (hw->super.qcp_cfg == NULL) { PMD_DRV_LOG(ERR, "Bad configuration queue pointer"); return -ENXIO; } - nfp_qcp_ptr_add(hw->qcp_cfg, NFP_QCP_WRITE_PTR, 1); + nfp_qcp_ptr_add(hw->super.qcp_cfg, NFP_QCP_WRITE_PTR, 1); wait.tv_sec = 0; wait.tv_nsec = 1000000; /* 1ms */ @@ -525,7 +525,7 @@ nfp_net_params_setup(struct nfp_net_hw *hw) void nfp_net_cfg_queue_setup(struct nfp_net_hw *hw) { - hw->qcp_cfg = hw->tx_bar + NFP_QCP_QUEUE_ADDR_SZ; + hw->super.qcp_cfg = hw->tx_bar + NFP_QCP_QUEUE_ADDR_SZ; } void diff --git a/drivers/net/nfp/nfp_net_common.h b/drivers/net/nfp/nfp_net_common.h index 7bcdd9295f..4bfb3174b0 100644 --- a/drivers/net/nfp/nfp_net_common.h +++ b/drivers/net/nfp/nfp_net_common.h @@ -113,6 +113,7 @@ struct nfp_app_fw_nic { }; struct nfp_hw { + uint8_t *qcp_cfg; uint32_t cap; uint32_t cap_ext; }; @@ -150,7 +151,6 @@ struct nfp_net_hw { uint16_t vxlan_ports[NFP_NET_N_VXLAN_PORTS]; uint8_t vxlan_usecnt[NFP_NET_N_VXLAN_PORTS]; - uint8_t *qcp_cfg; rte_spinlock_t reconfig_lock; uint32_t max_tx_queues; -- 2.39.1