> > This patch adds Forward error correction(FEC) support for ethdev. > Introduce APIs which support query and config FEC information in > hardware. > > Signed-off-by: Min Hu (Connor) <humi...@huawei.com> > Reviewed-by: Wei Hu (Xavier) <xavier.hu...@huawei.com> > Reviewed-by: Chengwen Feng <fengcheng...@huawei.com> > Reviewed-by: Chengchang Tang <tangchengch...@huawei.com> > --- > v4->v5: > Modifies FEC capa definitions using macros. > Add RTE_ prefix for public FEC mode enum. > add release notes about FEC for dpdk20_11. > > --- > v2->v3: > add function return value "-ENOTSUP" for API > > --- > doc/guides/rel_notes/release_20_11.rst | 13 +++++ > lib/librte_ethdev/rte_ethdev.c | 50 +++++++++++++++++++ > lib/librte_ethdev/rte_ethdev.h | 83 > ++++++++++++++++++++++++++++++++ > lib/librte_ethdev/rte_ethdev_core.h | 77 +++++++++++++++++++++++++++++ > lib/librte_ethdev/rte_ethdev_version.map | 5 ++ > 5 files changed, 228 insertions(+) > > diff --git a/doc/guides/rel_notes/release_20_11.rst > b/doc/guides/rel_notes/release_20_11.rst > index cc72609..e4f0587 100644 > --- a/doc/guides/rel_notes/release_20_11.rst > +++ b/doc/guides/rel_notes/release_20_11.rst > @@ -55,6 +55,19 @@ New Features > Also, make sure to start the actual text at the margin. > ======================================================= > > +* **Added the FEC Library, a generic FEC query and config library.** > + > + Added the FEC library which provides an API for query FEC capabilities and > + FEC mode from device. Also, API for configuring FEC mode is also provided. > + > + Added hns3 FEC PMD, for supporting query and config FEC mode. > + > +* **Updated testpmd with a command for FEC.** > + > + Added a FEC command to testpmd app, > + ``show port <port_id> fec capabilities`` which queries FEC capabilities > device supports. > + ``show port <port_id> fec_mode`` which queries FEC mode from device. > + ``set port <port_id> fec_mode <auto|off|rs|baser>`` which configures FEC > mode to device. > > Removed Items > ------------- > diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c > index 7858ad5..fde77c1 100644 > --- a/lib/librte_ethdev/rte_ethdev.c > +++ b/lib/librte_ethdev/rte_ethdev.c > @@ -3642,6 +3642,56 @@ rte_eth_led_off(uint16_t port_id) > return eth_err(port_id, (*dev->dev_ops->dev_led_off)(dev)); > } > > +int > +rte_eth_fec_get_capability(uint16_t port_id, uint32_t *fec_cap) > +{ > + struct rte_eth_dev *dev; > + > + RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); > + dev = &rte_eth_devices[port_id]; > + RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fec_get_capability, -ENOTSUP); > + return eth_err(port_id, (*dev->dev_ops->fec_get_capability)(dev, > + fec_cap)); > +} > + > +int > +rte_eth_fec_get(uint16_t port_id, enum rte_fec_mode *mode) > +{ > + struct rte_eth_dev *dev; > + > + RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); > + dev = &rte_eth_devices[port_id]; > + RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fec_get, -ENOTSUP); > + return eth_err(port_id, (*dev->dev_ops->fec_get)(dev, mode)); > +} > + > +int > +rte_eth_fec_set(uint16_t port_id, enum rte_fec_mode mode) > +{ > + struct rte_eth_dev *dev; > + uint32_t fec_mode_mask; > + int ret; > + > + RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); > + > + ret = rte_eth_fec_get_capability(port_id, &fec_mode_mask); > + if (ret) > + return ret; > + > + /* > + * Check whether the configured mode is within the FEC capability. > + * If not, the configured mode will not be supported. > + */ > + if (!(fec_mode_mask & (1U << (uint32_t)mode))) { > + RTE_ETHDEV_LOG(ERR, "unsupported fec mode=%d\n", mode); > + return -EINVAL; > + } > + > + dev = &rte_eth_devices[port_id]; > + RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fec_set, -ENOTSUP); > + return eth_err(port_id, (*dev->dev_ops->fec_set)(dev, mode)); > +} > + > /* > * Returns index into MAC address array of addr. Use 00:00:00:00:00:00 to > find > * an empty spot. > diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h > index 70295d7..aa79326 100644 > --- a/lib/librte_ethdev/rte_ethdev.h > +++ b/lib/librte_ethdev/rte_ethdev.h > @@ -1511,6 +1511,25 @@ struct rte_eth_dcb_info { > struct rte_eth_dcb_tc_queue_mapping tc_queue; > }; > > +/** > + * This enum indicates the possible (forward error correction)FEC modes > + * of an ethdev port. > + */ > +enum rte_fec_mode { > + RTE_ETH_FEC_NOFEC = 0, /**< FEC is off */ > + RTE_ETH_FEC_BASER, /**< FEC using common algorithm */ > + RTE_ETH_FEC_RS, /**< FEC using RS algorithm */ > + RTE_ETH_FEC_AUTO, /**< FEC autonegotiation modes */ > + RTE_ETH_FEC_NUM
It is better not to have RTE_ETH_FEC_NUM here: Any future additions to that enum would overwrite _NUM values and would considered as ABI breakage. Aprart from that: Acked-by: Konstantin Ananyev <konstantin.anan...@intel.com> > +}; > + > +/* This indicates FEC capabilities */ > +#define RTE_ETH_FEC_CAPA_NOFEC (1U << RTE_ETH_FEC_NOFEC) > +#define RTE_ETH_FEC_CAPA_BASER (1U << RTE_ETH_FEC_BASER) > +#define RTE_ETH_FEC_CAPA_RS (1U << RTE_ETH_FEC_RS) > +#define RTE_ETH_FEC_CAPA_AUTO (1U << RTE_ETH_FEC_AUTO) > + > + > #define RTE_ETH_ALL RTE_MAX_ETHPORTS > > /* Macros to check for valid port */ > @@ -3328,6 +3347,70 @@ int rte_eth_led_on(uint16_t port_id); > int rte_eth_led_off(uint16_t port_id); > > /** > + * @warning > + * @b EXPERIMENTAL: this API may change, or be removed, without prior notice > + * > + * Get Forward Error Correction(FEC) capability. > + * > + * @param port_id > + * The port identifier of the Ethernet device. > + * @param fec_cap > + * returns the FEC capability from the device, as follows: > + * RTE_ETH_FEC_CAPA_NOFEC > + * RTE_ETH_FEC_CAPA_BASER > + * RTE_ETH_FEC_CAPA_RS > + * RTE_ETH_FEC_CAPA_AUTO > + * @return > + * - (0) if successful. > + * - (-ENOTSUP) if underlying hardware OR driver doesn't support. > + * that operation. > + * - (-EIO) if device is removed. > + * - (-ENODEV) if *port_id* invalid. > + */ > +__rte_experimental > +int rte_eth_fec_get_capability(uint16_t port_id, uint32_t *fec_cap); > + > +/** > + * @warning > + * @b EXPERIMENTAL: this API may change, or be removed, without prior notice > + * > + * Get current Forward Error Correction(FEC) mode. > + * > + * @param port_id > + * The port identifier of the Ethernet device. > + * @param mode > + * returns the FEC mode from the device. > + * @return > + * - (0) if successful. > + * - (-ENOTSUP) if underlying hardware OR driver doesn't support. > + * that operation. > + * - (-EIO) if device is removed. > + * - (-ENODEV) if *port_id* invalid. > + */ > +__rte_experimental > +int rte_eth_fec_get(uint16_t port_id, enum rte_fec_mode *mode); > + > +/** > + * @warning > + * @b EXPERIMENTAL: this API may change, or be removed, without prior notice > + * > + * Set Forward Error Correction(FEC) mode. > + * > + * @param port_id > + * The port identifier of the Ethernet device. > + * @param mode > + * the FEC mode. > + * @return > + * - (0) if successful. > + * - (-EINVAL) if the FEC mode is not valid. > + * - (-ENOTSUP) if underlying hardware OR driver doesn't support. > + * - (-EIO) if device is removed. > + * - (-ENODEV) if *port_id* invalid. > + */ > +__rte_experimental > +int rte_eth_fec_set(uint16_t port_id, enum rte_fec_mode mode); > + > +/** > * Get current status of the Ethernet link flow control for Ethernet device > * > * @param port_id > diff --git a/lib/librte_ethdev/rte_ethdev_core.h > b/lib/librte_ethdev/rte_ethdev_core.h > index 32407dd..cd1acf1 100644 > --- a/lib/librte_ethdev/rte_ethdev_core.h > +++ b/lib/librte_ethdev/rte_ethdev_core.h > @@ -604,6 +604,76 @@ typedef int (*eth_tx_hairpin_queue_setup_t) > const struct rte_eth_hairpin_conf *hairpin_conf); > > /** > + * @internal > + * Get Forward Error Correction(FEC) capability. > + * > + * @param dev > + * ethdev handle of port. > + * @param fec_cap > + * returns the FEC capability from the device. > + * > + * @return > + * Negative errno value on error, 0 on success. > + * > + * @retval 0 > + * Success, get FEC success. > + * @retval -ENOTSUP > + * operation is not supported. > + * @retval -EIO > + * device is removed. > + * @retval -ENODEV > + * Device is gone. > + */ > +typedef int (*eth_fec_get_capability_t)(struct rte_eth_dev *dev, > + uint32_t *fec_cap); > + > +/** > + * @internal > + * Get Forward Error Correction(FEC) mode. > + * > + * @param dev > + * ethdev handle of port. > + * @param mode > + * returns the FEC mode from the device. > + * > + * @return > + * Negative errno value on error, 0 on success. > + * > + * @retval 0 > + * Success, get FEC success. > + * @retval -ENOTSUP > + * operation is not supported. > + * @retval -EIO > + * device is removed. > + * @retval -ENODEV > + * Device is gone. > + */ > +typedef int (*eth_fec_get_t)(struct rte_eth_dev *dev, enum rte_fec_mode > *mode); > + > +/** > + * @internal > + * Set Forward Error Correction(FEC) mode. > + * > + * @param dev > + * ethdev handle of port. > + * @param mode > + * the FEC mode. > + * > + * @return > + * Negative errno value on error, 0 on success. > + * > + * @retval 0 > + * Success, set FEC success. > + * @retval -ENOTSUP > + * operation is not supported. > + * @retval -EIO > + * device is removed. > + * @retval -ENODEV > + * Device is gone. > + */ > +typedef int (*eth_fec_set_t)(struct rte_eth_dev *dev, enum rte_fec_mode > mode); > + > +/** > * @internal A structure containing the functions exported by an Ethernet > driver. > */ > struct eth_dev_ops { > @@ -752,6 +822,13 @@ struct eth_dev_ops { > /**< Set up device RX hairpin queue. */ > eth_tx_hairpin_queue_setup_t tx_hairpin_queue_setup; > /**< Set up device TX hairpin queue. */ > + > + eth_fec_get_capability_t fec_get_capability; > + /**< Get Forward Error Correction(FEC) capability; */ > + eth_fec_get_t fec_get; > + /**< Get Forward Error Correction(FEC) mode; */ > + eth_fec_set_t fec_set; > + /**< Set Forward Error Correction(FEC) mode; */ > }; > > /** > diff --git a/lib/librte_ethdev/rte_ethdev_version.map > b/lib/librte_ethdev/rte_ethdev_version.map > index 02081d9..9f3fb8f 100644 > --- a/lib/librte_ethdev/rte_ethdev_version.map > +++ b/lib/librte_ethdev/rte_ethdev_version.map > @@ -239,6 +239,11 @@ EXPERIMENTAL { > __rte_ethdev_trace_rx_burst; > __rte_ethdev_trace_tx_burst; > rte_flow_get_aged_flows; > + > + # added in 20.11 > + rte_eth_fec_get_capability; > + rte_eth_fec_get; > + rte_eth_fec_set; > }; > > INTERNAL { > -- > 2.7.4