This patch adds the check for the valitity of timestamp offload. Signed-off-by: Huisong Li <lihuis...@huawei.com> Signed-off-by: Dongdong Liu <liudongdo...@huawei.com> --- lib/ethdev/rte_ethdev.c | 57 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-)
diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index 0840d2b594..77fa71047a 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -5996,6 +5996,34 @@ rte_eth_dev_set_mc_addr_list(uint16_t port_id, return ret; } +static int +rte_eth_timestamp_offload_valid(struct rte_eth_dev *dev) +{ + struct rte_eth_dev_info dev_info; + struct rte_eth_rxmode *rxmode; + int ret; + + ret = rte_eth_dev_info_get(dev->data->port_id, &dev_info); + if (ret != 0) { + RTE_ETHDEV_LOG(ERR, "Cannot get port (%u) device information.\n", + dev->data->port_id); + return ret; + } + + if ((dev_info.rx_offload_capa & RTE_ETH_RX_OFFLOAD_TIMESTAMP) == 0) { + RTE_ETHDEV_LOG(ERR, "Driver does not support PTP.\n"); + return -ENOTSUP; + } + + rxmode = &dev->data->dev_conf.rxmode; + if ((rxmode->offloads & RTE_ETH_RX_OFFLOAD_TIMESTAMP) == 0) { + RTE_ETHDEV_LOG(ERR, "Please enable 'RTE_ETH_RX_OFFLOAD_TIMESTAMP' offload.\n"); + return -EINVAL; + } + + return 0; +} + int rte_eth_timesync_enable(uint16_t port_id) { @@ -6005,6 +6033,10 @@ rte_eth_timesync_enable(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; + ret = rte_eth_timestamp_offload_valid(dev); + if (ret != 0) + return ret; + if (*dev->dev_ops->timesync_enable == NULL) return -ENOTSUP; ret = eth_err(port_id, (*dev->dev_ops->timesync_enable)(dev)); @@ -6023,6 +6055,10 @@ rte_eth_timesync_disable(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; + ret = rte_eth_timestamp_offload_valid(dev); + if (ret != 0) + return ret; + if (*dev->dev_ops->timesync_disable == NULL) return -ENOTSUP; ret = eth_err(port_id, (*dev->dev_ops->timesync_disable)(dev)); @@ -6049,6 +6085,10 @@ rte_eth_timesync_read_rx_timestamp(uint16_t port_id, struct timespec *timestamp, return -EINVAL; } + ret = rte_eth_timestamp_offload_valid(dev); + if (ret != 0) + return ret; + if (*dev->dev_ops->timesync_read_rx_timestamp == NULL) return -ENOTSUP; @@ -6078,9 +6118,12 @@ rte_eth_timesync_read_tx_timestamp(uint16_t port_id, return -EINVAL; } + ret = rte_eth_timestamp_offload_valid(dev); + if (ret != 0) + return ret; + if (*dev->dev_ops->timesync_read_tx_timestamp == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->timesync_read_tx_timestamp) (dev, timestamp)); @@ -6099,6 +6142,10 @@ rte_eth_timesync_adjust_time(uint16_t port_id, int64_t delta) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; + ret = rte_eth_timestamp_offload_valid(dev); + if (ret != 0) + return ret; + if (*dev->dev_ops->timesync_adjust_time == NULL) return -ENOTSUP; ret = eth_err(port_id, (*dev->dev_ops->timesync_adjust_time)(dev, delta)); @@ -6124,6 +6171,10 @@ rte_eth_timesync_read_time(uint16_t port_id, struct timespec *timestamp) return -EINVAL; } + ret = rte_eth_timestamp_offload_valid(dev); + if (ret != 0) + return ret; + if (*dev->dev_ops->timesync_read_time == NULL) return -ENOTSUP; ret = eth_err(port_id, (*dev->dev_ops->timesync_read_time)(dev, @@ -6150,6 +6201,10 @@ rte_eth_timesync_write_time(uint16_t port_id, const struct timespec *timestamp) return -EINVAL; } + ret = rte_eth_timestamp_offload_valid(dev); + if (ret != 0) + return ret; + if (*dev->dev_ops->timesync_write_time == NULL) return -ENOTSUP; ret = eth_err(port_id, (*dev->dev_ops->timesync_write_time)(dev, -- 2.33.0