From: Igor Russkikh <Igor.Russkikh@aquantia.com>
To: "dev@dpdk.org" <dev@dpdk.org>
Cc: Pavel Belous <Pavel.Belous@aquantia.com>,
Igor Russkikh <Igor.Russkikh@aquantia.com>,
"stable@dpdk.org" <stable@dpdk.org>
Subject: [dpdk-dev] [PATCH v3 07/10] net/atlantic: fix link configuration
Date: Tue, 12 Mar 2019 15:25:03 +0000 [thread overview]
Message-ID: <78c4ae4e6390cc14855961faf7c8568840aad47e.1552402263.git.igor.russkikh@aquantia.com> (raw)
In-Reply-To: <cover.1552402263.git.igor.russkikh@aquantia.com>
In case link speed is re configured after port start, it does not
takes the requested speed value, but instead just sets full autoneg
mask.
Cc: stable@dpdk.org
Fixes: 7943ba05f67c ("net/atlantic: add link status and interrupt management")
Signed-off-by: Igor Russkikh <igor.russkikh@aquantia.com>
---
drivers/net/atlantic/atl_ethdev.c | 44 ++++++++++++++-----------------
1 file changed, 20 insertions(+), 24 deletions(-)
diff --git a/drivers/net/atlantic/atl_ethdev.c b/drivers/net/atlantic/atl_ethdev.c
index a510646a5f7e..e43e1e724696 100644
--- a/drivers/net/atlantic/atl_ethdev.c
+++ b/drivers/net/atlantic/atl_ethdev.c
@@ -465,8 +465,6 @@ atl_dev_start(struct rte_eth_dev *dev)
struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
uint32_t intr_vector = 0;
- uint32_t *link_speeds;
- uint32_t speed = 0;
int status;
int err;
@@ -543,6 +541,8 @@ atl_dev_start(struct rte_eth_dev *dev)
goto error;
}
+ err = atl_dev_set_link_up(dev);
+
err = hw->aq_fw_ops->update_link_status(hw);
if (err)
@@ -550,26 +550,6 @@ atl_dev_start(struct rte_eth_dev *dev)
dev->data->dev_link.link_status = hw->aq_link_status.mbps != 0;
- link_speeds = &dev->data->dev_conf.link_speeds;
-
- speed = 0x0;
-
- if (*link_speeds == ETH_LINK_SPEED_AUTONEG) {
- speed = hw->aq_nic_cfg->link_speed_msk;
- } else {
- if (*link_speeds & ETH_LINK_SPEED_10G)
- speed |= AQ_NIC_RATE_10G;
- if (*link_speeds & ETH_LINK_SPEED_5G)
- speed |= AQ_NIC_RATE_5G;
- if (*link_speeds & ETH_LINK_SPEED_1G)
- speed |= AQ_NIC_RATE_1G;
- if (*link_speeds & ETH_LINK_SPEED_2_5G)
- speed |= AQ_NIC_RATE_2G5;
- if (*link_speeds & ETH_LINK_SPEED_100M)
- speed |= AQ_NIC_RATE_100M;
- }
-
- err = hw->aq_fw_ops->set_link_speed(hw, speed);
if (err)
goto error;
@@ -657,9 +637,25 @@ static int
atl_dev_set_link_up(struct rte_eth_dev *dev)
{
struct aq_hw_s *hw = ATL_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ uint32_t link_speeds = dev->data->dev_conf.link_speeds;
+ uint32_t speed_mask = 0;
+
+ if (link_speeds == ETH_LINK_SPEED_AUTONEG) {
+ speed_mask = hw->aq_nic_cfg->link_speed_msk;
+ } else {
+ if (link_speeds & ETH_LINK_SPEED_10G)
+ speed_mask |= AQ_NIC_RATE_10G;
+ if (link_speeds & ETH_LINK_SPEED_5G)
+ speed_mask |= AQ_NIC_RATE_5G;
+ if (link_speeds & ETH_LINK_SPEED_1G)
+ speed_mask |= AQ_NIC_RATE_1G;
+ if (link_speeds & ETH_LINK_SPEED_2_5G)
+ speed_mask |= AQ_NIC_RATE_2G5;
+ if (link_speeds & ETH_LINK_SPEED_100M)
+ speed_mask |= AQ_NIC_RATE_100M;
+ }
- return hw->aq_fw_ops->set_link_speed(hw,
- hw->aq_nic_cfg->link_speed_msk);
+ return hw->aq_fw_ops->set_link_speed(hw, speed_mask);
}
/*
--
2.17.1
next prev parent reply other threads:[~2019-03-12 15:25 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-12 15:24 [dpdk-dev] [PATCH v3 00/11] net/atlantic: bugfixes and code cleanup Igor Russkikh
2019-03-12 15:24 ` [dpdk-dev] [PATCH v3 01/10] net/atlantic: fix negative error codes Igor Russkikh
2019-03-12 15:24 ` [dpdk-dev] [PATCH v3 02/10] net/atlantic: remove unused variable Igor Russkikh
2019-03-12 15:24 ` [dpdk-dev] [PATCH v3 03/10] net/atlantic: extra checks for error codes Igor Russkikh
2019-03-20 13:24 ` Ferruh Yigit
2019-03-20 13:24 ` Ferruh Yigit
2019-03-20 14:04 ` Igor Russkikh
2019-03-20 14:04 ` Igor Russkikh
2019-03-12 15:24 ` [dpdk-dev] [PATCH v3 04/10] net/atlantic: fix buffer overflow Igor Russkikh
2019-03-12 15:24 ` [dpdk-dev] [PATCH v3 05/10] net/atlantic: use EEPROM magic as a device address Igor Russkikh
2019-03-12 15:25 ` [dpdk-dev] [PATCH v3 06/10] net/atlantic: fix EEPROM get for small and uneven lengths Igor Russkikh
2019-03-12 15:25 ` Igor Russkikh [this message]
2019-03-12 15:25 ` [dpdk-dev] [PATCH v3 08/10] net/atlantic: eliminate excessive log levels on Rx/Tx Igor Russkikh
2019-03-12 15:25 ` [dpdk-dev] [PATCH v3 09/10] net/atlantic: fix missing VLAN filter offload Igor Russkikh
2019-03-12 20:03 ` Rami Rosen
2019-03-12 15:25 ` [dpdk-dev] [PATCH v3 10/10] net/atlantic: fix xstats to return correct number of items Igor Russkikh
2019-03-20 13:24 ` [dpdk-dev] [PATCH v3 00/11] net/atlantic: bugfixes and code cleanup Ferruh Yigit
2019-03-20 13:24 ` Ferruh Yigit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=78c4ae4e6390cc14855961faf7c8568840aad47e.1552402263.git.igor.russkikh@aquantia.com \
--to=igor.russkikh@aquantia.com \
--cc=Pavel.Belous@aquantia.com \
--cc=dev@dpdk.org \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).