From patchwork Mon Dec 11 03:08:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 135000 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 B99AA436C3; Mon, 11 Dec 2023 04:10:07 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C8D9640E72; Mon, 11 Dec 2023 04:09:32 +0100 (CET) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2107.outbound.protection.outlook.com [40.107.243.107]) by mails.dpdk.org (Postfix) with ESMTP id 75F1740DF5 for ; Mon, 11 Dec 2023 04:09:31 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GLrljwCzNTzK9eR/dHGkRNn55fxfpPQv1TF/xOvUzz8FKs0mGmePZYAm/Gk3DTTjpqidiHhtMA/IY0JP31EqIws4Aa0KTTcBMNFqB0W/XkdUEYx/hDoevBT86LiqKEPEQl7lECbuCPaVjG3RiQ6cwD5JPC+FUKp9iQkCAWJ8RQpvtmFmjlQFTwRvp+DJjXFJF55yUq14kDXMK6wbbugPt8I75x9MQHg+w64+aB3MWE2g6iT8Gdz5Uuqcv6l3PWk5KlBul7UwO9SBDKbbudu3aWKafbUYor40W8QuYJ4yIeY9Cf4+Nw4aIgduSUHh/RUJe8HJfFLqrogIzfMSt2tZeA== 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=GVr+m0rRmcnq1sRZ5RSUiEQk2XXGzGH4cVUjhazlK5s=; b=VitblirPLtH+6Yow4mxe+zN6a1lIOiVgz1EwpmxXX45nqbYYTNFex4mAXZbwxtcp4+QJdC2LRGDuvFZ0pxZwFJSDnvOBTjOoq+2dgjhQAULBY3pEvnYCaMueMuA34AF7fH3p+iE+xpfmHoEusIWciQHqmWK+FN2SjvmEanqIAV/xFYMMNXSAqAj4O3IWnNhyUFIpznA008hS9+mA6ZGewAr8qALzyvtomtd/R22lvWBT9wN4GAFBOCyNxecr+yh2PQPU6ALsGKwi3lmkXDRwD1iQ16UKxfCae8CHmh6+wCSo7PjdHgTbvU8DOf6lx2RHNmMjRI6+S4zJSqFnsf8suQ== 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=GVr+m0rRmcnq1sRZ5RSUiEQk2XXGzGH4cVUjhazlK5s=; b=BgznhzPUvZ/C1D0Sa5XPfBvQbLUTr3gDTGvzFl32Afa3ipN/M3F3p7SEhtV8MuPlaEanHG2E2Ru6R8OJaG1/h5S4wYsLHrDkRX3ig9oCY6Y9wMe3DB+Rwd6MC3pXvAsTqIcOd4rmQEh6AxXdbxFcQPINNK0EEt+YgCJAPmgPNmg= 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 PH0PR13MB5666.namprd13.prod.outlook.com (2603:10b6:510:111::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32; Mon, 11 Dec 2023 03:09:30 +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.7068.031; Mon, 11 Dec 2023 03:09:30 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Zerun Fu , Long Wu , Peng Zhang , Chaoyong He Subject: [PATCH 6/7] net/nfp: support getting FEC mode Date: Mon, 11 Dec 2023 11:08:57 +0800 Message-Id: <20231211030858.1693240-7-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231211030858.1693240-1-chaoyong.he@corigine.com> References: <20231211030858.1693240-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SJ0PR13CA0166.namprd13.prod.outlook.com (2603:10b6:a03:2c7::21) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|PH0PR13MB5666:EE_ X-MS-Office365-Filtering-Correlation-Id: 555ff4ae-2986-4893-b564-08dbf9f69740 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1FToRxyQyVliSyJCHGQP0AjF/Sg8YEKrrI7cA0qf6sD7czNqmSjuiyr2fJqcVrhbaqxB4Rd3sajst3t4/taltI/97zoJwky7o4MadcsDkPya4FcMxNkCDrSM/ySlpGUEALAc/nZNe1rR9p9aUdHYKb6U7BWYxUkF8bUGhc/IlZuF4SII/G09o/vppxUPDHqxYuJEMHpYenzN3+3CGPlkPVuCeAcpqXFjeWGyyxhhph0m3QlpSAKKiCkEiUm+DgQpKjOcPMP2YoglnkgwjUJ6imxMO359zCax0sWbb8JfyzY5SmMQRMtdm40bTMW75jld6ZMYBBTPurdnjLYq960FRXd3zeOaDMaq2LSKOtr5/MFyCPa76R6Q6qTlWUGmgqV+LMue3TFWsK6Q8mmesUTRW5v4s80HMGqkOkn5M+9d89d4RmUXnyFsP4DKEtlJ4OXzCmG5SGgPh+Aduru7CCBTw5ZWJL6/Ey9Qb8vXkLlxO3m0kbI91kR3K0fpp+byYAbIqw37p4glauQtea/TO+aVFNkBmm6VD/aooIQYCd6cAam9helvXGxobzea21NPEYa/n5+HsVVkuN5X2GhvmJNjUwdzAATyaqLFFo7qeODokOVi7igomTJ00wn31X63HErCvZEaeDXHXN7POpDGkYNklvGrw4aef4iCg6eXpwTPVXg= 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)(136003)(376002)(396003)(346002)(366004)(230922051799003)(451199024)(1800799012)(186009)(64100799003)(41300700001)(5660300002)(38350700005)(2906002)(6512007)(6506007)(107886003)(2616005)(1076003)(6666004)(52116002)(36756003)(478600001)(6486002)(38100700002)(83380400001)(26005)(8936002)(8676002)(4326008)(86362001)(6916009)(66476007)(66556008)(54906003)(316002)(66946007)(44832011); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: v3cIk7TAXTAaNNqz3AOemqvuED+GSaFo/GuW0W8GdolmkqpcAdvuKvW9r5xbm1wzvvdE3gDX4/AZSJv0er6eWQMz7+A1/aiTEd+tFePpsrj7qb5bW0H4ETM3T4FQgrIgjTxsG58gVws9yKIjNgh8uBRuoylYQnvqikAVkPdZ6wETG1hIT8n2TCvpzDHhFV37RFR0CIeREMZvlbKfs3EDMyc49mcbZhshBDjFDqs++jQWaWZtQMvggdrODmECxIbyuqyKAArAfwtkL+za45f350dpoZX56CAwB2HC7Qu1MJv2nfv6lj18IYGtM3/96Lu2/WD75n47X2CX+z3EtjbOrhkDQIYcxZpj/QecI+R/cCecpBww/KeKCaokETF/Mt5VuzbmG8rvidW/27rFqSamrmrnDAhr5jU18lEKmYy6s1mP1VmRzYqQImEUsXvATRMKOggmIwyEOTmoEZgqdRoG50WlYrOgfh4X0ir+C5IDmsc3C/DpwLWcVEvDRFt1GnJ04LP+wqJSS5q9c3/aTeBevwrMaP1+LmyfMtWMTOTBkgOAfpZmwbm+/5BlUKHD/hCfTPH8IWrAPAAJnT3G5Qe/aSd2dcwF5VDsG1IWnDmMkgCyIdlpIwvX1jeHCqubugpPJqOTf2aT6puKJOQbLBW5BJ+WlJD8E6w6zpCCIui95OoCeBEKMAj9wCFAQUyeRhPFWLAdcKxXnm8EKahMnPMGWhTs4ffrA83r4ayyO7+jpYVOLCJ4uTlZDc3rBjoidK/ujN5s9cxWxaBtJAdggeSC3Ajf3pPZfLFN7Gmu0PJEg1O4yyeVXjDg8cCD95D/CxF8cPF98LkSe2vwVibNe7lHQil+xhv7I8LEkvp5K0CBRHmhqTzeqdVj0szKZ9QiXhMQQCd+O5GeuwrGzSlCIJ6RUhmmIna7Lyatk0w2cItBije+aXLUcm7bllu9G1dxSOt2NjBh/4fQUSvS1AglG3PUZgPtB15/oiL6Qjcuf7RcCSYRj408e4twNgMK8vAieVb0zVuFdVuXgLt6vRBcJFtRA5RjeyySiL/7aUS4iB61TQYrky7p88sB8alguN2jDRcWUOaQ7iypxSCmp9AazgS3qRfvOi7d8wbQkzVgKSQLAuvYMrzgyb/B2hkoH9P+XbzWmxERN+RsNEmK8hTx5Th6WiBbK2wLbF86QRsocrW2lRGR4QFZojQy9YDiBHSGxfejgkzOA9GLuVBh06kfpKGkaccCd72uuBC/BKkhB8Mz/lBFjDgMTWd6rUWQK1QNWVNEEyMzf9QSotuXKp91UaERTMbYd64i5RWG/jok6lD2r44sf5dWIfuvYPCgtvGcs72hGUYSx0V0/bSnvedcM5FOY6yLiK5Eg/0tc7vBJC9a1yswA8wuE51IXYtQqI6D9t/5vuTlFG8cFjOJus6ajbyRtqm7FP5O5RwxCY1F34W3cyX2QTXuPO6QHpOnq0GPbiwQw3ErT1V8WTOrZCByhjmw6SxyWsu5GNRf/Rp+U0qJ6XXsFiqcZHdVewjbcjUf1QsZ/62Ey96cBaODz00S4gRTZZ124MC9P+mFDgbvbkiItkE2ER+eUF9SX+FHClzPF/Jc+TlK7luOOHiNKlytH6N3nw== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 555ff4ae-2986-4893-b564-08dbf9f69740 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 03:09:30.0742 (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: beRnxIywS2l7z16yQV1njU702qIDd90skv4leFSjl1NKV8kMOKXtlPjkYFKAP5dZosdcPTMuChLjP7q33PwIJwpX96w8WX9BOWghZMpJiH0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR13MB5666 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: Zerun Fu Add support for querying current FEC mode from the device. Signed-off-by: Zerun Fu Reviewed-by: Long Wu Reviewed-by: Peng Zhang Reviewed-by: Chaoyong He --- drivers/net/nfp/nfp_ethdev.c | 1 + drivers/net/nfp/nfp_net_common.c | 60 ++++++++++++++++++++++++++++++++ drivers/net/nfp/nfp_net_common.h | 2 ++ 3 files changed, 63 insertions(+) diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index 3c24ebeaf3..e3f5fe7917 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -760,6 +760,7 @@ static const struct eth_dev_ops nfp_net_eth_dev_ops = { .flow_ctrl_set = nfp_net_flow_ctrl_set, .flow_ops_get = nfp_net_flow_ops_get, .fec_get_capability = nfp_net_fec_get_capability, + .fec_get = nfp_net_fec_get, }; static inline void diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c index 5aa85aa077..063c048675 100644 --- a/drivers/net/nfp/nfp_net_common.c +++ b/drivers/net/nfp/nfp_net_common.c @@ -2326,3 +2326,63 @@ nfp_net_fec_get_capability(struct rte_eth_dev *dev, return NFP_FEC_CAPA_ENTRY_NUM; } + +static uint32_t +nfp_net_fec_nfp_to_rte(enum nfp_eth_fec fec) +{ + switch (fec) { + case NFP_FEC_AUTO_BIT: + return RTE_ETH_FEC_MODE_CAPA_MASK(AUTO); + case NFP_FEC_BASER_BIT: + return RTE_ETH_FEC_MODE_CAPA_MASK(BASER); + case NFP_FEC_REED_SOLOMON_BIT: + return RTE_ETH_FEC_MODE_CAPA_MASK(RS); + case NFP_FEC_DISABLED_BIT: + return RTE_ETH_FEC_MODE_CAPA_MASK(NOFEC); + default: + PMD_DRV_LOG(ERR, "FEC mode is invalid."); + return 0; + } +} + +int +nfp_net_fec_get(struct rte_eth_dev *dev, + uint32_t *fec_capa) +{ + struct nfp_net_hw *hw; + struct nfp_eth_table *nfp_eth_table; + struct nfp_eth_table_port *eth_port; + + hw = nfp_net_get_hw(dev); + if (hw->pf_dev == NULL) + return -EINVAL; + + if (dev->data->dev_link.link_status == RTE_ETH_LINK_DOWN) { + nfp_eth_table = nfp_eth_read_ports(hw->cpp); + hw->pf_dev->nfp_eth_table->ports[hw->idx] = nfp_eth_table->ports[hw->idx]; + free(nfp_eth_table); + } + + nfp_eth_table = hw->pf_dev->nfp_eth_table; + eth_port = &nfp_eth_table->ports[hw->idx]; + + if (!nfp_eth_can_support_fec(eth_port)) { + PMD_DRV_LOG(ERR, "NFP can not support FEC."); + return -ENOTSUP; + } + + /* + * If link is down and AUTO is enabled, AUTO is returned, otherwise, + * configured FEC mode is returned. + * If link is up, current FEC mode is returned. + */ + if (dev->data->dev_link.link_status == RTE_ETH_LINK_DOWN) + *fec_capa = nfp_net_fec_nfp_to_rte(eth_port->fec); + else + *fec_capa = nfp_net_fec_nfp_to_rte(eth_port->act_fec); + + if (*fec_capa == 0) + return -EINVAL; + + return 0; +} diff --git a/drivers/net/nfp/nfp_net_common.h b/drivers/net/nfp/nfp_net_common.h index f0fe10b6cd..fa88323b7c 100644 --- a/drivers/net/nfp/nfp_net_common.h +++ b/drivers/net/nfp/nfp_net_common.h @@ -291,6 +291,8 @@ void nfp_pf_uninit(struct nfp_pf_dev *pf_dev); int nfp_net_fec_get_capability(struct rte_eth_dev *dev, struct rte_eth_fec_capa *speed_fec_capa, unsigned int num); +int nfp_net_fec_get(struct rte_eth_dev *dev, + uint32_t *fec_capa); #define NFP_PRIV_TO_APP_FW_NIC(app_fw_priv)\ ((struct nfp_app_fw_nic *)app_fw_priv)