From patchwork Mon Dec 4 01:57:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 134770 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 EED5D43666; Mon, 4 Dec 2023 02:57:49 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 248F6402E8; Mon, 4 Dec 2023 02:57:44 +0100 (CET) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2092.outbound.protection.outlook.com [40.107.243.92]) by mails.dpdk.org (Postfix) with ESMTP id EAC744026C for ; Mon, 4 Dec 2023 02:57:41 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d4BRVBQ44eQCzc8pi7NuscSgMLJiYzYHXfEi04ZodveEqKA/PizYFXUoVDn5T90mcD8M05JyURyC2hJpG4K4IOcCxosmhc0Xl3ZdJcTmpyQ3qJKpoP3C8kqmy1Wn+3bLBOkQdwWOwzjDn1QiuNcBFIKD2Ll4o18Q7e4AD2NUU38QV84ekiIoLIn6FFe3ZvR53AbfKe2Ppa4fEI27Ls/DNo/7acJQlJL4YGgpKRFQ3DSaI2m9zKrBv2Ryam+zDgJVbhWGvTkNUU+r70KyzQ+vfisxFSY2ZsmXGzS6NAezx5Ji/bct0UtsCDkNLQw2dZh2zk7hBbR+AslUIGpxLIUKyQ== 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=MTHbZmWlgWOrIXK38OrizUK46xE+GADSMTWxZGCj6uc=; b=SK/lT39E5IIM/OSCn+6S2yZEKVydNjWeITIqqEsofK/uf0qFYirELKf8q4G2N3XZGvhkn+FBLt8dK/OESA+jfIIfEVcbciVQjE2cT1kQpjbMBny4dI2riUa/PnJVNUJ1b6RpUveZnCGOMGOw5PwF56seHbZiYOPe/WcJ2OzPvNgkCZ/v0WqdApvwb4YFlf82NNUrtTOdpahEyHEkCN0ZrZFnKWa8znmamFhyLYn0q44zo+LRP4nW4QiqhJKXv96IpBx352sm1wLdB49wns2BsSvjka1mv1JhBLmeYwnykbhp0LT+9Z+vUrVI0lTplK3hbLZ5trlf5OEtZfJXOtAw0Q== 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=MTHbZmWlgWOrIXK38OrizUK46xE+GADSMTWxZGCj6uc=; b=F1lePA2aORYhyYsmXXvnrtu9eL9JiqV/eDNJFmGaOuRJbP01iLPIn41ldUKH9mGkRG/7HS92HDSYmraVCpQj18Uh6l2LRkX+vhE/xWT6YYYDK/n+OsSCwjOMSYnXugH2VkR/R0/cn/Y6UeMrh6wqHi+2rtp/GDcOj00fA3WgT+4= 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 PH0PR13MB5876.namprd13.prod.outlook.com (2603:10b6:510:168::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.33; Mon, 4 Dec 2023 01:57:39 +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.7046.033; Mon, 4 Dec 2023 01:57:39 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He Subject: [PATCH v2 1/8] net/nfp: modify the process private data Date: Mon, 4 Dec 2023 09:57:11 +0800 Message-Id: <20231204015718.780578-2-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231204015718.780578-1-chaoyong.he@corigine.com> References: <20231130085238.60290-1-chaoyong.he@corigine.com> <20231204015718.780578-1-chaoyong.he@corigine.com> X-ClientProxiedBy: PH0PR07CA0021.namprd07.prod.outlook.com (2603:10b6:510:5::26) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|PH0PR13MB5876:EE_ X-MS-Office365-Filtering-Correlation-Id: 6f2ef7f3-701a-406e-68eb-08dbf46c64f4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lDog/Hi+P5Yh0QAUY/haqt+kJvxYlhQmzIarHaiiBjbnLkZ7gWOmr0htsg9ZIZT7u9gQ7IHdkUTlVmK3l+2P7wNZvwR2pw7xyKunSOvHWJy0HPOIg3Q5zJLvBwidyo6nIqiYcFPeXIktBnTKm48l7CG1DXHnENXiZ3fkpi9ZYc+ewkuxLAKoyf2Oy5D7OcI0Q7N5QD3/ngJ7tPAmxlpML7pmHLYNPF97MFLkSE/C0cpv8yhCWAnNhtW39lHJMRlYKDSSATmeqFYi1lxFpyaFuSn9fJGoaSqFsKb5rGljpnPJ5a9Wt20LSuIcsxEeHj5y2suRLouRquq70b8aDCgQ8aH5mcnzC3UpeoHZ6MfR9XP3jzCwnFd8CyUAs4YhE8Z+t8HR2LcfssdzqHvJoLAXKAwQZA73LR1piXFdw6ieOSb1PmO5fXB+Khd0FCSTr9ACO/1BX8LVLPhF46zXmPT5FKyLTv3sb3dnYDcuA2elz9BNCgIWfe2HKoCkLNauosZAMtpKWgvNSuQ9aPNxIdcQb8AAKCIewIjkDuqOI7uaeLV771mflfFBoUuNIu8OI8m/36oL5vyOD4VKWokqVQmQB5hvVO/BmG8V83AOySHlVLTK8VQ+Pocyls8nssesLB5sXDOZyrnQeDSv2dDpHWgCv7RUqNlqMm2UbcZRn7/Yx7g= 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)(366004)(376002)(136003)(346002)(39830400003)(396003)(230922051799003)(186009)(64100799003)(451199024)(1800799012)(83380400001)(38100700002)(41300700001)(26005)(66556008)(66476007)(6916009)(66946007)(44832011)(5660300002)(8936002)(8676002)(4326008)(316002)(6512007)(6506007)(107886003)(1076003)(2616005)(6486002)(6666004)(52116002)(478600001)(2906002)(86362001)(36756003)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: o/8LN9uje6lE1l9aX9vVuhlEtxaG/D22R16Omm8v4oR3gq3MjT4Q5Eb0gJ1h6xDQjy0hcD1EBgypmi1ZH7noQUtKCegFGO1GN8CUnnylw+pQjL19x3TQGqFFap97Mw+NvDDqYAILA0iXCt0cO3J+FVAdi2q/Y1umZ5LXKPah9PRVJt/lgkTl/J+ePh2oh8jCWy5+3uwooHDUXMSgV5ugUFydsN/OZpOT3FipucEh0smrBXj75qLSl+6SbiK0AcFoCQCxLGQNe+c8QXVB5/kjVIE1OKvu4MtDcktKWb6YQx1qKzdocPhkcL/62FWW5FeJx3+SIGwzEn9yZhqW7vpmGNLP7U0QFTtSRSpVJ0c0KlC0Che+P5Fo2wjJX6SEnEmuCdX5oisCjh1FXirpWFdXYBrx8gSfHxlkGneL+Ml6XRd7eiPvx9iOchizw1XpbC2Q9iVvDG6l25pHV4UJNfEc+cQIiXIlKyKRjLfv+65xbbm4+5A9Pai8ecK4TADZSSk7yp8RQgK/RJs7LwW4amMwdA4JQjwpsKOz12D0cQknwv715IzCo3iNRKq/gGjLDoRI4M9QS5Mj3AkYqe3SXscXiiJ084G7TI2Hy5C92rS29t7dK4L2D8QPh5+XHHmoLG6zX8G378WHmtEUhrv7nVinSTDLSchanZoiaHD1nvFqiXu3Bn5nbkLT6Fwyr/2sez/0u9zGdPeJg1D2xljg8v2c2/n/toTY1XMbwhGYjz1ATCXvLZteGQHk4hwFzDeMfUp+ddjWGuQeNG23KzZ8qc/72ctvzbCMPiU8AiheimuBer3lmR6CZ4WGkCUVGx1rXddH+TEacG0DOPxZKQ203LBRXy7ezlPImdluPub+MplxXkmvfec8PWc+UoiBvwEAIi7GHxs0X0GvKIJYcZLd/3gO1Wj2II285nixoHj29k5/kBg0RmK9FGjM65Dmmc+ltyfYNP0/dVquCX0L+xqX91S97VK6JsiA1wb5DxxuHIMlkJW/AVk7Rm8jVRuPSlChdV6DECJJ9dxPjmf2PSmogcXFCijLjzuCLkCx1BH+81z2WyJz+mlWiChJ1EqV0T+Dl3Bu8a9qKq9AGUZxDpB1hMT7WbrkIOsrBW2NnsrtVY/xNw44Yb4urTYAMq7pj9lXm+ylsJV9zjOU7tU77VVw04WKmEXUlpj5c97Tz5hFEt6E2+iXasuFjW3wwVbe5Gq2GHCy/xnhZ44CvT0iw9Af2ouG+UGCz7xcNmpE32H79JToBeJgM/igjaawWNpGrpxxiCxRsM7zlK061EYs8IDORNcjXtHd5myeXI4FsdSiuxkuZX0v5wDKih/JdyjQRbYYSMuG3VxetSevw2zt1SCYnpt2trtcqVQ/+GH8EDpRN33JYG7wHNDQB+XbcWs30tftbElFRehWShrtCRnf/HV6svU4YawvO4G/Dueb8+QEN0faW5MNOt/4+p/Bbd5+k5ENqsq1phnLtyYQ+7t8b1pRZm67DCSy6q+9V4KZh2Tj7gw4b0AXxc0XMz9S++D6exaWdH231pJ5nC41hIB/7wQwBt31HHdMCIPsDj46Jp6ZNbOnGrNKyG46K52ExgnzOrPM+LBbnG+QtZwli31hGAgyMMKYzg== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6f2ef7f3-701a-406e-68eb-08dbf46c64f4 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Dec 2023 01:57:39.3321 (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: I2c5coD+WraEy2VF3Vw6pQ5hn9+kTNsrdix5X6Fgs749SuM9mBgcVjr4AK18rcvWrF7GWzxZWx2FB2S2A4GrQto6H2UHkKoKkt91GFQq6uI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR13MB5876 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 Modify the process private data from 'struct nfp_cpp *' into 'struct nfp_pf_dev *'. Signed-off-by: Chaoyong He --- drivers/net/nfp/flower/nfp_flower.c | 2 +- drivers/net/nfp/nfp_ethdev.c | 27 +++++++++++++++++---------- drivers/net/nfp/nfp_net_common.c | 8 +++++--- 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c index 6b523d98b0..f172c8350d 100644 --- a/drivers/net/nfp/flower/nfp_flower.c +++ b/drivers/net/nfp/flower/nfp_flower.c @@ -872,7 +872,7 @@ nfp_secondary_init_app_fw_flower(struct nfp_pf_dev *pf_dev) return -ENODEV; } - eth_dev->process_private = pf_dev->cpp; + eth_dev->process_private = pf_dev; eth_dev->dev_ops = &nfp_flower_pf_vnic_ops; eth_dev->rx_pkt_burst = nfp_net_recv_pkts; eth_dev->tx_pkt_burst = nfp_flower_pf_xmit_pkts; diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index f02caf8056..9e40bce4dd 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -48,6 +48,7 @@ nfp_net_start(struct rte_eth_dev *dev) uint16_t i; struct nfp_hw *hw; uint32_t new_ctrl; + struct nfp_cpp *cpp; uint32_t update = 0; uint32_t cap_extend; uint32_t intr_vector; @@ -166,10 +167,12 @@ nfp_net_start(struct rte_eth_dev *dev) } if (rte_eal_process_type() == RTE_PROC_PRIMARY) - /* Configure the physical port up */ - nfp_eth_set_configured(net_hw->cpp, net_hw->nfp_idx, 1); + cpp = net_hw->cpp; else - nfp_eth_set_configured(dev->process_private, net_hw->nfp_idx, 1); + cpp = ((struct nfp_pf_dev *)(dev->process_private))->cpp; + + /* Configure the physical port up */ + nfp_eth_set_configured(cpp, net_hw->nfp_idx, 1); for (i = 0; i < dev->data->nb_rx_queues; i++) dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED; @@ -201,30 +204,34 @@ nfp_net_start(struct rte_eth_dev *dev) static int nfp_net_set_link_up(struct rte_eth_dev *dev) { + struct nfp_cpp *cpp; struct nfp_net_hw *hw; hw = dev->data->dev_private; if (rte_eal_process_type() == RTE_PROC_PRIMARY) - /* Configure the physical port down */ - return nfp_eth_set_configured(hw->cpp, hw->nfp_idx, 1); + cpp = hw->cpp; else - return nfp_eth_set_configured(dev->process_private, hw->nfp_idx, 1); + cpp = ((struct nfp_pf_dev *)(dev->process_private))->cpp; + + return nfp_eth_set_configured(cpp, hw->nfp_idx, 1); } /* Set the link down. */ static int nfp_net_set_link_down(struct rte_eth_dev *dev) { + struct nfp_cpp *cpp; struct nfp_net_hw *hw; hw = dev->data->dev_private; if (rte_eal_process_type() == RTE_PROC_PRIMARY) - /* Configure the physical port down */ - return nfp_eth_set_configured(hw->cpp, hw->nfp_idx, 0); + cpp = hw->cpp; else - return nfp_eth_set_configured(dev->process_private, hw->nfp_idx, 0); + cpp = ((struct nfp_pf_dev *)(dev->process_private))->cpp; + + return nfp_eth_set_configured(cpp, hw->nfp_idx, 0); } static uint8_t @@ -1361,7 +1368,7 @@ nfp_secondary_init_app_fw_nic(struct nfp_pf_dev *pf_dev) break; } - eth_dev->process_private = pf_dev->cpp; + eth_dev->process_private = pf_dev; hw = eth_dev->data->dev_private; nfp_net_ethdev_ops_mount(hw, eth_dev); diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c index e969b840d6..eb480667c4 100644 --- a/drivers/net/nfp/nfp_net_common.c +++ b/drivers/net/nfp/nfp_net_common.c @@ -2115,6 +2115,7 @@ nfp_net_is_valid_nfd_version(struct nfp_net_fw_ver version) int nfp_net_stop(struct rte_eth_dev *dev) { + struct nfp_cpp *cpp; struct nfp_net_hw *hw; hw = nfp_net_get_hw(dev); @@ -2126,10 +2127,11 @@ nfp_net_stop(struct rte_eth_dev *dev) nfp_net_stop_rx_queue(dev); if (rte_eal_process_type() == RTE_PROC_PRIMARY) - /* Configure the physical port down */ - nfp_eth_set_configured(hw->cpp, hw->nfp_idx, 0); + cpp = hw->cpp; else - nfp_eth_set_configured(dev->process_private, hw->nfp_idx, 0); + cpp = ((struct nfp_pf_dev *)(dev->process_private))->cpp; + + nfp_eth_set_configured(cpp, hw->nfp_idx, 0); return 0; }