From patchwork Thu Oct 26 06:43:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 133355 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 5CF2243204; Thu, 26 Oct 2023 08:46:24 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4FFC442E1F; Thu, 26 Oct 2023 08:44:21 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2104.outbound.protection.outlook.com [40.107.244.104]) by mails.dpdk.org (Postfix) with ESMTP id 15C9342E07 for ; Thu, 26 Oct 2023 08:44:14 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RO+iiMCjruUzl+3H6lwaWVPyS00VPX4VR5vqhv6QQ979twpNDDPm/7knMGpmvbjE6rx/fRbFQWwkcPRTPGl03zx8eaQYEoUXsDHcZt1/j1RXotee1K9JtAHY5gFGIshMLnDok5kvScG1eddT+/++sRAK9DqPQch2VKY6m5c5nIsU9vBjYN0BAEQ2uD/m/MIlZeSKOoDF8UblrbyKiJy9RCG1bSY/sm23+r5P6SsqwyFpAEeE4lBYtIdc1OpOHwy4L1tgCg45ksDQfBXVYrrJTi1Nmc6YGTjE7xMWWQTT2vngi9eIg2aR476WbAIpvtxRN6i99dINN++ioWuVmJ1YqQ== 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=SWOSzSFLH/s4LAo2K3wShbgH5mC7A5+tiX6L4+9OaqQbJF6tx1EsOjTeDjsAYvH9KhNoqp9dKUnqkYxkO0Xsxhc//SxgwdFY/RIT7GpLgVfmRa1v2GG5BQkk839qwBZEfYmKYnS863G1oqaDF8nFt/ofksl3eJplxTXzM6z0gt/FgHYdDVve8cXwD+09OVPCQmQkFJfvoJBXmuzXHYwqgk3ZEd/5tFgw4sHtBpZJD+6HMVnGqEhhv1p3N5TqGxq+/JzWckh/B1s5mVacNtBFUE8f8rDTvQSYAR/1U2+w1yRvwrRJcTIvhBeNeaK9ufaZXckKxbHaoH/4Lsh0MomXtA== 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=OxGkQTGIksbNCLtZLp36EL3nP5mRbq07krJg/QIZ59/Q/qDkY8nFetYamFxjzRDx4qkuUoO62S8nFSrc6fs2EkI3n+0Dnk5eesgyeVp7geUjLxwWHD4KSebeea0T6JHeqttavqVup1/OfbWtMfZqtzPuwUci1FmGNQCPyRPOhuY= 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 SJ0PR13MB5965.namprd13.prod.outlook.com (2603:10b6:a03:43d::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.33; Thu, 26 Oct 2023 06:44:12 +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; Thu, 26 Oct 2023 06:44:12 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Long Wu , Peng Zhang Subject: [PATCH v3 15/25] drivers: move queue logic to common module Date: Thu, 26 Oct 2023 14:43:14 +0800 Message-Id: <20231026064324.177531-16-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231026064324.177531-1-chaoyong.he@corigine.com> References: <20231024022849.3092506-1-chaoyong.he@corigine.com> <20231026064324.177531-1-chaoyong.he@corigine.com> X-ClientProxiedBy: BYAPR07CA0034.namprd07.prod.outlook.com (2603:10b6:a02:bc::47) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SJ0PR13MB5965:EE_ X-MS-Office365-Filtering-Correlation-Id: 8f5d4246-3054-47ed-7608-08dbd5eef6f0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BtVMtxncXIuE+AVigXsVctvldBXNlFJastQ1oaba1if2OS/rv0Q0zAieJ/0ftqTNu3OhtukrqkHpEGTInup7vEg7xonldogteORWKUnDz3CX9oomQ6QhSvOfgK7UUfdjceNDgWYd5TiAQwCyoOLeptEkqwmU4U7qpANIEBlajGEeCEJ5QqaEIC6ZEAladFlFqZZtcN/1HvEGO6m9sleqsuyabo2kuXhOWtdwLXxZh7qTVdUItInZ1ZUFVCBmSPYRnld8MgPR4u2Vcj7vWfHWdMZBmOsDnvsqIf5mYyn16+YlI5jR07njYT0SOrNP1abnMjSs8hxX4MLsRmp79eJVb/U+dVoDdCG6EACSe7OPXfbAEXHZX5UIin+fONu589Q+URuMMIrmgIytAwvh8Ebc9O5rHq2Sv6wAfxfu7i5jqmKP277yBLncFcwYkF6EtQO6lWrtsZ2JOH+ekvmzesYZrpkI3/u7Z7WfwS55ycnym6fcMS8jyw2BvQhB/70HjSm99oOZB/kyAn+yDyfGVBDQHK3t7um51IsQWpCSxMgfM4EllbAoW4WxJ8Gna3rO14PshZQ8PhCZGXipt9yCg8FOfG1y7VgnUhvT+gtEyf1YbZIodgC3TNrfW+n80AUL23HWvEaB+X6pHe91afu+RRw0acmVf47+EA3lNra7mOIxWxw= 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)(346002)(136003)(366004)(376002)(39840400004)(396003)(230922051799003)(64100799003)(186009)(1800799009)(451199024)(6512007)(478600001)(6506007)(52116002)(2616005)(8676002)(83380400001)(107886003)(41300700001)(26005)(1076003)(6486002)(5660300002)(44832011)(6916009)(316002)(66556008)(54906003)(66476007)(66946007)(2906002)(4326008)(8936002)(38350700005)(38100700002)(86362001)(36756003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /OObcqhJi0hHi/YmJTgNmq+J6h7Pn+I+TqN7Iy30aqOBNh5TVP3JrRlU1ccRMk/5vXJOyfbJNS1AgRAF7hVFG9V+7GmvedntUF1KSrcEXx6gNaeXpZV/obVBuG5jf/OnAZCeY2gClhbK+DtC5d6B99aea/lp3BilRTmROM84vVL+9VimH1gKBpYYcNKcCrRdvxtVzd7q00b7ksGDA7ai7JYgDzaa0LUkGOicJE6obCcCXXkMpI6JvTNaySqwkrsF+xl+erM7vLMdXrcKBYopnFebRPutu2xJCqLI72xr9lbR3h17l0FFWmSlmMihsObMdGGJcsVCGtZgR/X2VxiqkSb0HJ1RfAzEeO9vINf+LeYM6N7EjBl6F+S5QfyWHm/Zr6kOZacYngICUBMagY+i5BFO7so3TtZ7at03G8LzxsZ08P9UX/7JEVVwpLbM9sKzG1Zgi2gKrk19DGTdH3O793xOzukKkXhKVY97wAYuG2KVf453SbWFXkTc8DQLHXgeJaaYwkdGzM2sGC33UsUGa2wCyLKlSoDZKfVKhp9hdd+JvNFHnI4rEyXtXQg9TEDlwCPD/DeT48UZGmQ7XwZdR7uYdWzwVPvh7ixkxXeQoZwvnTMNNBUcQ9KEAr4RR21hpje8n5y+OYlwnuvlxZF4PfuUYTl/79zQPt2qvuel1lVNhO2RcagzhChKOfY7z87ZE6GAeu/X20ZvufofFDkr+tHTv4pwmlNhuV6VFCaJXOXdAjczeES6KutyL0LEVn0erz8kT7iflXLSoDdGGQoqsCTNZxwdwwsIUZXNxWmpfooIovxGVjjDBCxYqnugGQ8IggBSZvW86PQDGb63PgSEIJF+hGieRBT4yu/iWP/0+bVkz0HGOoKvia7/KP0FbxT6YQr8AoUXXY6Jw1gvUTOXLm55JbvxPO5VVebMzRP54mwKmeXYE4qDClR8W28GG7Mb3lEw/5P+DmG7DZO3rBYqKTVsuxMUg97K5cMdHGjBmGhX3VUiwfITcHowWbcw+xY6rhn4qVVMRziAik0nR5qZc8qywvAmlKg9gty0GTI2sUa4/RKV6uubwOl33yJ0JRpyqIPxbywtzew2I/aDUs0yoI3Qdty+8H3Cpmt/B8WbbpIajru54+3IjdOKgz9wMVQmRK7O9SLEScCncfdhMNNGS5rKX01IADgq1FfnPdwX2QeSD1d6IdfQWhEWR/ZlMzgJ8+vuw2OXdpW7HYCu6cDz3CrVpW6m04TYi8MTo2467yWkC92hrfzZHCmqmTCZEg3bfCC+06QYvfYv6T1LozQTmygvDg570FYT9l3hX2RAuSXyd/g6uz31b6dldVceVfO+2aVw9Ik9E96T2m/DOC5tHRQBs0aWA/0CsO4i1XAgJ6VqVCIlpNEavJoudaOWGzT52AvVMuo2xRnhZ4ZwyRdW6gt8h3R8rvWmNJomMcQ/wxlccdPncqRAUfR9v2JuEda8HbH1LIDzBqsi7My+YY14f6qL5ujz5PMRK4+goFYKNXWX0rzRqasSNFkr70ufG36srQzxKcGviFKI77F7vJjeYMguQJCr5gtzwjZoUJgRTmTUO3ozNFbCZOfsfpNK6JohRU9Fk1tCd/caia2dhz29oA== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8f5d4246-3054-47ed-7608-08dbd5eef6f0 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2023 06:44:12.7605 (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: TnEAi2IyEw0xiPjJ+xw7EBcAxQxMbt+lSX77cHxW9bB5mmz1VFqGrg7bSn0+ReVrnDvFbHKoSwboEO0St45CM7LAD3pt9hYN0XYqaGtldPw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR13MB5965 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