[16/37] net/dpaa: add VSP support in FMLIB

Message ID	20200527132326.1382-17-hemant.agrawal@nxp.com
State	Superseded
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) client-ip=92.243.14.124; From: Hemant Agrawal <hemant.agrawal@nxp.com> To: dev@dpdk.org, ferruh.yigit@intel.com Cc: Jun Yang <jun.yang@nxp.com> Date: Wed, 27 May 2020 18:53:05 +0530 Message-Id: <20200527132326.1382-17-hemant.agrawal@nxp.com> In-Reply-To: <20200527132326.1382-1-hemant.agrawal@nxp.com> References: <20200527132326.1382-1-hemant.agrawal@nxp.com> Subject: [dpdk-dev] [PATCH 16/37] net/dpaa: add VSP support in FMLIB Precedence: list Errors-To: dev-bounces@dpdk.org Sender: "dev" <dev-bounces@dpdk.org>
Series	NXP DPAAx enhancements \| expand [00/37] NXP DPAAx enhancements [01/37] bus/fslmc: fix getting the FD error [02/37] net/dpaa: fix fd offset data type [03/37] net/dpaa2: enable timestamp for Rx offload case as well [04/37] bus/fslmc: combine thread specific variables [05/37] bus/fslmc: rework portal allocation to a per thread basis [06/37] bus/fslmc: support handle portal alloc failure [07/37] bus/fslmc: support portal migration [08/37] bus/fslmc: rename the cinh read functions used for ls1088 [09/37] net/dpaa: enable Tx queue taildrop [10/37] net/dpaa: add 2.5G support [11/37] net/dpaa: update process specific device info [12/37] drivers: optimize thread local storage for dpaa [13/37] bus/dpaa: enable link state interrupt [14/37] bus/dpaa: enable set link status [15/37] net/dpaa: add support for fmlib in dpdk [16/37] net/dpaa: add VSP support in FMLIB [17/37] net/dpaa: add support for fmcless mode [18/37] bus/dpaa: add shared MAC support [19/37] bus/dpaa: add Virtual Storage Profile port init [20/37] net/dpaa: add support for Virtual Storage Profile [21/37] net/dpaa: add fmc parser support for VSP [22/37] net/dpaa: add RSS update func with FMCless [23/37] net/dpaa2: dynamic flow control support [24/37] net/dpaa2: key extracts of flow API [25/37] net/dpaa2: sanity check for flow extracts [26/37] net/dpaa2: free flow rule memory [27/37] net/dpaa2: flow QoS or FS table entry indexing [28/37] net/dpaa2: define the size of table entry [29/37] net/dpaa2: log of flow extracts and rules [30/37] net/dpaa2: discrimination between IPv4 and IPv6 [31/37] net/dpaa2: distribution size set on multiple TCs [32/37] net/dpaa2: index of queue action for flow [33/37] net/dpaa2: flow data sanity check [34/37] net/dpaa2: flow API QoS setup follows FS setup [35/37] net/dpaa2: flow API FS miss action configuration [36/37] net/dpaa2: configure per class distribution size [37/37] net/dpaa2: support raw flow classification

