* [dpdk-stable] [PATCH] net/i40e: fix link status update
@ 2018-05-29 13:54 Fan Zhang
2018-05-29 14:47 ` Zhang, Roy Fan
0 siblings, 1 reply; 3+ messages in thread
From: Fan Zhang @ 2018-05-29 13:54 UTC (permalink / raw)
To: helin.zhang, roy.fan.zhang; +Cc: stable
This patch fixes link status update problem in interrupt mode.
Fixes: eef2daf2e199 ("net/i40e: fix link update no wait")
Cc: stable@dpdk.org
Signed-off-by: Fan Zhang <roy.fan.zhang@intel.com>
---
drivers/net/i40e/i40e_ethdev.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 7d4f1c9da..13c5d3296 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -2522,7 +2522,7 @@ i40e_dev_set_link_down(struct rte_eth_dev *dev)
}
static __rte_always_inline void
-update_link_no_wait(struct i40e_hw *hw, struct rte_eth_link *link)
+update_link_reg(struct i40e_hw *hw, struct rte_eth_link *link)
{
/* Link status registers and values*/
#define I40E_PRTMAC_LINKSTA 0x001E2420
@@ -2576,8 +2576,8 @@ update_link_no_wait(struct i40e_hw *hw, struct rte_eth_link *link)
}
static __rte_always_inline void
-update_link_wait(struct i40e_hw *hw, struct rte_eth_link *link,
- bool enable_lse)
+update_link_aq(struct i40e_hw *hw, struct rte_eth_link *link,
+ bool enable_lse, int wait_to_complete)
{
#define CHECK_INTERVAL 100 /* 100ms */
#define MAX_REPEAT_TIME 10 /* 1s (10 * 100ms) in total */
@@ -2601,7 +2601,7 @@ update_link_wait(struct i40e_hw *hw, struct rte_eth_link *link,
}
link->link_status = link_status.link_info & I40E_AQ_LINK_UP;
- if (unlikely(link->link_status != 0))
+ if (!wait_to_complete || link->link_status)
break;
rte_delay_ms(CHECK_INTERVAL);
@@ -2649,10 +2649,10 @@ i40e_dev_link_update(struct rte_eth_dev *dev,
link.link_autoneg = !(dev->data->dev_conf.link_speeds &
ETH_LINK_SPEED_FIXED);
- if (!wait_to_complete)
- update_link_no_wait(hw, &link);
+ if (!wait_to_complete && !enable_lse)
+ update_link_reg(hw, &link);
else
- update_link_wait(hw, &link, enable_lse);
+ update_link_aq(hw, &link, enable_lse, wait_to_complete);
ret = rte_eth_linkstatus_set(dev, &link);
i40e_notify_all_vfs_link_status(dev);
--
2.13.6
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [dpdk-stable] [PATCH] net/i40e: fix link status update
2018-05-29 13:54 [dpdk-stable] [PATCH] net/i40e: fix link status update Fan Zhang
@ 2018-05-29 14:47 ` Zhang, Roy Fan
0 siblings, 0 replies; 3+ messages in thread
From: Zhang, Roy Fan @ 2018-05-29 14:47 UTC (permalink / raw)
To: stable
Please ignore this patch as I accidently sent it...
Sorry for any convenience I caused.
> -----Original Message-----
> From: Zhang, Roy Fan
> Sent: Tuesday, May 29, 2018 2:55 PM
> To: Zhang, Helin <helin.zhang@intel.com>; Zhang, Roy Fan
> <roy.fan.zhang@intel.com>
> Cc: stable@dpdk.org
> Subject: [PATCH] net/i40e: fix link status update
>
> This patch fixes link status update problem in interrupt mode.
>
> Fixes: eef2daf2e199 ("net/i40e: fix link update no wait")
> Cc: stable@dpdk.org
>
> Signed-off-by: Fan Zhang <roy.fan.zhang@intel.com>
> ---
> drivers/net/i40e/i40e_ethdev.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
> index 7d4f1c9da..13c5d3296 100644
> --- a/drivers/net/i40e/i40e_ethdev.c
> +++ b/drivers/net/i40e/i40e_ethdev.c
> @@ -2522,7 +2522,7 @@ i40e_dev_set_link_down(struct rte_eth_dev
> *dev) }
>
> static __rte_always_inline void
> -update_link_no_wait(struct i40e_hw *hw, struct rte_eth_link *link)
> +update_link_reg(struct i40e_hw *hw, struct rte_eth_link *link)
> {
> /* Link status registers and values*/
> #define I40E_PRTMAC_LINKSTA 0x001E2420
> @@ -2576,8 +2576,8 @@ update_link_no_wait(struct i40e_hw *hw, struct
> rte_eth_link *link) }
>
> static __rte_always_inline void
> -update_link_wait(struct i40e_hw *hw, struct rte_eth_link *link,
> - bool enable_lse)
> +update_link_aq(struct i40e_hw *hw, struct rte_eth_link *link,
> + bool enable_lse, int wait_to_complete)
> {
> #define CHECK_INTERVAL 100 /* 100ms */
> #define MAX_REPEAT_TIME 10 /* 1s (10 * 100ms) in total */
> @@ -2601,7 +2601,7 @@ update_link_wait(struct i40e_hw *hw, struct
> rte_eth_link *link,
> }
>
> link->link_status = link_status.link_info & I40E_AQ_LINK_UP;
> - if (unlikely(link->link_status != 0))
> + if (!wait_to_complete || link->link_status)
> break;
>
> rte_delay_ms(CHECK_INTERVAL);
> @@ -2649,10 +2649,10 @@ i40e_dev_link_update(struct rte_eth_dev *dev,
> link.link_autoneg = !(dev->data->dev_conf.link_speeds &
> ETH_LINK_SPEED_FIXED);
>
> - if (!wait_to_complete)
> - update_link_no_wait(hw, &link);
> + if (!wait_to_complete && !enable_lse)
> + update_link_reg(hw, &link);
> else
> - update_link_wait(hw, &link, enable_lse);
> + update_link_aq(hw, &link, enable_lse, wait_to_complete);
>
> ret = rte_eth_linkstatus_set(dev, &link);
> i40e_notify_all_vfs_link_status(dev);
> --
> 2.13.6
^ permalink raw reply [flat|nested] 3+ messages in thread
* [dpdk-stable] [PATCH] net/i40e: fix link status update
@ 2018-05-29 16:23 Fan Zhang
0 siblings, 0 replies; 3+ messages in thread
From: Fan Zhang @ 2018-05-29 16:23 UTC (permalink / raw)
To: dev; +Cc: helin.zhang, roy.fan.zhang, qi.z.zhang, stable
This patch fixes link status update problem in interrupt mode.
Fixes: eef2daf2e199 ("net/i40e: fix link update no wait")
Cc: stable@dpdk.org
Signed-off-by: Fan Zhang <roy.fan.zhang@intel.com>
---
drivers/net/i40e/i40e_ethdev.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 7d4f1c9da..13c5d3296 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -2522,7 +2522,7 @@ i40e_dev_set_link_down(struct rte_eth_dev *dev)
}
static __rte_always_inline void
-update_link_no_wait(struct i40e_hw *hw, struct rte_eth_link *link)
+update_link_reg(struct i40e_hw *hw, struct rte_eth_link *link)
{
/* Link status registers and values*/
#define I40E_PRTMAC_LINKSTA 0x001E2420
@@ -2576,8 +2576,8 @@ update_link_no_wait(struct i40e_hw *hw, struct rte_eth_link *link)
}
static __rte_always_inline void
-update_link_wait(struct i40e_hw *hw, struct rte_eth_link *link,
- bool enable_lse)
+update_link_aq(struct i40e_hw *hw, struct rte_eth_link *link,
+ bool enable_lse, int wait_to_complete)
{
#define CHECK_INTERVAL 100 /* 100ms */
#define MAX_REPEAT_TIME 10 /* 1s (10 * 100ms) in total */
@@ -2601,7 +2601,7 @@ update_link_wait(struct i40e_hw *hw, struct rte_eth_link *link,
}
link->link_status = link_status.link_info & I40E_AQ_LINK_UP;
- if (unlikely(link->link_status != 0))
+ if (!wait_to_complete || link->link_status)
break;
rte_delay_ms(CHECK_INTERVAL);
@@ -2649,10 +2649,10 @@ i40e_dev_link_update(struct rte_eth_dev *dev,
link.link_autoneg = !(dev->data->dev_conf.link_speeds &
ETH_LINK_SPEED_FIXED);
- if (!wait_to_complete)
- update_link_no_wait(hw, &link);
+ if (!wait_to_complete && !enable_lse)
+ update_link_reg(hw, &link);
else
- update_link_wait(hw, &link, enable_lse);
+ update_link_aq(hw, &link, enable_lse, wait_to_complete);
ret = rte_eth_linkstatus_set(dev, &link);
i40e_notify_all_vfs_link_status(dev);
--
2.13.6
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-05-29 16:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-29 13:54 [dpdk-stable] [PATCH] net/i40e: fix link status update Fan Zhang
2018-05-29 14:47 ` Zhang, Roy Fan
2018-05-29 16:23 Fan Zhang
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).