From patchwork Mon Nov 28 06:53:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 120181 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 531DFA0093; Mon, 28 Nov 2022 07:54:25 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F0D7A4067C; Mon, 28 Nov 2022 07:54:24 +0100 (CET) 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 733D740156 for ; Mon, 28 Nov 2022 07:54:23 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cYtB3QLUJgYIfPULtJRvHZ6pLTFfHkYaCze9cvsGoijwmhikD5lClyYnciLxFVzhMesk9i1XU/viIE1NkpM5QbX04byaCOU7D8JxZAVrZE/JtOgYFeNeh/lLznsBNQJfD2aTzfuQJgpMWOOzX4Me0SK/xS4UUFZvOZ82XeC6wnp4K84B0JShqg7pxXkG63o9xvtFOHd6tStNJ7D+LCvMqslYQWj1D5gdi5/uZKpgSiVWpvsSJE/sTi9LwgBHMGhvt6jySoDKB1t/Fczfu8ges+/IWubewboAW9aL5TFAQfR0ouERLKQYF+ptBu1v2WTJbMRbSl6OLq9bMC6I1gv13Q== 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=A3RHx+Vp5uZgGjG2WZuhzeQm03AtHpLB3S+vW3TtuU4=; b=G9/J3K9o27wsTOdtE5ls6Bzzsu/HH7TKIB3wIzawM4jN056aWUjyOSKcEpOcVHuc7hTNU2xM5T6WgEMOns4svD/8TqAuJv2+SMju8gYgDN0xGPSWt4vNIzyCcsSNYZrCEK87rwNq5ePCPJ++5CoVgQ7uiAydCdGJeMPaUQSH+9QXtEJwBQr3GrVp2GMFVekhLtwBHAApl9tm6UPp+5sG9TVNK7tZ1aJWJL/+tSogtGKqoY8qNEAE4nA6INm5jAeLB429NHbtWXrXQn2BUZASbBxZSXz1Q9+XyhEQk9DTFVgcrP8P+fpt3ZFaT8kpeEyxABLNjaDJ+ccUKBzhzzPQlg== 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=A3RHx+Vp5uZgGjG2WZuhzeQm03AtHpLB3S+vW3TtuU4=; b=SRPZb540+nX9CJI5I80hH+H2zO+uBBxkvjKPDT7fMTUveVoKNFPRwvoUxTavXeJt446xQWL+SxszDi58uPVVizvds6rf7rmcgHi8p+gmn9o6gBRYqAGJOp+dFhfG7tGhF/6pBx22v5yMlgI/HbJ3qQd2RN0CrDTVmKTuAbf6yzs= 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 CO1PR13MB4952.namprd13.prod.outlook.com (2603:10b6:303:d9::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5857.23; Mon, 28 Nov 2022 06:54:21 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::5122:8c31:51f3:4ee7]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::5122:8c31:51f3:4ee7%4]) with mapi id 15.20.5857.021; Mon, 28 Nov 2022 06:54:21 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Peng Zhang , Chaoyong He Subject: [PATCH 1/8] net/nfp: break out function to report device information Date: Mon, 28 Nov 2022 14:53:52 +0800 Message-Id: <20221128065359.12737-2-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.29.3 In-Reply-To: <20221128065359.12737-1-chaoyong.he@corigine.com> References: <20221128065359.12737-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SG3P274CA0019.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:be::31) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|CO1PR13MB4952:EE_ X-MS-Office365-Filtering-Correlation-Id: 697728c3-2194-4a48-1dc1-08dad10d6062 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hhlFuy0cCjylml3uqu9e9k6kPvjvaGhingRP7yG/VbOlNXbAC7iBzioIy3wD81O1VnwZ1NFvwWpOFW4+8eVw0cgF5X0qSnvC1iYc1i790uSB85RyOEOCAWU8qVM/+TVgK8E8BJVAbCubm/URo5mwqF3tpcNnRu0OTfRW9xY6gjIQ6YmPPjyGURQg6AdG5wXB++sB/pt5/xSjkUwbRHHC3xgo6C+j4NdaRaDkgDZ2sEwXkK4f/95XDICY7+q+KAjmepy2mkWbPeFa0SseFnuSXXf0JmDIFqlHI9KXItgWsOm7nkwgKgAk5uf33ovdMHDjVsTnyOLPP6hawJKmsEiuTQ9mrX9Ejt3m3I1unOCuCB7f9FKNU7QD+obFwpgUPndIkOC1NHqz3zzznEvlitYqlqijuMi26mqxD2zmFssjtDOlg94Y3Lkmn4yHgnGZsujBOhGpyIINHL9e+dxg8kgf/Dw7jZHfpv+vfHN4fTZa7NqZ7/1l2iLbCtqr4bFa/k0uWqFuJvWvLuNtZkZW/4r07Fe6zWyJgNq63cj4KZUDYpUsj/z8yT5savMwAWb2YmOIxfv+JTU/yLOrlATIbkl1xwvYc5NpIgt1I2KFbIpCqwb8I6lGnxjA35QNtQPzyXNYx4tVGPAa2I2TzEIst41DxvHfsR9mowJLYhB9s3324G2e02F0dOM1GopoHAwa/P+hXdHk3jTBOeLDpbG7t/NB28PF3uwtKBl96hG0zb4oBzRrxXunCzYRDe3s9qDvKNvJ 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:(13230022)(4636009)(39830400003)(366004)(346002)(396003)(136003)(376002)(451199015)(38350700002)(6486002)(38100700002)(66556008)(66476007)(66946007)(4326008)(41300700001)(107886003)(6666004)(478600001)(36756003)(8676002)(2906002)(54906003)(316002)(6916009)(8936002)(5660300002)(86362001)(44832011)(2616005)(83380400001)(66574015)(1076003)(186003)(26005)(6512007)(52116002)(6506007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?KNhifUqcCj9DLzZzlzlFjOXz441G?= =?utf-8?q?LyC5fT1a75iMZdpXf6Me4td6IdzLEA7hcRmO04Cd8XnKi46zM6EmF7LAUkoOPZwO5?= =?utf-8?q?62zhsQKXYHEkM9wc8MWmgWzH5QAmMa7evzKaAIQB7FEfwskvF/tcgvQo4dUXUxUDt?= =?utf-8?q?6EyZIWsFSeYL6YV+LEvOBU71vq4mQ6ed/Yek93BoASt3U0FqKMWnfiJwDMTeIiDYr?= =?utf-8?q?fSH32zOzszYjHUd2JWzzHbZH8Z6W2TzOA6dZ+ebpS1BEbqyZrOk1VW0bUNPsac0Zw?= =?utf-8?q?070PjGYErG3gItxhFGtq8oUtdDM1p68g40eg3purRxz7va7EGg2FLmZ2gW7l0BR3i?= =?utf-8?q?+AF5qUtxB6qs2o/Rf7RbY0a6sTR4Hr+sIq6OJwno42QwWJG7uZ81HU6ksd7jUbifp?= =?utf-8?q?YPUa5QIgQDTWHleQ5qj/bekbmAbKVTAEW60HVyXMnevFp/7tS1pw4IVYNufnUx/xV?= =?utf-8?q?asSsso+BN5ci6i1p7ASlmnGjj4cKqnReRJyoMA6ivELVmdA/wYZWRFuBZ7stnkubq?= =?utf-8?q?VQ/SS01hm5wNUoa881Ozu7IpbQ9RufYl5S+e7pTe/rRcGK48kYjQVCgXzINdPfHLf?= =?utf-8?q?B9DRS6OoLPvcSiNOMrIkCzBKM85ggJyfV2qfwFjFZ2ozWmBjBpwuyyvxSh8VMbHXG?= =?utf-8?q?cvykrg2qAZgYp0FvwaDaobenE64r2s3A84sNfowc29SMWaFE3QRqvM2RzO2BCXgS0?= =?utf-8?q?PZZE9gMu0GgAM77vjqd5HmJDgdSUse3xVt9EwAcm0YToBux1XmTOIYggLj/SDAU94?= =?utf-8?q?vqk85D4uskb7KKRzrv7D4KiYKOBqfw2tF//psq4dwh2Mf8WhCDxiR3mLc+uiCK6v+?= =?utf-8?q?g5mDdh7yF1I5DPEdvSQZxEW1CspuqGSyjbDR7gBQi40KYxLfDJRHpAUHTRFJatXS3?= =?utf-8?q?Jl8rnOjpkTrZnSecZGFQrEJ7zVDAQLpVYtaIWqpLw74DPk7X/qdh3RDMTzalQGPu1?= =?utf-8?q?PJVUU56KclGO4N/lANNYHUmafUTWZA+Ghqgcg1DMGxSn2DZDzxTRuusnHoPQ+Iw2p?= =?utf-8?q?ho237NSWtBjFpGxpY4/yc9cz304SVFPCBDuaKtFmQ1eNcnOWKhVLuCGV+bkUHxxDw?= =?utf-8?q?mXalauWoCajkfww+/583wGEcSC/9NkWDKj2X9Ue1aiRbt1aMX/O6KhIddeyG/GFKM?= =?utf-8?q?1exWnKDU7qBuPga3LRcZU6cKmD11qICh6GtwABbc3Ox999x+unpOfl8ePslJnjUtR?= =?utf-8?q?Mo31267Mn8BsCr4vs0m+BFs4H4er6pQ56W4h8gkyBTNb3+WCFxPceZzH5SWGdWmFN?= =?utf-8?q?XoBfOfVdCDHtfFOVJP50eg664Bm9blHeho/kXHY17vWM66lzfhrxd2WWG4dAnAWWh?= =?utf-8?q?pzvItVvZT/2dtTvJ4l2lYTu2nmjNBr1HxeufvXYVsN17PO3zCINJtmXv9+zc5tnGF?= =?utf-8?q?uiPMW1d+0ly7CTZu6IDY6oQBASfKbRHM3K5ymK2+gVHdvVDJsI0PifFCrsLWD3Ec/?= =?utf-8?q?gSzmf2Mr+VM8EJ0ozQMExt2cBqDQkoZxoeqpyQ/tXO/Q+b+fS6nniFvo2bc7/S0uM?= =?utf-8?q?hrlGjz5jKrajxgW+yVEfTBBxAbZUxU4XvQ=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 697728c3-2194-4a48-1dc1-08dad10d6062 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2022 06:54:21.0200 (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: EZNaPVXxjmAoyZxAlLcNfGJqVJMFJqKVK3OHlm2N6v7ytEOUmwfrggRbD28pmOez+ipwAxKrzps4jWSX6Vkqqu1WGydQ8Xrq0GHgDjekWv8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR13MB4952 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 From: Peng Zhang The method to report device information to the log is the same for both physical and virtual functions. The implementation is however open coded in each code path, break out the reporting logic to a helper function to reduce code duplication. Signed-off-by: Peng Zhang Reviewed-by: Niklas Söderlund Reviewed-by: Chaoyong He --- drivers/net/nfp/nfp_common.c | 27 +++++++++++++++++++++++++++ drivers/net/nfp/nfp_common.h | 1 + drivers/net/nfp/nfp_ethdev.c | 23 +---------------------- drivers/net/nfp/nfp_ethdev_vf.c | 23 +---------------------- 4 files changed, 30 insertions(+), 44 deletions(-) diff --git a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c index 71711bfa22..f112a70980 100644 --- a/drivers/net/nfp/nfp_common.c +++ b/drivers/net/nfp/nfp_common.c @@ -188,6 +188,33 @@ nfp_net_configure(struct rte_eth_dev *dev) return 0; } +void +nfp_net_log_device_information(const struct nfp_net_hw *hw) +{ + PMD_INIT_LOG(INFO, "VER: %u.%u, Maximum supported MTU: %d", + NFD_CFG_MAJOR_VERSION_of(hw->ver), + NFD_CFG_MINOR_VERSION_of(hw->ver), hw->max_mtu); + + PMD_INIT_LOG(INFO, "CAP: %#x, %s%s%s%s%s%s%s%s%s%s%s%s%s%s", hw->cap, + hw->cap & NFP_NET_CFG_CTRL_PROMISC ? "PROMISC " : "", + hw->cap & NFP_NET_CFG_CTRL_L2BC ? "L2BCFILT " : "", + hw->cap & NFP_NET_CFG_CTRL_L2MC ? "L2MCFILT " : "", + hw->cap & NFP_NET_CFG_CTRL_RXCSUM ? "RXCSUM " : "", + hw->cap & NFP_NET_CFG_CTRL_TXCSUM ? "TXCSUM " : "", + hw->cap & NFP_NET_CFG_CTRL_RXVLAN ? "RXVLAN " : "", + hw->cap & NFP_NET_CFG_CTRL_TXVLAN ? "TXVLAN " : "", + hw->cap & NFP_NET_CFG_CTRL_SCATTER ? "SCATTER " : "", + hw->cap & NFP_NET_CFG_CTRL_GATHER ? "GATHER " : "", + hw->cap & NFP_NET_CFG_CTRL_LIVE_ADDR ? "LIVE_ADDR " : "", + hw->cap & NFP_NET_CFG_CTRL_LSO ? "TSO " : "", + hw->cap & NFP_NET_CFG_CTRL_LSO2 ? "TSOv2 " : "", + hw->cap & NFP_NET_CFG_CTRL_RSS ? "RSS " : "", + hw->cap & NFP_NET_CFG_CTRL_RSS2 ? "RSSv2 " : ""); + + PMD_INIT_LOG(INFO, "max_rx_queues: %u, max_tx_queues: %u", + hw->max_rx_queues, hw->max_tx_queues); +} + void nfp_net_enable_queues(struct rte_eth_dev *dev) { diff --git a/drivers/net/nfp/nfp_common.h b/drivers/net/nfp/nfp_common.h index 36c19b47e4..02612dbb58 100644 --- a/drivers/net/nfp/nfp_common.h +++ b/drivers/net/nfp/nfp_common.h @@ -404,6 +404,7 @@ nfp_pci_queue(struct rte_pci_device *pdev, uint16_t queue) /* Prototypes for common NFP functions */ int nfp_net_reconfig(struct nfp_net_hw *hw, uint32_t ctrl, uint32_t update); int nfp_net_configure(struct rte_eth_dev *dev); +void nfp_net_log_device_information(const struct nfp_net_hw *hw); void nfp_net_enable_queues(struct rte_eth_dev *dev); void nfp_net_disable_queues(struct rte_eth_dev *dev); void nfp_net_params_setup(struct nfp_net_hw *hw); diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index 0956ea81df..f661819fc0 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -619,33 +619,12 @@ nfp_net_init(struct rte_eth_dev *eth_dev) else hw->rx_offset = nn_cfg_readl(hw, NFP_NET_CFG_RX_OFFSET_ADDR); - PMD_INIT_LOG(INFO, "VER: %u.%u, Maximum supported MTU: %d", - NFD_CFG_MAJOR_VERSION_of(hw->ver), - NFD_CFG_MINOR_VERSION_of(hw->ver), hw->max_mtu); - - PMD_INIT_LOG(INFO, "CAP: %#x, %s%s%s%s%s%s%s%s%s%s%s%s%s%s", hw->cap, - hw->cap & NFP_NET_CFG_CTRL_PROMISC ? "PROMISC " : "", - hw->cap & NFP_NET_CFG_CTRL_L2BC ? "L2BCFILT " : "", - hw->cap & NFP_NET_CFG_CTRL_L2MC ? "L2MCFILT " : "", - hw->cap & NFP_NET_CFG_CTRL_RXCSUM ? "RXCSUM " : "", - hw->cap & NFP_NET_CFG_CTRL_TXCSUM ? "TXCSUM " : "", - hw->cap & NFP_NET_CFG_CTRL_RXVLAN ? "RXVLAN " : "", - hw->cap & NFP_NET_CFG_CTRL_TXVLAN ? "TXVLAN " : "", - hw->cap & NFP_NET_CFG_CTRL_SCATTER ? "SCATTER " : "", - hw->cap & NFP_NET_CFG_CTRL_GATHER ? "GATHER " : "", - hw->cap & NFP_NET_CFG_CTRL_LIVE_ADDR ? "LIVE_ADDR " : "", - hw->cap & NFP_NET_CFG_CTRL_LSO ? "TSO " : "", - hw->cap & NFP_NET_CFG_CTRL_LSO2 ? "TSOv2 " : "", - hw->cap & NFP_NET_CFG_CTRL_RSS ? "RSS " : "", - hw->cap & NFP_NET_CFG_CTRL_RSS2 ? "RSSv2 " : ""); - hw->ctrl = 0; hw->stride_rx = stride; hw->stride_tx = stride; - PMD_INIT_LOG(INFO, "max_rx_queues: %u, max_tx_queues: %u", - hw->max_rx_queues, hw->max_tx_queues); + nfp_net_log_device_information(hw); /* Initializing spinlock for reconfigs */ rte_spinlock_init(&hw->reconfig_lock); diff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c index d1427b63bc..170f7eeb93 100644 --- a/drivers/net/nfp/nfp_ethdev_vf.c +++ b/drivers/net/nfp/nfp_ethdev_vf.c @@ -376,33 +376,12 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev) else hw->rx_offset = nn_cfg_readl(hw, NFP_NET_CFG_RX_OFFSET_ADDR); - PMD_INIT_LOG(INFO, "VER: %u.%u, Maximum supported MTU: %d", - NFD_CFG_MAJOR_VERSION_of(hw->ver), - NFD_CFG_MINOR_VERSION_of(hw->ver), hw->max_mtu); - - PMD_INIT_LOG(INFO, "CAP: %#x, %s%s%s%s%s%s%s%s%s%s%s%s%s%s", hw->cap, - hw->cap & NFP_NET_CFG_CTRL_PROMISC ? "PROMISC " : "", - hw->cap & NFP_NET_CFG_CTRL_L2BC ? "L2BCFILT " : "", - hw->cap & NFP_NET_CFG_CTRL_L2MC ? "L2MCFILT " : "", - hw->cap & NFP_NET_CFG_CTRL_RXCSUM ? "RXCSUM " : "", - hw->cap & NFP_NET_CFG_CTRL_TXCSUM ? "TXCSUM " : "", - hw->cap & NFP_NET_CFG_CTRL_RXVLAN ? "RXVLAN " : "", - hw->cap & NFP_NET_CFG_CTRL_TXVLAN ? "TXVLAN " : "", - hw->cap & NFP_NET_CFG_CTRL_SCATTER ? "SCATTER " : "", - hw->cap & NFP_NET_CFG_CTRL_GATHER ? "GATHER " : "", - hw->cap & NFP_NET_CFG_CTRL_LIVE_ADDR ? "LIVE_ADDR " : "", - hw->cap & NFP_NET_CFG_CTRL_LSO ? "TSO " : "", - hw->cap & NFP_NET_CFG_CTRL_LSO2 ? "TSOv2 " : "", - hw->cap & NFP_NET_CFG_CTRL_RSS ? "RSS " : "", - hw->cap & NFP_NET_CFG_CTRL_RSS2 ? "RSSv2 " : ""); - hw->ctrl = 0; hw->stride_rx = stride; hw->stride_tx = stride; - PMD_INIT_LOG(INFO, "max_rx_queues: %u, max_tx_queues: %u", - hw->max_rx_queues, hw->max_tx_queues); + nfp_net_log_device_information(hw); /* Initializing spinlock for reconfigs */ rte_spinlock_init(&hw->reconfig_lock);