diff --git a/drivers/net/dpaa/Makefile b/drivers/net/dpaa/Makefile index 0d2f32ba1..8db4e457f 100644 --- a/drivers/net/dpaa/Makefile +++ b/drivers/net/dpaa/Makefile @@ -28,6 +28,7 @@ EXPORT_MAP := rte_pmd_dpaa_version.map # Interfaces with DPDK SRCS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += fmlib/fm_lib.c +SRCS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += fmlib/fm_vsp.c SRCS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += dpaa_ethdev.c SRCS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += dpaa_rxtx.c diff --git a/drivers/net/dpaa/fmlib/fm_vsp.c b/drivers/net/dpaa/fmlib/fm_vsp.c new file mode 100644 index 000000000..b511b5159 --- /dev/null +++ b/drivers/net/dpaa/fmlib/fm_vsp.c @@ -0,0 +1,143 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2019-2020 NXP + */ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <fcntl.h> +#include <errno.h> +#include <unistd.h> +#include <termios.h> +#include <sys/ioctl.h> +#include <stdbool.h> + +#include <rte_common.h> +#include "fm_ext.h" +#include "fm_pcd_ext.h" +#include "fm_port_ext.h" +#include "fm_vsp_ext.h" +#include <dpaa_ethdev.h> + +uint32_t FM_PORT_VSPAlloc(t_Handle h_FmPort, + t_FmPortVSPAllocParams *p_Params) +{ + t_Device *p_Dev = (t_Device *)h_FmPort; + ioc_fm_port_vsp_alloc_params_t params; + + _fml_dbg("Calling...\n"); + memset(&params, 0, sizeof(ioc_fm_port_vsp_alloc_params_t)); + memcpy(&params.params, p_Params, sizeof(t_FmPortVSPAllocParams)); + + if (ioctl(p_Dev->fd, FM_PORT_IOC_VSP_ALLOC, &params)) + RETURN_ERROR(MINOR, E_INVALID_OPERATION, NO_MSG); + + _fml_dbg("Called.\n"); + + return E_OK; +} + +t_Handle FM_VSP_Config(t_FmVspParams *p_FmVspParams) +{ + t_Device *p_Dev = NULL; + t_Device *p_VspDev = NULL; + ioc_fm_vsp_params_t param; + + p_Dev = p_FmVspParams->h_Fm; + + _fml_dbg("Performing VSP Configuration...\n"); + + memset(&param, 0, sizeof(ioc_fm_vsp_params_t)); + memcpy(&param, p_FmVspParams, sizeof(t_FmVspParams)); + param.vsp_params.h_Fm = UINT_TO_PTR(p_Dev->id); + param.id = NULL; + + if (ioctl(p_Dev->fd, FM_IOC_VSP_CONFIG, &param)) { + DPAA_PMD_ERR("%s ioctl error\n", __func__); + return NULL; + } + + p_VspDev = (t_Device *)malloc(sizeof(t_Device)); + if (!p_VspDev) { + DPAA_PMD_ERR("FM VSP Params!\n"); + return NULL; + } + memset(p_VspDev, 0, sizeof(t_Device)); + p_VspDev->h_UserPriv = (t_Handle)p_Dev; + p_Dev->owners++; + p_VspDev->id = PTR_TO_UINT(param.id); + + _fml_dbg("VSP Configuration completed\n"); + + return (t_Handle)p_VspDev; +} + +uint32_t FM_VSP_Init(t_Handle h_FmVsp) +{ + t_Device *p_Dev = NULL; + t_Device *p_VspDev = (t_Device *)h_FmVsp; + ioc_fm_obj_t id; + + _fml_dbg("Calling...\n"); + + p_Dev = (t_Device *)p_VspDev->h_UserPriv; + id.obj = UINT_TO_PTR(p_VspDev->id); + + if (ioctl(p_Dev->fd, FM_IOC_VSP_INIT, &id)) { + DPAA_PMD_ERR("%s ioctl error\n", __func__); + RETURN_ERROR(MINOR, E_INVALID_OPERATION, NO_MSG); + } + + _fml_dbg("Called.\n"); + + return E_OK; +} + +uint32_t FM_VSP_Free(t_Handle h_FmVsp) +{ + t_Device *p_Dev = NULL; + t_Device *p_VspDev = (t_Device *)h_FmVsp; + ioc_fm_obj_t id; + + _fml_dbg("Calling...\n"); + + p_Dev = (t_Device *)p_VspDev->h_UserPriv; + id.obj = UINT_TO_PTR(p_VspDev->id); + + if (ioctl(p_Dev->fd, FM_IOC_VSP_FREE, &id)) { + DPAA_PMD_ERR("%s ioctl error\n", __func__); + RETURN_ERROR(MINOR, E_INVALID_OPERATION, NO_MSG); + } + + p_Dev->owners--; + free(p_VspDev); + + _fml_dbg("Called.\n"); + + return E_OK; +} + +uint32_t FM_VSP_ConfigBufferPrefixContent(t_Handle h_FmVsp, + t_FmBufferPrefixContent *p_FmBufferPrefixContent) +{ + t_Device *p_Dev = NULL; + t_Device *p_VspDev = (t_Device *)h_FmVsp; + ioc_fm_buffer_prefix_content_params_t params; + + _fml_dbg("Calling...\n"); + + p_Dev = (t_Device *)p_VspDev->h_UserPriv; + params.p_fm_vsp = UINT_TO_PTR(p_VspDev->id); + memcpy(&params.fm_buffer_prefix_content, + p_FmBufferPrefixContent, sizeof(*p_FmBufferPrefixContent)); + + if (ioctl(p_Dev->fd, FM_IOC_VSP_CONFIG_BUFFER_PREFIX_CONTENT, + &params)) { + DPAA_PMD_ERR("%s ioctl error\n", __func__); + RETURN_ERROR(MINOR, E_INVALID_OPERATION, NO_MSG); + } + + _fml_dbg("Called.\n"); + + return E_OK; +} diff --git a/drivers/net/dpaa/fmlib/fm_vsp_ext.h b/drivers/net/dpaa/fmlib/fm_vsp_ext.h new file mode 100644 index 000000000..097d25d4e --- /dev/null +++ b/drivers/net/dpaa/fmlib/fm_vsp_ext.h @@ -0,0 +1,140 @@ +/* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0) + * + * Copyright 2008-2012 Freescale Semiconductor, Inc + * Copyright 2019-2020 NXP + * + */ + +/** + @File fm_vsp_ext.h + + @Description FM Virtual Storage-Profile +*/ +#ifndef __FM_VSP_EXT_H +#define __FM_VSP_EXT_H +#include "ncsw_ext.h" +#include "fm_ext.h" +#include "net_ext.h" + +typedef struct t_FmVspParams { + t_Handle h_Fm; + /**< A handle to the FM object this VSP related to */ + t_FmExtPools extBufPools;/**< Which external buffer pools are used + (up to FM_PORT_MAX_NUM_OF_EXT_POOLS), and their sizes. + parameter associated with Rx / OP port */ + uint16_t liodnOffset; /**< VSP's LIODN offset */ + struct { + e_FmPortType portType; /**< Port type */ + uint8_t portId; /**< Port Id - relative to type */ + } portParams; + uint8_t relativeProfileId; /**< VSP Id - relative to VSP's range + defined in relevant FM object */ +} t_FmVspParams; + +typedef struct ioc_fm_vsp_params_t { + struct t_FmVspParams vsp_params; + void *id; /**< return value */ +} ioc_fm_vsp_params_t; + +typedef struct t_FmPortVSPAllocParams { + uint8_t numOfProfiles; + /**< Number of Virtual Storage Profiles; must be a power of 2 */ + uint8_t dfltRelativeId; + /**< The default Virtual-Storage-Profile-id dedicated to Rx/OP port + The same default Virtual-Storage-Profile-id will be for coupled Tx port + if relevant function called for Rx port */ +} t_FmPortVSPAllocParams; + +typedef struct ioc_fm_port_vsp_alloc_params_t { + struct t_FmPortVSPAllocParams params; + void *p_fm_tx_port; + /**< Handle to coupled Tx Port; not relevant for OP port. */ +} ioc_fm_port_vsp_alloc_params_t; + +typedef struct ioc_fm_buffer_prefix_content_t { + uint16_t priv_data_size; + /**< Number of bytes to be left at the beginning + of the external buffer; Note that the private-area will + start from the base of the buffer address. */ + bool pass_prs_result; + /**< TRUE to pass the parse result to/from the FM; + User may use FM_PORT_GetBufferPrsResult() in order to + get the parser-result from a buffer. */ + bool pass_time_stamp; + /**< TRUE to pass the timeStamp to/from the FM + User may use FM_PORT_GetBufferTimeStamp() in order to + get the parser-result from a buffer. */ + bool pass_hash_result; + /**< TRUE to pass the KG hash result to/from the FM + User may use FM_PORT_GetBufferHashResult() in order to + get the parser-result from a buffer. */ + bool pass_all_other_pcd_info; + /**< Add all other Internal-Context information: + AD, hash-result, key, etc. */ + uint16_t data_align; /**< 0 to use driver's default alignment [64], + other value for selecting a data alignment + (must be a power of 2); + if write optimization is used, must be >= 16. */ + uint8_t manip_extra_space; + /**< Maximum extra size needed + * (insertion-size minus removal-size); + * Note that this field impacts the size of the + * buffer-prefix (i.e. it pushes the data offset); + * This field is irrelevant if DPAA_VERSION==10 + */ +} ioc_fm_buffer_prefix_content_t; + +typedef struct ioc_fm_buffer_prefix_content_params_t { + void *p_fm_vsp; + ioc_fm_buffer_prefix_content_t fm_buffer_prefix_content; +} ioc_fm_buffer_prefix_content_params_t; + +uint32_t FM_PORT_VSPAlloc( + t_Handle h_FmPort, + t_FmPortVSPAllocParams *p_Params); + +t_Handle FM_VSP_Config(t_FmVspParams *p_FmVspParams); + +uint32_t FM_VSP_Init(t_Handle h_FmVsp); + +uint32_t FM_VSP_Free(t_Handle h_FmVsp); + +uint32_t FM_VSP_ConfigBufferPrefixContent(t_Handle h_FmVsp, + t_FmBufferPrefixContent *p_FmBufferPrefixContent); + +#if defined(CONFIG_COMPAT) +#define FM_PORT_IOC_VSP_ALLOC_COMPAT \ + _IOW(FM_IOC_TYPE_BASE, FM_PORT_IOC_NUM(38), ioc_compat_fm_port_vsp_alloc_params_t) +#endif +#define FM_PORT_IOC_VSP_ALLOC \ + _IOW(FM_IOC_TYPE_BASE, FM_PORT_IOC_NUM(38), ioc_fm_port_vsp_alloc_params_t) + +#if defined(CONFIG_COMPAT) +#define FM_IOC_VSP_CONFIG_COMPAT \ + _IOWR(FM_IOC_TYPE_BASE, FM_IOC_NUM(8), ioc_compat_fm_vsp_params_t) +#endif +#define FM_IOC_VSP_CONFIG \ + _IOWR(FM_IOC_TYPE_BASE, FM_IOC_NUM(8), ioc_fm_vsp_params_t) + +#if defined(CONFIG_COMPAT) +#define FM_IOC_VSP_INIT_COMPAT \ + _IOW(FM_IOC_TYPE_BASE, FM_IOC_NUM(9), ioc_compat_fm_obj_t) +#endif +#define FM_IOC_VSP_INIT \ + _IOW(FM_IOC_TYPE_BASE, FM_IOC_NUM(9), ioc_fm_obj_t) + +#if defined(CONFIG_COMPAT) +#define FM_IOC_VSP_FREE_COMPAT \ + _IOW(FM_IOC_TYPE_BASE, FM_IOC_NUM(10), ioc_compat_fm_obj_t) +#endif +#define FM_IOC_VSP_FREE \ + _IOW(FM_IOC_TYPE_BASE, FM_IOC_NUM(10), ioc_fm_obj_t) + +#if defined(CONFIG_COMPAT) +#define FM_IOC_VSP_CONFIG_BUFFER_PREFIX_CONTENT_COMPAT \ + _IOW(FM_IOC_TYPE_BASE, FM_IOC_NUM(12), ioc_compat_fm_buffer_prefix_content_params_t) +#endif +#define FM_IOC_VSP_CONFIG_BUFFER_PREFIX_CONTENT \ + _IOW(FM_IOC_TYPE_BASE, FM_IOC_NUM(12), ioc_fm_buffer_prefix_content_params_t) + +#endif /* __FM_VSP_EXT_H */ diff --git a/drivers/net/dpaa/meson.build b/drivers/net/dpaa/meson.build index 67803cd34..94d509528 100644 --- a/drivers/net/dpaa/meson.build +++ b/drivers/net/dpaa/meson.build @@ -9,6 +9,7 @@ deps += ['mempool_dpaa'] sources = files('dpaa_ethdev.c', 'fmlib/fm_lib.c', + 'fmlib/fm_vsp.c', 'dpaa_rxtx.c') if cc.has_argument('-Wno-pointer-arith')

[16/37] net/dpaa: add VSP support in FMLIB

Commit Message

Patch