On Tue, Mar 13, 2018 at 06:05:34PM +0000, Ferruh Yigit wrote:
> Update link status related feature document items and minor updates in
> some link status related functions.
>
> Signed-off-by: Ferruh Yigit <ferruh.yi...@intel.com>
> ---
> doc/guides/nics/features/fm10k.ini | 2 ++
> doc/guides/nics/features/fm10k_vf.ini | 2 ++
> doc/guides/nics/features/i40e_vf.ini | 1 +
> doc/guides/nics/features/igb_vf.ini | 1 +
> doc/guides/nics/features/qede.ini | 1 -
> doc/guides/nics/features/qede_vf.ini | 1 -
> doc/guides/nics/features/vhost.ini | 2 --
> doc/guides/nics/features/virtio_vec.ini | 1 +
> drivers/net/e1000/em_ethdev.c | 2 +-
> drivers/net/ena/ena_ethdev.c | 2 +-
> drivers/net/fm10k/fm10k_ethdev.c | 6 ++----
> drivers/net/i40e/i40e_ethdev_vf.c | 2 +-
> drivers/net/ixgbe/ixgbe_ethdev.c | 2 +-
> drivers/net/mlx4/mlx4_ethdev.c | 2 +-
> drivers/net/mlx5/mlx5_ethdev.c | 2 +-
> 15 files changed, 15 insertions(+), 14 deletions(-)
>
> diff --git a/doc/guides/nics/features/fm10k.ini
> b/doc/guides/nics/features/fm10k.ini
> index f0f61a7d7..58f58b99c 100644
> --- a/doc/guides/nics/features/fm10k.ini
> +++ b/doc/guides/nics/features/fm10k.ini
> @@ -5,6 +5,8 @@
> ;
> [Features]
> Speed capabilities = P
> +Link status = Y
> +Link status event = Y
> Rx interrupt = Y
> Queue start/stop = Y
> Jumbo frame = Y
> diff --git a/doc/guides/nics/features/fm10k_vf.ini
> b/doc/guides/nics/features/fm10k_vf.ini
> index 32b93df4b..44b50faa1 100644
> --- a/doc/guides/nics/features/fm10k_vf.ini
> +++ b/doc/guides/nics/features/fm10k_vf.ini
> @@ -5,6 +5,8 @@
> ;
> [Features]
> Speed capabilities = P
> +Link status = Y
> +Link status event = Y
> Rx interrupt = Y
> Queue start/stop = Y
> Jumbo frame = Y
> diff --git a/doc/guides/nics/features/i40e_vf.ini
> b/doc/guides/nics/features/i40e_vf.ini
> index 46e0d9fce..ba2d8cbe9 100644
> --- a/doc/guides/nics/features/i40e_vf.ini
> +++ b/doc/guides/nics/features/i40e_vf.ini
> @@ -5,6 +5,7 @@
> ;
> [Features]
> Rx interrupt = Y
> +Link status = Y
> Queue start/stop = Y
> Jumbo frame = Y
> Scattered Rx = Y
> diff --git a/doc/guides/nics/features/igb_vf.ini
> b/doc/guides/nics/features/igb_vf.ini
> index e641a2c97..d9653234b 100644
> --- a/doc/guides/nics/features/igb_vf.ini
> +++ b/doc/guides/nics/features/igb_vf.ini
> @@ -4,6 +4,7 @@
> ; Refer to default.ini for the full list of available PMD features.
> ;
> [Features]
> +Link status = Y
> Rx interrupt = Y
> Scattered Rx = Y
> TSO = Y
> diff --git a/doc/guides/nics/features/qede.ini
> b/doc/guides/nics/features/qede.ini
> index cbadc1949..13e34ae33 100644
> --- a/doc/guides/nics/features/qede.ini
> +++ b/doc/guides/nics/features/qede.ini
> @@ -6,7 +6,6 @@
> [Features]
> Speed capabilities = Y
> Link status = Y
> -Link status event = Y
> MTU update = Y
> Jumbo frame = Y
> Scattered Rx = Y
> diff --git a/doc/guides/nics/features/qede_vf.ini
> b/doc/guides/nics/features/qede_vf.ini
> index 18857b6e3..70071a1bd 100644
> --- a/doc/guides/nics/features/qede_vf.ini
> +++ b/doc/guides/nics/features/qede_vf.ini
> @@ -6,7 +6,6 @@
> [Features]
> Speed capabilities = Y
> Link status = Y
> -Link status event = Y
> MTU update = Y
> Jumbo frame = Y
> Scattered Rx = Y
> diff --git a/doc/guides/nics/features/vhost.ini
> b/doc/guides/nics/features/vhost.ini
> index dffd1f493..31302745a 100644
> --- a/doc/guides/nics/features/vhost.ini
> +++ b/doc/guides/nics/features/vhost.ini
> @@ -4,8 +4,6 @@
> ; Refer to default.ini for the full list of available PMD features.
> ;
> [Features]
> -Link status = Y
> -Link status event = Y
> Free Tx mbuf on demand = Y
> Queue status event = Y
> Basic stats = Y
> diff --git a/doc/guides/nics/features/virtio_vec.ini
> b/doc/guides/nics/features/virtio_vec.ini
> index c06c860d4..e60fe36ae 100644
> --- a/doc/guides/nics/features/virtio_vec.ini
> +++ b/doc/guides/nics/features/virtio_vec.ini
> @@ -6,6 +6,7 @@
> [Features]
> Speed capabilities = P
> Link status = Y
> +Link status event = Y
> Rx interrupt = Y
> Queue start/stop = Y
> Promiscuous mode = Y
> diff --git a/drivers/net/e1000/em_ethdev.c b/drivers/net/e1000/em_ethdev.c
> index 242375ff1..080df70c4 100644
> --- a/drivers/net/e1000/em_ethdev.c
> +++ b/drivers/net/e1000/em_ethdev.c
> @@ -1210,7 +1210,7 @@ eth_em_link_update(struct rte_eth_dev *dev, int
> wait_to_complete)
> link.link_autoneg = !(dev->data->dev_conf.link_speeds &
> ETH_LINK_SPEED_FIXED);
> } else if (!link_check && (link.link_status == ETH_LINK_UP)) {
> - link.link_speed = 0;
> + link.link_speed = ETH_SPEED_NUM_NONE;
> link.link_duplex = ETH_LINK_HALF_DUPLEX;
> link.link_status = ETH_LINK_DOWN;
> link.link_autoneg = ETH_LINK_FIXED;
> diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c
> index 34b2a8d78..ad4e03dba 100644
> --- a/drivers/net/ena/ena_ethdev.c
> +++ b/drivers/net/ena/ena_ethdev.c
> @@ -724,7 +724,7 @@ static int ena_link_update(struct rte_eth_dev *dev,
> {
> struct rte_eth_link *link = &dev->data->dev_link;
>
> - link->link_status = 1;
> + link->link_status = ETH_LINK_UP;
> link->link_speed = ETH_SPEED_NUM_10G;
> link->link_duplex = ETH_LINK_FULL_DUPLEX;
>
> diff --git a/drivers/net/fm10k/fm10k_ethdev.c
> b/drivers/net/fm10k/fm10k_ethdev.c
> index 94237610c..cc1a773a7 100644
> --- a/drivers/net/fm10k/fm10k_ethdev.c
> +++ b/drivers/net/fm10k/fm10k_ethdev.c
> @@ -1233,13 +1233,11 @@ fm10k_link_update(struct rte_eth_dev *dev,
> FM10K_DEV_PRIVATE_TO_INFO(dev->data->dev_private);
> PMD_INIT_FUNC_TRACE();
>
> - /* The speed is ~50Gbps per Gen3 x8 PCIe interface. For now, we
> - * leave the speed undefined since there is no 50Gbps Ethernet.
> - */
> - dev->data->dev_link.link_speed = 0;
> + dev->data->dev_link.link_speed = ETH_SPEED_NUM_50G;
> dev->data->dev_link.link_duplex = ETH_LINK_FULL_DUPLEX;
> dev->data->dev_link.link_status =
> dev_info->sm_down ? ETH_LINK_DOWN : ETH_LINK_UP;
> + dev->data->dev_link.link_autoneg = ETH_LINK_FIXED;
>
> return 0;
> }
> diff --git a/drivers/net/i40e/i40e_ethdev_vf.c
> b/drivers/net/i40e/i40e_ethdev_vf.c
> index fd003fe01..c771edde5 100644
> --- a/drivers/net/i40e/i40e_ethdev_vf.c
> +++ b/drivers/net/i40e/i40e_ethdev_vf.c
> @@ -2107,7 +2107,7 @@ i40evf_dev_link_update(struct rte_eth_dev *dev,
> new_link.link_status = vf->link_up ? ETH_LINK_UP :
> ETH_LINK_DOWN;
> new_link.link_autoneg =
> - dev->data->dev_conf.link_speeds & ETH_LINK_SPEED_FIXED;
> + !(dev->data->dev_conf.link_speeds & ETH_LINK_SPEED_FIXED);
>
> i40evf_dev_atomic_write_link_status(dev, &new_link);
>
> diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c
> b/drivers/net/ixgbe/ixgbe_ethdev.c
> index 448325857..bad83968c 100644
> --- a/drivers/net/ixgbe/ixgbe_ethdev.c
> +++ b/drivers/net/ixgbe/ixgbe_ethdev.c
> @@ -3957,7 +3957,7 @@ ixgbe_dev_link_update_share(struct rte_eth_dev *dev,
> bool autoneg = false;
>
> link.link_status = ETH_LINK_DOWN;
> - link.link_speed = 0;
> + link.link_speed = ETH_SPEED_NUM_NONE;
> link.link_duplex = ETH_LINK_HALF_DUPLEX;
> link.link_autoneg = ETH_LINK_AUTONEG;
> memset(&old, 0, sizeof(old));
> diff --git a/drivers/net/mlx4/mlx4_ethdev.c b/drivers/net/mlx4/mlx4_ethdev.c
> index fbeef16c8..beecc53ba 100644
> --- a/drivers/net/mlx4/mlx4_ethdev.c
> +++ b/drivers/net/mlx4/mlx4_ethdev.c
> @@ -710,7 +710,7 @@ mlx4_link_update(struct rte_eth_dev *dev, int
> wait_to_complete)
> }
> link_speed = ethtool_cmd_speed(&edata);
> if (link_speed == -1)
> - dev_link.link_speed = 0;
> + dev_link.link_speed = ETH_SPEED_NUM_NONE;
> else
> dev_link.link_speed = link_speed;
> dev_link.link_duplex = ((edata.duplex == DUPLEX_HALF) ?
> diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c
> index b73cb53df..de5576099 100644
> --- a/drivers/net/mlx5/mlx5_ethdev.c
> +++ b/drivers/net/mlx5/mlx5_ethdev.c
> @@ -536,7 +536,7 @@ mlx5_link_update_unlocked_gset(struct rte_eth_dev *dev,
> int wait_to_complete)
> }
> link_speed = ethtool_cmd_speed(&edata);
> if (link_speed == -1)
> - dev_link.link_speed = 0;
> + dev_link.link_speed = ETH_SPEED_NUM_NONE;
> else
> dev_link.link_speed = link_speed;
> priv->link_speed_capa = 0;
> --
> 2.13.6
Hi Ferruh,
On mlx5 this hunk is conflicts with my series [1].
Regards,
[1] https://dpdk.org/ml/archives/dev/2018-March/092495.html
--
Nélio Laranjeiro
6WIND
