From patchwork Tue Oct 17 05:45:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 132705 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 8766443186; Tue, 17 Oct 2023 07:48:14 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6B0F340A67; Tue, 17 Oct 2023 07:47:00 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2130.outbound.protection.outlook.com [40.107.244.130]) by mails.dpdk.org (Postfix) with ESMTP id CB39140689 for ; Tue, 17 Oct 2023 07:46:58 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iivNlVZMOad8HZfouXATgndqQBV2qHtZEzkuI+5ymWr1qjd0C2FBstRmUKM30NFNc+RDv/PREqW7tW3ePPAS2bBXu1dOPKSvYFVbWK2yEzxFqOn6u5n4aVA1djijYhEAqn7YQ7YV9Okl499wAvs1m/zlFRl/yKP/bTfnYphe4BV2bsocJAULr6xbRw/zMM51bTjBUbGXh6jzgX4QegSdxDgCFjOap3n7v6mAcWqn8k0y5ZTp8UdMt4oIepVizp5eZ9cOsH9QPGkDv5sTV+fIdoq6Fj5uwhuXRK6FdE5jgblFTESLOVCdsO7Erdje/HdmeccY05HMRROlfAvpI50DXQ== 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=bZBX5hnMdu6xs0IB/SslRs1IdaXXCye4FqHti6VYQ0Y=; b=P1dEtFo1Sx0IQfEj/SjGtrS04GoUDNMRcDWyUb+swP9UTPOORkJ2DwB1yakf1G2NOHVQ8YQq8gKr82SUYMqW+Aqjbp+E2K83Ks6HBoNLOMU1iyVpUX1VHYaMZzOWzj90w9skTZChmrob9tr2TDPIOtI4m6SxJ+bge1Kelf6Eg1ako3s7lc+m0looLwGb2IPPrVoWIBNx3w0MSXO+XqeyCP/WOboWtTSEj+4sk6MoR201zGKNzOU8kStwhSVQPOTuuIqj96nYFvlbTTiCB3vvQBRJG7Cyn+FyM15z+ZKBQ3RNlR2Mzh0X6ly7cogxlc+mr1Z11ECirK24R6rcVGpsdg== 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=bZBX5hnMdu6xs0IB/SslRs1IdaXXCye4FqHti6VYQ0Y=; b=K7uNdM4N2rx+/aycEKHTsLxSMY75wIu8gsKNrRO6gyruqLYvJkWHRpIpglLwUo4l4vJLofiV6yeFwMDDEFfLDQsoNXdIvR5DV0ImtkmSS1iQUWaygzI3APbSjxaGgi8Cs0H9u631e8YKKHnzcylUSNoRaVbQfSxLsKuduy/q3V4= 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:57 +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:57 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Long Wu , Peng Zhang Subject: [PATCH 15/25] drivers: move queue logic to common module Date: Tue, 17 Oct 2023 13:45:35 +0800 Message-Id: <20231017054545.1692509-16-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: 4499558a-d2e7-4309-9744-08dbced47823 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yJpN614iKafiD2dJIXwIKdzf9yiU0/n211QUMv0K/7xMC+Cbe9sN3WnB4OToXpKCXkSTisUJxG4T4Yu+7mpyaz0EV4Qck3KiAT5mB0TGRleBVlcC/WrUjUp2+cVK9lUED/ldX0VdkZUdb5J4JQ+0tY/PSokIkFVxQ314Y6YhDj6M0IiJnDVnyY6Li2KH+x14ef7d4baSqokywVA3e7DenPNDSYB9KKqJkZ5pR5hw6r0lgSGQKm3qmo3+FRGP72cUJ7lQWtd6K1KALX3RGZugqv+UGj4jzkwcRFHLUGlrIKgHR/9p94gesNXRW8A2rRk8ENw8azGvSZIRCbCDfN3RuRphagLcAo/SQrlvHHL8YkhOiBDAi4YnXuOv5wG/8ulCHHa/rjh+A01pDch8btUJBp1erd1XPQKML3cyyG7nuPIolZmir3FTypaLDPAevWShoKVmbkg31YegiG3AfXKjR1nhPS2b7p88iOP/C1sJgujenhB67UNg/6pbAYTb2kp0bShN2fhF9Qz8z05jwmKhHTGOlUsbz818Ub7wvuvx68kPfs03pd9I1SSXeVF/BDA38GN53NMrsstN3gPPNR5dr/NEe4GAcFlIVN24C3hdFhHYeWDCqeAtDXIRZyTmLbNzzAVkwfSCYrU1ev7JmV/PVGwyctoLetZejjLF9bH9v4g= 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)(6666004)(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: rPYBlOtdMxYadOLWcJ2bwIQere1VUcwR5ZsW7x+BfBGQlA6VhCxLZd/5wYNw2M3ZZsihhOnw/k373OBdzSfNOQ7Yt/MSUIan59B8w8GVsfT0wSKVZgsvC6kMAssuV3GUzIYumywqHts2N075z2t9tyI2E3qiryauzaVFK+AUkuM4ljKUIP5ehnbY/onFmQ+ftglRh/C9D0jcgZe2te3AvObnjLUGXCiU0ONmUCW1nXKTDdlXQqd16GypOuhD9PV0BI1q6PN6xqcidtlcZFAZBhzgc3B45kskywreNI6GiirpDDeGjBsNGb6Kp7u87cBK1sOVSqQwbq9sf/z0c/hzMXPtb/IguWePevqlrfvoVUBeidTpyCmhVTXYptUOxX/9IMb1OF4DIU1isNxSpXmZAXKlJ/CRrIFlc5DS8skMnRDDEuXCNzax/+L21/nJidzHWGhgLZBDW8pMmT9pB/d54fAUay37CSpPXUPkAwQItPuxi8tcWefhSZlFdT/z7gYg8QxCo+PeQqdv/A2fkiUSH/YPOxb4FWjD5o8gTS4IjgwuqBMDNfbIAxvC9vf3+aCJodEVJwE3VedrqgL2fKUbMLlygVxzAdR9fNesfzuXF5xTe1MBFalJMI86TmwMZELTyUARY1erRSoNaQyTvR7zaL/XWRHb59P+2IwQHpcupCRPFdGSQ1e+JrGPjadPOZMqKFOy7oOMBg6jkZwm3ryeiGkJz7eZLx1VMqM28fA2R7xpWYhbKyrCs9fLKCZCCCdt99Zz32K9tXRzpGmJ2WeNvf2SWXgRadENBT195Jo7291SNIsne/ixcaQOu3nLzX2tzwIuV9yDj6cIMQZY+H/pMPatUMEVZSiBNclW5rd9vdjum+NXlTKkxhxBqPOimDHHIriIXYcgMIfi3M2dajc+gLvudGGEMDW2ENQkMajFEGpdjcb6eRvO+TKmMg4sFkiO+7j8KFdCbc9ksSFpZldPD/1RDMnHN0iwyETUkaH1MvqhDbeUji9URRHpHLlrSrB9BeyVyyppHum45eujN+buIs5t9bWNzEHiRXpzHFOZEICr7D+VBAPEmTRmMw/cXRojmMXEdTpVBst7X7yaqCkQ6lNn7175YYG78viXyMG159fifXbBHcEAOwP2vJAFVu15oa48QSvRlfk5dejJh8lt8j4lyzlJespkWkSq6i816dNfpM7ee/IdpMY73ZPocbqoB/v4f1b9DYtNrkuZDsW4DbZviQsYbuv8Nsc9LK7D/SGpwGS+ruTvCHDBICRfl+g9SoVbU9mPBYl6fJkQs/5TdccxHGyp/8/cASbRXyRbOyA3dhSgh6SmNQ6qxBmwSlEWwPYRU0Re6OePIalUxQLyoUXZ1I8VzyxGNVmfvXvRyA1LAYkEvKMNjr4z20pLeWJTf9Zh3mSPzjnTia9Vngvh3dCkWZcAJKcfAkKT+ymHYL1Czu1j9O+Rh1cPge0zMaE0XSi95Pj98fNPPWqlNIxUqUYVPuUzZe1NlGQwVzH9FFKJRCv3yZZO/WfLqAcAg8kfjKMIdQC7lzlv74DmrMQKYHn5otU202r0anmfMX/eQChJGBm5eYDyZmDHOuqrodKRDVep9fQqIj2Pw5yshorY0A== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4499558a-d2e7-4309-9744-08dbced47823 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:57.2553 (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: NsO/+8MssNtDDoHMDMa6Ljgv9nmQgWxVIROYalCqPrzQARU7zQv3iD3lgPNy6qTwGp7IzeBBoiUD8H9pV8tMtlraaoJ88mIkaqc07gqdJFg= 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 Move the queue enable/disable logic to the common library. Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/common/nfp/nfp_common.c | 49 ++++++++++++++++++++++++++++++++ drivers/common/nfp/nfp_common.h | 7 +++++ drivers/common/nfp/version.map | 2 ++ drivers/net/nfp/nfp_net_common.c | 38 ++----------------------- 4 files changed, 61 insertions(+), 35 deletions(-) diff --git a/drivers/common/nfp/nfp_common.c b/drivers/common/nfp/nfp_common.c index 00dad4736e..055bb5adb8 100644 --- a/drivers/common/nfp/nfp_common.c +++ b/drivers/common/nfp/nfp_common.c @@ -131,3 +131,52 @@ nfp_write_mac(struct nfp_hw *hw, nn_writew(rte_cpu_to_be_16(mac1), hw->ctrl_bar + NFP_NET_CFG_MACADDR + 6); } + +void +nfp_enable_queues(struct nfp_hw *hw, + uint16_t nb_rx_queues, + uint16_t nb_tx_queues) +{ + int i; + uint64_t enabled_queues; + + /* Enabling the required TX queues in the device */ + enabled_queues = 0; + for (i = 0; i < nb_tx_queues; i++) + enabled_queues |= (1 << i); + + nn_cfg_writeq(hw, NFP_NET_CFG_TXRS_ENABLE, enabled_queues); + + /* Enabling the required RX queues in the device */ + enabled_queues = 0; + for (i = 0; i < nb_rx_queues; i++) + enabled_queues |= (1 << i); + + nn_cfg_writeq(hw, NFP_NET_CFG_RXRS_ENABLE, enabled_queues); +} + +void +nfp_disable_queues(struct nfp_hw *hw) +{ + int ret; + uint32_t update; + uint32_t new_ctrl; + + nn_cfg_writeq(hw, NFP_NET_CFG_TXRS_ENABLE, 0); + nn_cfg_writeq(hw, NFP_NET_CFG_RXRS_ENABLE, 0); + + new_ctrl = hw->ctrl & ~NFP_NET_CFG_CTRL_ENABLE; + update = NFP_NET_CFG_UPDATE_GEN | + NFP_NET_CFG_UPDATE_RING | + NFP_NET_CFG_UPDATE_MSIX; + + if ((hw->cap & NFP_NET_CFG_CTRL_RINGCFG) != 0) + new_ctrl &= ~NFP_NET_CFG_CTRL_RINGCFG; + + /* If an error when reconfig we avoid to change hw state */ + ret = nfp_reconfig(hw, new_ctrl, update); + if (ret < 0) + return; + + hw->ctrl = new_ctrl; +} diff --git a/drivers/common/nfp/nfp_common.h b/drivers/common/nfp/nfp_common.h index c3645b6ec5..71418d3500 100644 --- a/drivers/common/nfp/nfp_common.h +++ b/drivers/common/nfp/nfp_common.h @@ -224,4 +224,11 @@ void nfp_read_mac(struct nfp_hw *hw); __rte_internal void nfp_write_mac(struct nfp_hw *hw, uint8_t *mac); +__rte_internal +void nfp_enable_queues(struct nfp_hw *hw, uint16_t nb_rx_queues, + uint16_t nb_tx_queues); + +__rte_internal +void nfp_disable_queues(struct nfp_hw *hw); + #endif/* __NFP_COMMON_H__ */ diff --git a/drivers/common/nfp/version.map b/drivers/common/nfp/version.map index 56db63f29c..55ef81701f 100644 --- a/drivers/common/nfp/version.map +++ b/drivers/common/nfp/version.map @@ -7,6 +7,8 @@ INTERNAL { nfp_reconfig_real; nfp_read_mac; nfp_write_mac; + nfp_enable_queues; + nfp_disable_queues; local: *; }; diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c index 6d525648eb..b5a4dc72cb 100644 --- a/drivers/net/nfp/nfp_net_common.c +++ b/drivers/net/nfp/nfp_net_common.c @@ -377,54 +377,22 @@ nfp_net_enable_rxvlan_cap(struct nfp_net_hw *hw, void nfp_net_enable_queues(struct rte_eth_dev *dev) { - uint16_t i; struct nfp_net_hw *hw; - uint64_t enabled_queues; hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); - /* Enabling the required TX queues in the device */ - enabled_queues = 0; - for (i = 0; i < dev->data->nb_tx_queues; i++) - enabled_queues |= (1 << i); - - nn_cfg_writeq(&hw->super, NFP_NET_CFG_TXRS_ENABLE, enabled_queues); - - /* Enabling the required RX queues in the device */ - enabled_queues = 0; - for (i = 0; i < dev->data->nb_rx_queues; i++) - enabled_queues |= (1 << i); - - nn_cfg_writeq(&hw->super, NFP_NET_CFG_RXRS_ENABLE, enabled_queues); + nfp_enable_queues(&hw->super, dev->data->nb_rx_queues, + dev->data->nb_tx_queues); } void nfp_net_disable_queues(struct rte_eth_dev *dev) { - uint32_t update; - uint32_t new_ctrl; - struct nfp_hw *hw; struct nfp_net_hw *net_hw; net_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); - hw = &net_hw->super; - - nn_cfg_writeq(hw, NFP_NET_CFG_TXRS_ENABLE, 0); - nn_cfg_writeq(hw, NFP_NET_CFG_RXRS_ENABLE, 0); - - new_ctrl = hw->ctrl & ~NFP_NET_CFG_CTRL_ENABLE; - update = NFP_NET_CFG_UPDATE_GEN | - NFP_NET_CFG_UPDATE_RING | - NFP_NET_CFG_UPDATE_MSIX; - - if ((hw->cap & NFP_NET_CFG_CTRL_RINGCFG) != 0) - new_ctrl &= ~NFP_NET_CFG_CTRL_RINGCFG; - /* If an error when reconfig we avoid to change hw state */ - if (nfp_reconfig(hw, new_ctrl, update) != 0) - return; - - hw->ctrl = new_ctrl; + nfp_disable_queues(&net_hw->super); } void