From patchwork Tue Oct 17 05:45:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 132696 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id B2A8743186; Tue, 17 Oct 2023 07:46:57 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 906DD410E6; Tue, 17 Oct 2023 07:46:23 +0200 (CEST) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2100.outbound.protection.outlook.com [40.107.100.100]) by mails.dpdk.org (Postfix) with ESMTP id 0393D40EDC for ; Tue, 17 Oct 2023 07:46:22 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aw6wzlj5bEefXABcRg4d1Nt5ePIir1jWI/6uG3D/5hJd5YddhDrQ+r8RAt95i4+fGDL9DvwOcdKEOOaUq4rQD9VFO5FiFoM9SZLfdy7D4ffzk+vvFuQX4iBsQnmfUoBJV7chAJPutkvD7fqBvolSARyrQdRR1tN0ik52ELannTfztUZrHUoxwEvoIHqIdoGaxnbGsTFdYcB4DbbrlCE54/cGA9PJqRvK85vjgv+mn6onfXeHnvM5o+Mxu8PY45efJN5pbSYbvlvjhNVL64bm2xK+ITfML3rUKKxjtcZnf57ndD9lGd7lTpaHE2Bxi1A+tLtirEa7wDJ3jYKdgGvCrQ== 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=58qIvnRfuL7HPF5+tCTEn1a9XE4d3BmDupSZvwV2X6U=; b=IhpboQ9XoWtBCcWUR/EmSjZmbEmcv6GRgMQ5Pc0VTVm8YckJzxPCKBpxkmwMAyay1GiD88Yf29DiK3W/An4uUaJiNQSL4QxrVthX86X3bjIvmo4QGSTV/LKsH1XuaYOIYqhd33hxpvAd/ewO9+rohkM4eb9px/dlWZqidaOoFFQ/hJgaf4HrH9O+kK4/FNgt7on04CKNYA/jzxQbwxZTLILA1JTNMOPbsOGaA2THEA2WPkEXxZwhYY3aftrYCSIJV7rILuBU541Lndm7MAVnQsF+HPGrUu7y3KdRB8Dybv543PbU1rdGyXE8pMirE0QzcqAxGvyn2qJ1v0Mt6ehW/Q== 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=58qIvnRfuL7HPF5+tCTEn1a9XE4d3BmDupSZvwV2X6U=; b=CmHkZ4YHlOZtqwUsX0du/tx9S/9rYBw03VQS36C+RTyhHpmCJRDza/jkoGQgTkJHZT527SA5njx2DegT4SGi6vn2wrK7mnwKlLDx3uQXEvlfklsjbP/g4Dm1EvYAvmlnDWDsdWEZ87IPhm7ZzfYt5HlwJ9lYV+EgcNt8JQHFtT0= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from PH0PR13MB5568.namprd13.prod.outlook.com (2603:10b6:510:12b::16) by MW5PR13MB5904.namprd13.prod.outlook.com (2603:10b6:303:1ce::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.45; Tue, 17 Oct 2023 05:46:20 +0000 Received: from PH0PR13MB5568.namprd13.prod.outlook.com ([fe80::b070:92e1:931e:fee7]) by PH0PR13MB5568.namprd13.prod.outlook.com ([fe80::b070:92e1:931e:fee7%4]) with mapi id 15.20.6863.047; Tue, 17 Oct 2023 05:46:20 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Long Wu , Peng Zhang Subject: [PATCH 06/25] net/nfp: extract the qcp data field Date: Tue, 17 Oct 2023 13:45:26 +0800 Message-Id: <20231017054545.1692509-7-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231017054545.1692509-1-chaoyong.he@corigine.com> References: <20231017054545.1692509-1-chaoyong.he@corigine.com> X-ClientProxiedBy: PH7PR17CA0069.namprd17.prod.outlook.com (2603:10b6:510:325::29) To PH0PR13MB5568.namprd13.prod.outlook.com (2603:10b6:510:12b::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR13MB5568:EE_|MW5PR13MB5904:EE_ X-MS-Office365-Filtering-Correlation-Id: 65d1e0b3-a337-45fc-6f87-08dbced4637c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: K9VBEIBidZ2uuZFjqJ/xTxw/cq6J6saurPT6+Kg+w1/ar++QMrwi8PqdfoO2u60thnBIjJ2tMz/hfQa7MPYxUTJiUXNdSwAW4k6e93idQ3lNJSCJmqyd1FiwKahdhUTHsrlyCqk7q1MA455SR9/MWLUV609TI7+emOZXKDn6S9nygoJAeQYtqGObbdkYqbvvAgWkUPhWm008I3FRD67M0X3QIjnglRjk7IyA1DXNwTGrhEC0lVp4DnuFFdfWpr8hl3CbnkdB6owkkdQFMKbCx3seR2UhNV2ZybMEpXEveprpJEYtRLnKi1inpNnQVcZdeXce1ZltPSsCsxWguUsNaEhZusebg5vOID+iGyIzgLrWf7eF+VPOZsIKbAZrEGbIwMP79bw64ZqNGKNxCWaJDd852l7rbTOcEKpydmu4T8c+5nxdCHXworyF9tIOGVizHuuBN7isGr08sLmPLg41KsBpwGUF34gCwC72fTqjGyGOtqs4x4aOuqwp5a896RE3Ah8Kb5IP12hJazbVCLSCgEFAsXX40vYV7VhowNTFhiOYg6AvXy+zzL6rQJEhjrl+A6hqu67zvUIwMkoc/htCWVi0csovw9p2RyObxpLWqu2ImvwP8D9HHkRZe/NGGCqqnXH7UrRC1C20xLbiiqOnSyzibNgwCxZ9Zf0O1OoIDd4= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR13MB5568.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(136003)(366004)(376002)(39830400003)(346002)(396003)(230922051799003)(186009)(1800799009)(451199024)(64100799003)(2906002)(5660300002)(8936002)(8676002)(83380400001)(66556008)(66476007)(6916009)(316002)(66946007)(54906003)(41300700001)(478600001)(4326008)(6486002)(44832011)(6512007)(6506007)(107886003)(38350700005)(2616005)(1076003)(26005)(36756003)(38100700002)(52116002)(86362001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QrQtN7xVwV8ifzg5Rs5HrXR7ZJR8DhohBVWovW+t+fp0a1id6+xeQHaF1lOL2MVZKcTmrruNRPE+d9ebyAy/0n4aLcY0W6g192CR1BYzMV9RnXXIJ7YU/v6L9Ub17+NLhPd5VDG9U045WJTlBtileXS1JHGj+CLwnDqMHsJ+JgSqFXDg6sOy2pU/inQmV3xpE66RfXCpGWu3QBrsKKt61l/SrT327vZFkyjBE4yP9Hzj6FJxCYNv8YfVTS54qKpDeK/SnqKzQr6KqijS2jd4XKI8ynyU+V+UgYmbgGd2KFFfXOPqhbcUj1hMqXH3sEMIk4FDjHeupJi6+fOpAcwgxK3VIAUHW0X94XvnRjEhgBrGoyg8FTYTvTtR6wg+DLmngKp7u3wxPuilJxS01ozXeDOTHoixNq/+lm3i/IKR9xzPTVCxUn0uHjol2EmB5eS8fgDrZanA/hRBgmwfMWLKpKE8L/QW6k94JC5djDUuWchRpoh+0YKsbueV4FEJXdkQ73aTm8w0/jvmtQizDNC05YUDKeyNqN8WhdLg0j+ezRWYEkl2mKLXihR/As6+D+Dh4Eg/B9fLK9OMa1wk0kfyFjBFHPlXXeNuAc018wejea6mtLkCR6agrPyNdC+gMHOZLaVxhtV93yQ/dNe4oHjSYjYH3eNAobdPtpFtE3ZacuBQKGAVZZIW8PHv49r1LvIamNd+iyUlNzXGLAyKc+uMz4d13gms/W0WeXjjlMgDY1pG2GRCUe2DiBGPTEL/W6kJNQM6QZ+Ee9/ucvJQmR6O3NxbxH/kvYbeVzfMN5J61o+5OQ8QpCrb9SN5rRswEHiy3vv8HXUR0n3MYp0SxdTpPELmu0I3+JLm3We0ivR67b0Nj9UShHWxxUl1Y6THPRix37/7g2BfpqQ3/RyiKAEziZJK2cqMHSHbGQFA0dwoo95z8T/1ted8Uzr68L9VyX2UDPmJesZCBpVTfhyKVYbhJHTNVBt2tBSENQHAxh+eUv5FZ4H9gjUc2O77A6xoJx1CoPLFwKdfs+Pik5S26+nsqWfmYM2+Xi+wCRhtpdfI03LTy+mt4TU3T4n7fVpJv/7x8xzLmcUcXD2+OyYo6/uIasFH5GgfzCD5wYdYORWFAISO0bC2fVh7YdKKbAetuuvxBYA9RtBQsHvSVL2B34tICZ/uhMC+EaHIPnOlnMpmjB4QIPY0FuIQA2GR6s8DGsiu3P8uVlBxzkaksN5j09IhNwNho+EGjNT+ojxTvRooebxhEtsO+NyvLBn2awDLg2emOxkM1QZ4Y0ERsAiLOPYrK2OixtzHIs3oDDYFQzRGp8aDlSLDm3ofYlZwhB4pN5PsSmMLyZX/xF52jW5QQ4JXmnAnxKaYE5oOV+w4LqkrIhVdhKx9LuI1SyEzFcwQK7NG4OVXt/Xyzan/cGHWu1cNaFpjVdzfJ9wZV3jJ44zRTwWZ3KK6IuhnihvjMN/eMnoXK3tVo2VrpXwJwN/vTRUQBcOQpiAUK7mZ67vi61X3SQLLBdBj3G+48HS/fcbGfRSSTucXi4iD1uGapeii47k00HdfJZLZia6ZspnKg8Jo7eNpU6MxYHWhoFIg7szN9dExtPkDrk4Aluqin3UQyUDsuw== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 65d1e0b3-a337-45fc-6f87-08dbced4637c X-MS-Exchange-CrossTenant-AuthSource: PH0PR13MB5568.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2023 05:46:20.3561 (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: oj/E1OFLJ1AK0BMOzEx3bltyMYkbtllB4pHtcOFiY1hcZvujymPctOrSsoIpbqiz6aBy40fk8myzYzj8EYCOQftfKgOgVlDRWtGBrhj306c= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW5PR13MB5904 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 3cbf6bc021..a5548074fb 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 269fb4930e..cc7d438011 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; }; @@ -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;