From patchwork Tue Oct 24 02:28:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 133211 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 9BB8E431EB; Tue, 24 Oct 2023 04:30:29 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9D019410DD; Tue, 24 Oct 2023 04:29:53 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2091.outbound.protection.outlook.com [40.107.93.91]) by mails.dpdk.org (Postfix) with ESMTP id 26DF040EF0 for ; Tue, 24 Oct 2023 04:29:50 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hYRrHZGj7YXUmwjn4WMStNkLTffEpO5m3Jv8nUNyJl9OB5JAzpA+PCBcreVpJbIVo/07CBD+I4AYZW3Sk3a/duNW4Dm5uBZLW9DzbVFxB3WFTwyjqmy457MOuCKLgBoaPfiWWVQui2gucS5/x3A1sKvfLE8NXEW+qog8kTZlfD5rYuQYbbKmXeQIj1bM0tcXkWzNzY4ZOMM04/n4iQ2KbLEPwlDncicpBdlIAf2KaEXErgfWSRyBHz1qSRzLSKwbUSl3iNZ9lz3lLTgHGRjGa1XB5OBSKO25XrGFoPGWLN+/nRqgViwMZpzNqABqFW/sh/DnrLhbo7YByXwvdQ4WQQ== 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=d/aSXN5lKGAxTM5v/9siFCxYHESuC29gT3zlxWdsMjReuRkPVz65uVhSlH2G+HJKk+c6d7E2mwiJp+4ncN+DoluT9ACM+WrDE3MBrvgyVVu3+bsES+mSdax32pE2+aEW/DcZVWh2UFs4rka1W+BaiaEqtPoWSMbXAgcweWnS77dalfw6Dxg+91hu8qLYCJ6XH5ZHBnHK4u48A+mnEVrvFNhsZeFUxQmiororUf3L5ulIGEubg0ORmY80DjSCV4xRJdU88pa8Wbz0xPOIKAuItgLFfwLEWoisIxc80dBfhiVcqzf1ZFiYffI/YRKc2SjB21Vry0diJabhQjzyswGwbw== 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=mOiW28yefbq5TpRGLPjyP0xuPoHXoWZbHP4H3aAjGM9JoLtbbGzZKL8a2iEjxkOTdeuoo2Uqf55tBKai/efsAK4n33mMp5iEfETu99/4CukXM2WgMxshpj+l7sAevciuwQpVUtVDeL7h5Lvwybgcct2YygwxtcZBsOH7z9uNg4g= 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 BLAPR13MB4691.namprd13.prod.outlook.com (2603:10b6:208:306::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.33; Tue, 24 Oct 2023 02:29:48 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::142e:d47c:7320:8a9d]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::142e:d47c:7320:8a9d%4]) with mapi id 15.20.6907.021; Tue, 24 Oct 2023 02:29:48 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Long Wu , Peng Zhang Subject: [PATCH v2 06/25] net/nfp: extract the qcp data field Date: Tue, 24 Oct 2023 10:28:30 +0800 Message-Id: <20231024022849.3092506-7-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231024022849.3092506-1-chaoyong.he@corigine.com> References: <20231017054545.1692509-1-chaoyong.he@corigine.com> <20231024022849.3092506-1-chaoyong.he@corigine.com> X-ClientProxiedBy: BYAPR04CA0015.namprd04.prod.outlook.com (2603:10b6:a03:40::28) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|BLAPR13MB4691:EE_ X-MS-Office365-Filtering-Correlation-Id: d4e68c95-bd3c-4233-a239-08dbd43917e9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zkyHV4P6K6y9nYy+jmnEnXTpS88t7AzIcQEfiE1ljQN3HFJn/3TzkLsJa9WNVMhrUmmFZYMbr7U7gGjXvldeX5kekoXEBRlvZWWlUws2V6VsYd707MF5u/ItrGIgVZoYKJrcfTZdv9Mc+8JBh4DYIaeOZ/y3sWMczdWY4qO5MoSsRMzIX68psRhbWV1hiznU8MRadLQtaA9TXLAcbUEJl6OMkCOy1RUGgZWiWVcj4yTIKGbpNMjZ88PcKJ5nk+2NDH92eRJjQWwOhfBziI8dtryh/EDgVOXj6EOkHKdTCKnH7YaOESaM8xCiEoxHF5XkHDeYlY4LjbOOVdOe+hQZ7RXQ9Egf/BC1qZ0g54jh98DUS1heOKFIQlsLlHyDKqnEL9dOyJoNWgLqL7oidktHzNvNbdQV8aAlc8UMK8uTc+Nbq00cNmSE+rMY2hmiyu118f02n0iTTGGXkXVsSyb7WDOBRdV8OppSqJqCNPxm7gRVI7Dg9Q9zfN9Q+y+yBhE1qTorZSHnmlAEntFcY3FcYKT2VWuMTiqdpIrwp2PTLUGwqxpT/8lLCQffmziLFXW5QCXyb0t94DMmNxl3QXnfwsI7bRuZZX9HtM3nrRJUWgZYmZunMxCZo3PRjS5qalAoKNTn2xlo5YK4nPIhThmUZWlnB6TSAM3PKpl+dFuxqLc= 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)(39830400003)(366004)(376002)(346002)(396003)(136003)(230922051799003)(186009)(451199024)(1800799009)(64100799003)(83380400001)(38350700005)(2906002)(4326008)(8936002)(36756003)(44832011)(8676002)(26005)(52116002)(107886003)(2616005)(1076003)(38100700002)(6506007)(6666004)(6512007)(316002)(6916009)(478600001)(6486002)(5660300002)(66476007)(86362001)(54906003)(41300700001)(66946007)(66556008); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: WXedteCpqF+LTmmrf8PlvMKiEPY2VOpXrtOBYUrpNEJoT3u4Q0c0AVUSaZvxB3FPh+OmIfWz9tNJAn47WF7NOSd3mnuF9zkL9y4yLkGPR3Xz3Q6im1snWBLA4Ib5Xm5CGObYhcMFGFPdOb7vaRkKpmmc4v6aNJXKOPaEfGp/0F4Ag6iKVFMJA5SNB9u61gF6jECXEPjUtf42Xl5B0GL6V0aM9I2VSOhy7p/+FR6B86rQYlHCyAJqNMR94gkKco6WC68VLVVKbA+8OkdIgklYl8plhM0H5hsS0qpyWPKJ6LUqPmbm57sgsbxYDHbzrP/Rttsou405uOhySmfztmJxysl8FxATLMMRtCZnBGLPWXp059512Ib7If1nljqditB4fI7e78Sxd5dQRw8NwzI3R2jTff3tuql5pTzhsX+Etd4hTQ8Gq2cqMA28rV8fYJ25r75VDnfygnVKVzONOxzhKvofF+IvPaocGMl8o0CLebjvCJgScbGjFPXTnS53FtN9KRKQpuPpEttXfy9Qa88I791QjxGWgp2eL0x2pwqlu5gsHIn5cM2IDrJAcm00NmmoqIXoYvPXQG87pBrjL6tadWXeJTKuS2FVPYtQPpUfVt0PJ2UZoSXduekRY7vUXCMnWYOk6MYG7QnJZWf4s1fxyd0K+guh09H0Yh+bQ9bbUxDMrYHeieEpOzq5VHE+VUMDt5lMTNJ1yuVt81rvZm2oZltKoHl19OprfMTWXtqgcomQiyoHj/XsLgAO+9j9QggNleHpdgcQHIeYob3SSeNVWpro+lQS2Nd3FbVca38cA0igG83UCjFfn7bks3wd8/2fPyjPOB31P2keduPPowVGr/FyKM/JwXAAjMIUnMi9n+/ZhWkeEKM8Yy+3e27aJMzYlhdGtz67O17U3rRLZHFvJ4fjsgMV3ZgMPODl5RbyL+RmGEVvAbKPLijBkQSMtJPe7Vy4XC9IfEC1/SFa9oV7/xJDFzOSegaDk4Y2hbH354h16tEXc4lPUTFFHOZ6e3baCt4SBoGzKS2J4p+vmBg7vV4PCcItPyJlj9RhJMAJcqHYaVYtHu6IG4XSa/f/6KpRpPUOoOzs7bStNe2R/AqjMBeMkFpLqCmscus5azC52PWpTCYMdm40zcewImsGnL7bBNpf6FtNnWKqt8CkKKVjfEKfjf15iYc+MvxjdWDbFr6wohy4cyxgpuQwqCxZXKiRriPcixLct6N4BZBv8TVk4Xzs914M9+hgke+AqJOWVT/2O5mED4To248cO4ESnCvaC0+s8DZP+wdvB7a0nf3NWmaixdx4DFf2kWgqwSYQVyPnwZcCSSGx6GfQj42EgV0NAJWb6kFchpdjriCR/b/Wye+dFWAb5yY346FXfhRhER5CrunAQADE6M5uA7/7sOYxKBnfYym8Cf1ji2Cfwn8y6da2dc5HF8j5iNWV4qCzZEZ6O0R88dm31FGeH/o0+tV0lQ1moCCGZlUMFnkxFp5kW6CeGa1t3yX/bRXVMIVeNU6odUukTP1z0554+lmY6Iiy9wcV2QYlgqm78j+TSnpSbxMmeWdTiUGRCDpr5+4kLSnlBZ1nNiUpWAudgda+G5+PIV3HkIDs6kcEe3vyeuadGQ== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: d4e68c95-bd3c-4233-a239-08dbd43917e9 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Oct 2023 02:29:48.5350 (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: Ssgm8gfP8X47MQEOqa0Ftyj1vEKKzaHlUmIAEHlkvBtRxrVrXWbiT9+j5zHfYG6KRjlfjg9HnBovH/NhYcN8c9fErKzul2fi0IGxpR45lZw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLAPR13MB4691 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;