From patchwork Fri Oct 27 02:59:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 133458 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 CFDA44320F; Fri, 27 Oct 2023 05:02:57 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 48BB14281D; Fri, 27 Oct 2023 05:01:09 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2129.outbound.protection.outlook.com [40.107.220.129]) by mails.dpdk.org (Postfix) with ESMTP id EDDD442DA6 for ; Fri, 27 Oct 2023 05:00:54 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S71wl2z2uW09/Il+tpzAw4CyN/b6iflWceOLseRFtKz+pU16OCUdZpCRLmuUGYlxBOAueqUtpq7SsULeu45JvH8y85KM5XLsk7dma8fz4fGmT4rxMJ7NyI+9RrfBpye0ptJTD3PyYwLqDxNr1MdIFcFSgZEYN7vRHhRrhVuta70d+8QoVRMgcSyQR/3ESsY+jS1iZ5Af+TDwQs/iHEz+3inPHEarz+BOv4UUW/EPs+N5mczDm2t+4YX1QRzX6083fjZwFEV2pPhsOnnlL5SBDlZpwZl666gd8PaPR8gTaNoqhH8dSkHkPXAIU0qfQ1MyfpCkJwIQ7zvCPsfDvkmqJg== 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=65U0xgDsNa+Kyaab2mHdk5yulGkdGKmwRk7JZOvy5dk=; b=N6uCA58I2jnjS2VJ98ISYMT1e1nnUM0JRNI8cjJOmaFJETEQEQGtPZbfKubXzfyIpoxJ38gIOhBWyN3uZAqcDH9TR88Ypf4xNaOnr87jLI8PAV0JNFBJXeWaGuDVMhw9yIGSDi+Rm/GBTLuOKt/xxuoUdqvBGtuhvHAhSJfxQGFjhuddVnYaOW/ONzWQxp+bjcVyehOs8M/6gUgAUHfCSoKL2hzzfmSMneyYfhmWlH9K+quLxjuczoubbIJUi1eLt3m6xBuZu3LACGZg7l1Iy2fWXrTVN+ZAAbioPAsk0mqrCB1j+b/UPXJi9qBvIYCz8ivipSthwjMDK9+crL5BTA== 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=65U0xgDsNa+Kyaab2mHdk5yulGkdGKmwRk7JZOvy5dk=; b=JDbO0lfE+eyGrRvrzDCm2X7y8o05TdaORMVDrH9MQFchZpaCbref9s/yD/TmUjx1aw+SgrLRxx+X8SMXkwl3G5krUF0JKc0PE3t6W7ukF2VexqE8Z7kYAzSfXcoAEqZQTi3eaDdeP5qS37p/FO47QnF2VNvlWCFglZwEKFaUqvU= 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:53 +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:53 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Long Wu , Peng Zhang Subject: [PATCH v4 15/24] common/nfp: move queue logic Date: Fri, 27 Oct 2023 10:59:52 +0800 Message-Id: <20231027030001.602639-16-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> 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: 8c6f6f5d-9b72-4f86-e779-08dbd698eea5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8d0OWJCA6BMpOYz20jHht1EHGTVKpx29hVXOF4MstmF4ma9j8NsmJyXbFrxV+8cklcJUP/59eHL0gjs40Kv3Kw2Iwxf4YamqHfs7RMmUTLL0KOci1bM4bHcTlrAkDDCNjiCdymh6rS1YkMDGKWDJn+760micck9ooKLyAXF/h+ko8ldZswrvXe5f2BIHnWeUqgdbb90QxGZdIl8ns+jh0d4eujnDUjyEuAHDFM5XxWZJ/J2glRXKDZqxV4vLwfSjV6SD9F1nMIXyNE0Pwd9YHN8RV0KvhfdJIT99fYBWtEuxWVqeI49UEAfPWePzz+BVuN2aIsFaQBGOH1DfosdwPW4B7aSYF46bDPqnQ+oe2h1e74y/cDIGlCc5wuO9RLbg+p8ApoI4ruTuF5KzTcbagMgM3wQdZR5NYvG63X2DpEVEhNbQhPJdXVffHvKsxnsDKAKzoO0iaulzKHlkq3Uaqtbzj2kg0JSAOpKa/GBE0S5kJWGtWbyusWuji0pn7K5GLN836k2KC5eWQNkUE9dzjxTPA35vQvfrRtKENnLvrNIM7Y+8L6QXnDCD+14BP8fe7NkfFXL7cdZMr4tVMq0nmSGlKGLBhUgDmdjDh6Jrd4+DUrOCf0JfpwQJJqHFMaIGN5/3sG1R8D8ZE4rroDVJu8QR9ByPhQvDoquI2CZxesU= 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)(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: ln3aK9QU2ag7lKwHKJdKBy9CdNg+F80gyOfBTKIftYKeI6jemAFxnz86P1drMw7SB+EXJdIHOMeJYFgl+gYGcdkuR0RTnvwHSsGQRHZUdBbI0thN8B7N8P2DC8etrO/UhzsNg/2TKb5YdYFKhsgmME0eEe1vNG61b5PDTXAbBcEAXvsC6/KUI6Q5r2TtYkO/8XPV5pfacGXMBe+BnE35j/zlk4IcOXPy2anHD9k3p8MQvsszds/92Zd3/+QHE2rjHnu6oRhWAbibjs+poNZKe31Bvj3i8p5Hkef86IeazjeqgqylmlYR1muqQxWc5LVsEUPBuJ8CkQdpO+eyWvFqiLVoqe8giTI46Rwjl60u4aEaQgcrnfImnlBWaTtKOx96jsNh/z7KM06i1tbm9cj4zCZhfn2JWjbthm2lKAMcZK6KgJokl4j7mzxFZPm256mFJV3slNG8L/FUfcwAIZDLpn4K6p+VxOM4deX4ciA/4gVjc+aM1mElK0pc3/JsMOTN5AxkAA69sYB7tCr+tFg2dA5jq5aa2sIlYLNcbXDlKoDWT97cCyF9j88ol/GszENg1LUn7cYDHrirHpug94FPqGAv3u1C4zqpIVrrkqqdFeeIQIsSGdWuQE6X5K/cxdx1U6eoKdWVINwfSoF0M1fKCMQmW6RwytuIN1+KUx9oJJdiWF6w2JT2tcqKGJ8LXw4aZY/CJdixBxwc422El/aFzdg3rr601JXRBpQriqDIaX2pNilxI7l0lJYE4RY8VdIGe0LfSCDkg+KJ2jka5n7gYJHAlclnGLzpKhOzHodrpTbHmhDRZejOnAmHRHzh2jjhxwaZtKKa7QYFP3Wh3glydZH99aQeTzn84XKuTRkamwAF3rOVmdWTBpH+yyWsbpjjyV6HqxLoOEfOLNjy1Bs+lNdvypXIrwlorkOdikUtA4wb8BgKD4IuNOteflQGXjEiJW7bqJSITOu68ZE6ai/r1b3X3nkRarwcjgSW+NN6nwLslWDF5qX9xQmtxLQJ6XsX+qNjym/2fj/JadVx3iGFZGtxn4yfTkA3VVNck5UIZmGQ0pfWG96wPmu1okV7UfrW8vufzecf8Pxp5XwypJs+DvJvT4zvgTxfHwcYbHU+YzNkD4QbWCE3fR+WA6vR1Lc66lGGL7nKJPYOsShky8ok1c16wwzWqNlKopE2eiOsfoMK+RbHHwsLiqsF+cD0JJOQGiokIIfoO70KQcDqsbM9tL/2NCgxKPRRkjQzVF4UNCgXj05XJ9FkFUQ4721O9BaEqxGTTtl9MEuO3ytfzpSMqzUfCIvJy491sBVXl3D71Gyu8CfP8mdUekRdir5hd0VFuVDH6uNFk9KvoZ/IaRLsT5IYEuvZj1qQriiXMxYqjHpVcpVMJFSZaFllt9cE8crex/ZCLqm9CrA/oGUTM5KhU4e2x1MZtA6Y42KEjlCitepWnGaYA7M7jAxvpAUVb5S4j671n/4YH2poCmnBGqJLij1YOvUKeo2oslipJRVP7LwYg8MlQL+5MFUdk+i6CZTQijsllQk6tvFVoxL09+oFGXpyxpWKytm1+ArRIKyi4mn0UKJsGAmqyPqO+quuLN+PaCZF7gqr5XkDGrRrOHwBFA== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8c6f6f5d-9b72-4f86-e779-08dbd698eea5 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:53.2965 (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: UAslnqt16QL8/a4ex5iKA4rPhfCPLydvRZ0asI6LqG1uiqkimYZ1QU/Z8vj1ilrHWZCn4p1yomyA3Ja9c8hSgqE6W7EvYlrXezwlKXPKC2k= 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 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 1a98326980..4c94c9d59a 100644 --- a/drivers/common/nfp/nfp_common.c +++ b/drivers/common/nfp/nfp_common.c @@ -175,3 +175,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 5615cde6af..7597d4090b 100644 --- a/drivers/common/nfp/nfp_common.h +++ b/drivers/common/nfp/nfp_common.h @@ -229,4 +229,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 f6a54a97cd..c1e03d8b8d 100644 --- a/drivers/common/nfp/version.map +++ b/drivers/common/nfp/version.map @@ -8,6 +8,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 711532b466..090feb0e39 100644 --- a/drivers/net/nfp/nfp_net_common.c +++ b/drivers/net/nfp/nfp_net_common.c @@ -327,54 +327,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