From patchwork Mon Sep 26 06:59:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 116846 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 C7998A00C2; Mon, 26 Sep 2022 09:00:57 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 52AC14282E; Mon, 26 Sep 2022 09:00:31 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2132.outbound.protection.outlook.com [40.107.244.132]) by mails.dpdk.org (Postfix) with ESMTP id AEF2B42802 for ; Mon, 26 Sep 2022 09:00:29 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=W2gRKluZRXNejn6lxWlzbMzLAL32xXjr/s1zWq6WKxo1h2DKl0359q/1fRDNloFuNwX2oBpVM9qyJZnLypvgKc8wk4CkgRIz2QQP/4pXT+wpL2RRTrs702d5iAixPomJrsewJFZoq1VAnC+yhFfj5xcic9/9Fn02s5dpPRLe/vpfqZ0M/J+QXWBEt4uQYG1hWrYSgTKR+rlUAG/rd78G0YtnShaw8Lg+O/ChGiAIGQo9TbM6rCV6pkYlzLCjUpxOpP8rlQzndq/rgH7uy3GZsDfcfBdj77VBzZFp8Q6oSpFJlrdZJm2pDdX4uRQo5zTZyRP1nnqF0GTo5GqQlDXCJA== 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=bRkGUuhLSajcrO7T7RT3v6WzgxY0ddN5pk0bv0nKcao=; b=lvXKw2wm5OHfq5pmyVS4M8DOa7dBc6pKNx6ZZr+LoYrRL49DxUT5JLUUMPwqSiNVL7Ccrbs0x0bBZx6rwWv2HLJd3e4UtRnzVaDSJ6SUQWDYbK9FAkoYUjQ5PbgD2CeCC83q1AJUIMr8MMze4DzVTfREUTiLjy9qXRE4cGjpy/D0agPoO0QXOu1ggB2Stmboed5SIQznqCITuken6KvsWXhtPWpUFs9dj5UGhaHVJZWT6jkzYfSpo4wl5I+KoKZNgduV5B/ns2mznYP4T7ju9Vn22tX/ZkEfOr0TSya4XEi5JuMoZ5MaNBndzDu2mg3RUkYjqbv6/XGrya25hIdQ0w== 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=bRkGUuhLSajcrO7T7RT3v6WzgxY0ddN5pk0bv0nKcao=; b=P9CQM8L3AwCIIzpLDKhr4A21YKrNQDNyOjzsvd/SKNMnfix3feXegEkl3Jc494NMmg+W6oNCrZeSboGpDGrrfhxBBs1HNeYT5mMVhwXXZMs9IfgSPYcpSqsdBWY0Y9B7YRM2hP3NC8ynSTQjUZJXt6vAFq6FSzds9HvIw1n+5y4= 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 SA1PR13MB4893.namprd13.prod.outlook.com (2603:10b6:806:18a::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.14; Mon, 26 Sep 2022 07:00:28 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::779:2722:a8e5:503b]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::779:2722:a8e5:503b%7]) with mapi id 15.20.5676.014; Mon, 26 Sep 2022 07:00:28 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH v10 05/13] net/nfp: add flower PF setup logic Date: Mon, 26 Sep 2022 14:59:49 +0800 Message-Id: <1664175597-37248-6-git-send-email-chaoyong.he@corigine.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1664175597-37248-1-git-send-email-chaoyong.he@corigine.com> References: <1664175597-37248-1-git-send-email-chaoyong.he@corigine.com> X-ClientProxiedBy: SG2P153CA0005.APCP153.PROD.OUTLOOK.COM (2603:1096::15) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SA1PR13MB4893:EE_ X-MS-Office365-Filtering-Correlation-Id: 0a822a80-a050-4a28-2073-08da9f8ccb05 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IpVnxFYfI7r2wp6gfF/1iJ5FvubwzigN+Z85Y+o7njwPr+eRf6U+yMtmB4LbfPuFonVfmQgmCYtUd/vGn6BRv3IpZ5dL5cl1TirOhx+IOMTLg8QUf8dBr3ehKu7VzNhr74paggTDwNHdOaKd+0+B8Qt4bUkwuWvz/8nXbtY3qvZe93ikYJT4/XS03MFOMlmDpj2uOU6+tTiqRDiLOL5jRkFfRDbvFIxuTR1z/yAe3/Hjw8xefEI+ROIlHLtbo65bBx7dfwu0D7x2uCzcFMHUu9a4q7mvMEwya+l/KtrsMnJctjCKJYbd50VXaGUvOjObOJpARghcwFZzKv4ZXJUSOBHAJ7LRIforBEdAeeHvkXYhNSUvihwk0kiXkI2gj8ipmro+G9ThAr+MEZbSGlzcyHFU6+Nq2Su24vOkhTZrA21WenyjOwOu9MLv57sQHte0oaTaI/fyXReojSWwaiCZ18L17bRyeWZD18hig3H/nGDZOmKYxLqDmgUxpDWRqQhWg2FpBWITbIsLAXAUVbNFQAsoGmGRhVdh1Pl8953GCZuHYm9dnAnaHjV3x6TZgvElfAjO+jttsUZYtn7Ntj+zC3EqmefzMVC0WbCf5LerPcF/KrUxjQLYCMg1HHQ/bfCa3Cv2B/5hCE7tXwCuV++CgtjMJ7vFCdJuWdbpbH0g4QQhJ8S4I33sC5VyAGAktJpgAQU/EP5Kvmrw+6NoyuBtyzcLaDebwfvWi/0f/zQ0eqm6GMGEU3wJm7v70AXfwr26KukMlPHGYD7VeYSDgiPvRw== 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)(366004)(396003)(39830400003)(136003)(376002)(346002)(451199015)(36756003)(38100700002)(38350700002)(2906002)(86362001)(44832011)(66946007)(8936002)(66556008)(66476007)(5660300002)(8676002)(4326008)(83380400001)(186003)(66574015)(6512007)(6916009)(316002)(52116002)(6666004)(2616005)(26005)(6506007)(478600001)(41300700001)(107886003)(6486002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?6qOVdAp5aEA2OhS8JWJuHjBb7uLB?= =?utf-8?q?BrqB4iE5hvHpRAYrk31NDAVqYnYisfSseDdY6czgtwikp6p6ZY8I2XTI3sJ9HTxAo?= =?utf-8?q?y5PS+XQSB9CG/dslF2dLCbmJAhrQV7Ly3Y4XYB4wAzGbH9eYxdfcYIMjmenf+4flb?= =?utf-8?q?oUPhyqFTtUwgS9jqd4hlKJV0iTWs4YsLKIelFhczslsQmSNDXTEduBVy5FvvfUPTd?= =?utf-8?q?okeiElfVzZ3oeaOGNxBjEvZUxnOoc7lCayS2jFWkw741UAChOib1W85V5qI61O20q?= =?utf-8?q?dOvQsqtqXLmAhiDM0PuA6aD3NOoZjNdRsOdkmyC/dXXiafn9A7felRx90AqrDqFXO?= =?utf-8?q?Myws48icQMiakO1KWXRoFLgmsw+12XLTbYcFa0+xhANlDqOzGfoFyLxaSh/G2fVWV?= =?utf-8?q?NqIb6Vlc4u5arMnp0kbe8WeJAl9V8zxCq4kGXW7xCkJhGE6lz15QmOm/6IjGbKIB1?= =?utf-8?q?Ezi3eFD2Rx/gQCU3vsA6j/O2Xk6pLEEJTZd3EGqZ1nscq+S5L7MnDQByDvrlhZ8Ii?= =?utf-8?q?FO1V5vK3rgMefuAzBznNw3lAK4/7sMsD+oPxeoV9eyZ6R0CztweYkQuLLJzxp9fgL?= =?utf-8?q?8oDOEv0rSCIeZiW8b6NQP1tlOyU+14PIJ8WS8ugHxs1b937dcvhp0jOtEC8BkU6zI?= =?utf-8?q?VPo2UEVsdw2g5x8yZRGauFFRQwE+7YyKIQ6abQcu7UMFGiT6ngX6FNtfQR84IPyeT?= =?utf-8?q?sC0RHdoz6tzcY2BLd2br9Xk1mnSgycQTuTuO4RzfpSRBPbAk2/KnnlREUBrkiegFo?= =?utf-8?q?ijSxyaIQGCjcWUnTWx9sdwqnv1te471B9VsyH0JQZG2TAdo4NmIDfHqlo4oZoL6N6?= =?utf-8?q?V5y1cE84fMZ/yN+MTYI74WyZc1MC5+fzCPQUyzAft5tiUsaA+FD+mssjM/M8Q8lOV?= =?utf-8?q?X9PboygLpwPGPyTPGbfZydo9lU9jtvWZhcVozg7APL4PoO5ieUz0m/g7ej97vkXMR?= =?utf-8?q?HOg8J00juHbNd7mz5oRTG3ENbi38H5mFpcgjS43c7jwQN1n0fts18ESN8Cck7H3G7?= =?utf-8?q?l7SOoqzsRtR42QTXW+98AkGBkrW1v7WdlJRI7MtZ7vdS0QUvuZCXqDiwQYJSDwvZD?= =?utf-8?q?O7WqMAyUiaLZe7g9x5yDp80K7r3vWd3YbMFxIDq24dLiltBAjXwUBotfwGCIaDZFV?= =?utf-8?q?zIfzGFb2DmMC0Pw3dVYnU63ddXAzsafrmKs56AY7/BdZ8ToUEM+c/YqqwS90lRRoK?= =?utf-8?q?s5BbEINSe1RzeZb3cVkCkrMfM2kLKIjgWh7QmfCCLZLLyBp87u2e9Sr1OVEzooQvZ?= =?utf-8?q?GLRP1cBg8GktI5dcFlgZn4wE4Saqxk6yPvu1r8bsEGH1kXKg2Eg9ZXFtBL7qiU0A7?= =?utf-8?q?V6SA5fZDt/DrJ7zI9YPp0OKGkXfZCOHrSahWTYNrS6wluf+6s6ATr0V9G4KkjGc4O?= =?utf-8?q?wnRQXGP4I02SANZDevsuOaoCLiLX+byTkXZp+cAW1f1q6LOHKD7a8f/n0rG9KZ03R?= =?utf-8?q?+Uqo9xG7J3WIwb+K6kDlSJCAdtpyklnvS48VWtl0yBQ9L7B459ZVx2J9o6pH/3pSJ?= =?utf-8?q?VeRdhOCjAg5DbeEB1FvhDhXspXgbC0hWNw=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0a822a80-a050-4a28-2073-08da9f8ccb05 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2022 07:00:27.9362 (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: 8udOwCQn8UhNuWPT+62yEdu8Vlg/0U55UbS9bMTT4+4Z64Qcu24//0J2+mL9jb7PyV5ir+n9oHNH659eeM2gbT6nnwgy1+rMI+Rl1jnM2FY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR13MB4893 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 Adds the vNIC initialization logic for the flower PF vNIC. The flower firmware application exposes this vNIC for the purposes of fallback traffic in the switchdev use-case. Adds minimal dev_ops for this PF vNIC device. Because the device is being exposed externally to DPDK it needs to implements a minimal set of dev_ops. Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/flower/nfp_flower.c | 143 +++++++++++++++++++++++++++++++++++- drivers/net/nfp/flower/nfp_flower.h | 2 + drivers/net/nfp/nfp_common.h | 3 + 3 files changed, 145 insertions(+), 3 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c index 87cb922..aec9e28 100644 --- a/drivers/net/nfp/flower/nfp_flower.c +++ b/drivers/net/nfp/flower/nfp_flower.c @@ -14,12 +14,96 @@ #include "../nfp_logs.h" #include "../nfp_ctrl.h" #include "../nfp_cpp_bridge.h" +#include "../nfp_rxtx.h" +#include "../nfpcore/nfp_mip.h" +#include "../nfpcore/nfp_rtsym.h" +#include "../nfpcore/nfp_nsp.h" #include "nfp_flower.h" +#define DEFAULT_FLBUF_SIZE 9216 + +static const struct eth_dev_ops nfp_flower_pf_vnic_ops = { + .dev_infos_get = nfp_net_infos_get, + .link_update = nfp_net_link_update, + .dev_configure = nfp_net_configure, +}; + +static int +nfp_flower_init_vnic_common(struct nfp_net_hw *hw, const char *vnic_type) +{ + uint32_t start_q; + uint64_t rx_bar_off; + uint64_t tx_bar_off; + const int stride = 4; + struct nfp_pf_dev *pf_dev; + struct rte_pci_device *pci_dev; + + pf_dev = hw->pf_dev; + pci_dev = hw->pf_dev->pci_dev; + + /* NFP can not handle DMA addresses requiring more than 40 bits */ + if (rte_mem_check_dma_mask(40)) { + PMD_INIT_LOG(ERR, "Device %s can not be used: restricted dma mask to 40 bits!\n", + pci_dev->device.name); + return -ENODEV; + }; + + hw->device_id = pci_dev->id.device_id; + hw->vendor_id = pci_dev->id.vendor_id; + hw->subsystem_device_id = pci_dev->id.subsystem_device_id; + hw->subsystem_vendor_id = pci_dev->id.subsystem_vendor_id; + + PMD_INIT_LOG(DEBUG, "%s vNIC ctrl bar: %p", vnic_type, hw->ctrl_bar); + + /* Read the number of available rx/tx queues from hardware */ + hw->max_rx_queues = nn_cfg_readl(hw, NFP_NET_CFG_MAX_RXRINGS); + hw->max_tx_queues = nn_cfg_readl(hw, NFP_NET_CFG_MAX_TXRINGS); + + /* Work out where in the BAR the queues start */ + start_q = nn_cfg_readl(hw, NFP_NET_CFG_START_TXQ); + tx_bar_off = (uint64_t)start_q * NFP_QCP_QUEUE_ADDR_SZ; + start_q = nn_cfg_readl(hw, NFP_NET_CFG_START_RXQ); + rx_bar_off = (uint64_t)start_q * NFP_QCP_QUEUE_ADDR_SZ; + + hw->tx_bar = pf_dev->hw_queues + tx_bar_off; + hw->rx_bar = pf_dev->hw_queues + rx_bar_off; + + /* Get some of the read-only fields from the config BAR */ + hw->ver = nn_cfg_readl(hw, NFP_NET_CFG_VERSION); + hw->cap = nn_cfg_readl(hw, NFP_NET_CFG_CAP); + hw->max_mtu = nn_cfg_readl(hw, NFP_NET_CFG_MAX_MTU); + /* Set the current MTU to the maximum supported */ + hw->mtu = hw->max_mtu; + hw->flbufsz = DEFAULT_FLBUF_SIZE; + + /* read the Rx offset configured from firmware */ + if (NFD_CFG_MAJOR_VERSION_of(hw->ver) < 2) + hw->rx_offset = NFP_NET_RX_OFFSET; + else + hw->rx_offset = nn_cfg_readl(hw, NFP_NET_CFG_RX_OFFSET_ADDR); + + hw->ctrl = 0; + hw->stride_rx = stride; + hw->stride_tx = stride; + + /* Reuse cfg queue setup function */ + nfp_net_cfg_queue_setup(hw); + + PMD_INIT_LOG(INFO, "%s vNIC max_rx_queues: %u, max_tx_queues: %u", + vnic_type, hw->max_rx_queues, hw->max_tx_queues); + + /* Initializing spinlock for reconfigs */ + rte_spinlock_init(&hw->reconfig_lock); + + return 0; +} + int nfp_init_app_fw_flower(struct nfp_pf_dev *pf_dev) { + int ret; unsigned int numa_node; + struct nfp_net_hw *pf_hw; struct nfp_app_fw_flower *app_fw_flower; numa_node = rte_socket_id(); @@ -34,12 +118,65 @@ pf_dev->app_fw_priv = app_fw_flower; + /* Allocate memory for the PF AND ctrl vNIC here (hence the * 2) */ + pf_hw = rte_zmalloc_socket("nfp_pf_vnic", 2 * sizeof(struct nfp_net_adapter), + RTE_CACHE_LINE_SIZE, numa_node); + if (pf_hw == NULL) { + PMD_INIT_LOG(ERR, "Could not malloc nfp pf vnic"); + ret = -ENOMEM; + goto app_cleanup; + } + + /* Map the PF ctrl bar */ + pf_dev->ctrl_bar = nfp_rtsym_map(pf_dev->sym_tbl, "_pf0_net_bar0", + 32768, &pf_dev->ctrl_area); + if (pf_dev->ctrl_bar == NULL) { + PMD_INIT_LOG(ERR, "Cloud not map the PF vNIC ctrl bar"); + ret = -ENODEV; + goto vnic_cleanup; + } + + /* Fill in the PF vNIC and populate app struct */ + app_fw_flower->pf_hw = pf_hw; + pf_hw->ctrl_bar = pf_dev->ctrl_bar; + pf_hw->pf_dev = pf_dev; + pf_hw->cpp = pf_dev->cpp; + + ret = nfp_flower_init_vnic_common(app_fw_flower->pf_hw, "pf_vnic"); + if (ret != 0) { + PMD_INIT_LOG(ERR, "Could not initialize flower PF vNIC"); + goto pf_cpp_area_cleanup; + } + return 0; + +pf_cpp_area_cleanup: + nfp_cpp_area_free(pf_dev->ctrl_area); +vnic_cleanup: + rte_free(pf_hw); +app_cleanup: + rte_free(app_fw_flower); + + return ret; } int -nfp_secondary_init_app_fw_flower(__rte_unused struct nfp_cpp *cpp) +nfp_secondary_init_app_fw_flower(struct nfp_cpp *cpp) { - PMD_INIT_LOG(ERR, "Flower firmware not supported"); - return -ENOTSUP; + struct rte_eth_dev *eth_dev; + const char *port_name = "pf_vnic_eth_dev"; + + PMD_INIT_LOG(DEBUG, "Secondary attaching to port %s", port_name); + + eth_dev = rte_eth_dev_attach_secondary(port_name); + if (eth_dev == NULL) { + PMD_INIT_LOG(ERR, "Secondary process attach to port %s failed", port_name); + return -ENODEV; + } + + eth_dev->process_private = cpp; + eth_dev->dev_ops = &nfp_flower_pf_vnic_ops; + rte_eth_dev_probing_finish(eth_dev); + + return 0; } diff --git a/drivers/net/nfp/flower/nfp_flower.h b/drivers/net/nfp/flower/nfp_flower.h index 8b9ef95..51e05e8 100644 --- a/drivers/net/nfp/flower/nfp_flower.h +++ b/drivers/net/nfp/flower/nfp_flower.h @@ -8,6 +8,8 @@ /* The flower application's private structure */ struct nfp_app_fw_flower { + /* Pointer to the PF vNIC */ + struct nfp_net_hw *pf_hw; }; int nfp_init_app_fw_flower(struct nfp_pf_dev *pf_dev); diff --git a/drivers/net/nfp/nfp_common.h b/drivers/net/nfp/nfp_common.h index 52dc3ca..27ea9c2 100644 --- a/drivers/net/nfp/nfp_common.h +++ b/drivers/net/nfp/nfp_common.h @@ -448,6 +448,9 @@ int nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev, #define NFP_PRIV_TO_APP_FW_NIC(app_fw_priv)\ ((struct nfp_app_fw_nic *)app_fw_priv) +#define NFP_PRIV_TO_APP_FW_FLOWER(app_fw_priv)\ + ((struct nfp_app_fw_flower *)app_fw_priv) + #endif /* _NFP_COMMON_H_ */ /* * Local variables: