From patchwork Tue Oct 24 02:28:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 133220 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 99713431EB; Tue, 24 Oct 2023 04:31:58 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 20D6A42DD3; Tue, 24 Oct 2023 04:30:12 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2119.outbound.protection.outlook.com [40.107.93.119]) by mails.dpdk.org (Postfix) with ESMTP id E9D2042DC4 for ; Tue, 24 Oct 2023 04:30:06 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZrOGEUsaHDsD/aKdZqbhHXrFMaZp/nLYcgCnduoLwNTu2ApkaaoA7qJeZGzLQettp5mrozI6Onwg0YvOkYqFOBFOKR3QTJss3f9vZTf7VL2M4FVVSnsx2b5UoPdzH7/gAE/UgrS+ybfx8HKPvNrm5R49nlC/6jYp+H0BMaiU6ASbdMKyCcASZ0W2+8zdFu3mFfjbGE/fQVIJgDPnNrS+AqZPTMOiXSHvAjIopl/d5xTI943UMierzOr0y9yJgpWgUuqmQq2GrVNT5JQoZpAvJHJEcWeaUPwaxju/a+CVYhtVIqkh36yZvPczlxH2Uds39oefeJ+U4va1k/JSiJHocQ== 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=Jf6WkB28nEc3ZDOSgy9na63SQJpyX/2YLGsTF2qguLwORHP0I/+bc/PIopkcA/WJDBBkjbmiH4BEHrBYVfSNuP7Zj1MysORs7JgWazC8J+I8rYvyrwnpJS3UrsNGdlMiWuguxBfQEMFyIUFRrv0b72o1erqnmiHVwqDk3XlpuxWJcMQwUsP0AsFLLf14JrHSLl4SdjzcD4lohHkSug1u6YWkuyVMCiBGo0SwHZVwa2spyZ3lVhyXA91UcD4U3rfwjbXoG7MLFISRLnyrD7FUuznr5nmxZyUYMeF9MyuYQcAn8n1S3hh9zoQMBiao1Sipzhbdp01tB6zNyJH/nTr48Q== 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=aiQLmMxed+mhBKQMp3CUs1ZNdk/UrTWoUgm8VfUoXh3kN+1Ts1IdwLQ71NbbALsC+imOdrMttxqLAhaXYsm6L3gbxgjAvuHDD2dDVjJiAvbQ02mSmO5GyNEEFxAVg++uNbx/QaVpPSjJoVSKAYxjisaWdWvLAQUKFW/sg91HfTw= 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:30:05 +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:30:05 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Long Wu , Peng Zhang Subject: [PATCH v2 15/25] drivers: move queue logic to common module Date: Tue, 24 Oct 2023 10:28:39 +0800 Message-Id: <20231024022849.3092506-16-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: 3c0a9860-cfec-46e6-f3dc-08dbd43921db X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9a5dRVOR70lQHrLhtfxdDa0PakKgBg+JkfIITTz84PRmRtM4fEYVCdVSg6u4RgADMAhWnneUTid7WuabJqTwLWxzJ0zbchG/6eWrsatGsK21y0DEOd593jx1OaSunfdUigIQJJGwXK6plX4Z+NmVfIotPbvji+0dTKeZaZuQFOQlaxYHIgeu+FuJofo3msJ5MtIlc3ZQ1pGJqznk/PciJx90bcM243bMFEInbbBed59rF2SQxZmNmT9hNxggG7wUqYFomAzT9U3nlMgSjYaxv0mEt81ux//yxJ3ncbFn43APdWs5oAW+2WvV0sEQgedWROiq6MhyxYHWgMmkL6Wm2ahhKcHxeEZAfnNx9JC9WAoIXIQ5pZ/D7tZqll2Qm9M8K0h4X1yIx1gtpqOJTqWLC4twpR1tnhUtcjHtscqrRT6jAIV0Sjq080vu9j5kVaDRdxiujZbwCGTMDDVlhGfdjqQSiAGKLj7EtTkGYCp/fq5/dtg5spguK0FW3uHw/z2C5PUE9fm/bYgKYa0QipFS+GvZJkvY4IG3eb+kPhxNIjuf4kb88o22nTLgexmFkBkxXGwoOUiCRoywJTFvEdMfrXMJfmiQzNNQQmNUvV/cYsxtwAHf+g+aGmoWathczGU1MQkSMeMYbcVbVzTHkPXpVenjfuMriQ95BEr3EoIkZbY= 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: 7tPWwAFHWdsfJ7MOubEVkH223yiJU1FTXW866NGzwGP4t2SGWp/M2vmVnpKug7g5/CkzRvizsbz+ycZBqvhHzcpQRFR9nGtjWdu6G/Vb86Sn8LRgkvUaI9BRe6g4T9rKYH4qpaeCiozQQUjfB2GAus5co1aoi5AtWkDtfs+zt+zW1riMzHG/PWMLV4IlXI8w+71BlWZyXfK/b2tSDONA5UaMIyh4Y8PnwgzBwz2/KtnPVnH9si6FIdhrhjG9TX/h0fO3Bf472r55XjHfQUacyJeiphFgmRlrYVuzgyN03wBM8d9uZpm/NIGwV0yuCg/reB/SezoPXtLpcPgDczycjfO9C48YeUf90QZtBDQioBZBTgBhghkLuTaDRfmdeVVQsg4zMUrM/zTXdIgU5mQPb0ya4YnzHyImr8Jipqm38HXSfRV/3z1NziSjFoofVbYONB4YpgY26GcfdkYysdl9CNmpjjmjDFCUWnwtU24YxdVl0Ezv8HkYhtz2KVbopGnfqocECDIBYza44LdsSy9mhrGeAgk/6GOyj+SkRmundhotF8MUZjEcE40Jat6ScRgIBLHLE+3rmcN3k97YhuN5LCw5gBunSipANeizgqvE3GmaVo0dAapQWzdZrqvwRlRmFk8D6BDyAdwsKnnuuapCmydSipHaaPMYOdZhXseSaoPTDtkEgCLevvlFUTweYmBFjDSV6UCyrsbPHyLjNDSSXvXeGvZWrASCIlL06KeyEcHsEeEmHKtbzHsOSBLJL2sZUTgP8SKyIukK8Re+rO6hl+N351b/ABzXkmiPqCUJzbU5ZYLfh11CQ4iOiToZSCf24eVaE9ZwmVq3WOZRg47D4bp+uTfpuwuO0Pcn+DJhwR017MNp6Xd5Wb9ahW7enIPod53rsCVq5srMl1RBM0gUhLzZ71H5u1UovskIvtfK1eZE7Tx/EgXcZPv5WGYmlKhlcIhd2KrJf0O0tn/mlc5bwClc3geDWINrW19wtFwIZRD+jcxCU6u5w4TlvqUb0/i2Q06igbVzfhdj6yTx/Tva3TZYNOPjOpKnTlsFYBwvEF8O+TEC6SwrHlNBFl22o3100l6l0925nQk0Sdf8ULRT5bzWyD4VKbEM+Ib+8+D8spNAqTxUYRUY2YKcJzI92u2ozU7cnvl0qf5ttUX7kgn2nGur08QjhqpzUlEvxUMg9xzltBGb3HfOyXZr3NiZ5c3Et96EEuUJp/OFtQr6iwMPSzpCy2IlZ0evXfiBDdZs7KDM7eeYpzmivt4patZQHn518Km7BmpcCOBqIus7Z0Ty7lApbkbAGdqEwE4h4KQ+wLtzTKX6BjN7FDUWZ4ptBBpkSOcsU/hlTEzKhEuKEUkv+G4VBfPkBLm+lsINAmhK9WVpZ2r29Lf2TJtqWY5Gie1Qywm4NPKRBhvIdacpwfE2w5CefNLBgDGuWQbWnOUYb5tPvrY7C07Ff97Na/bnAQRrOKWIeBO6ngrkCu603RoUoVUS5Q00NRb4JaT4MFc8zOvOjQZQsCRyXYoKM0hVp7wp+52Rhb9/5DOTwcOf0/SeacFLlKK8dpDlgx0JwWeJ9fkyqCFdahIG7ejGPgG3fZK4qmcHbpvAuwgsunGmLyQpVw== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3c0a9860-cfec-46e6-f3dc-08dbd43921db 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:30:05.2583 (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: aCF0ma4drfm9+WfrwAyo5GJHQjFtp3lJdgWP537Fy2g2J3rH3cOzHP5JETjCunnBoaQ2dbGL4IqdYLVyuTj6bLEhwRjugyurvbppx6kHCII= 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 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