From: Wei Dai <wei.dai@intel.com>
To: helin.zhang@intel.com, konstantin.ananyev@intel.com
Cc: dev@dpdk.org, Wei Dai <wei.dai@intel.com>
Subject: [dpdk-dev] [PATCH 05/29] net/ixgbe/base: clean up X557 link status check
Date: Sun, 4 Dec 2016 14:31:16 +0800 [thread overview]
Message-ID: <1480833100-48545-5-git-send-email-wei.dai@intel.com> (raw)
In-Reply-To: <1480833100-48545-1-git-send-email-wei.dai@intel.com>
This patch cleans up the code and clarifies the comment around
the X557 PHY link status check in ixgbe_check_link_t_x550em( ).
Signed-off-by: Wei Dai <wei.dai@intel.com>
---
drivers/net/ixgbe/base/ixgbe_x550.c | 25 +++++++++++--------------
1 file changed, 11 insertions(+), 14 deletions(-)
diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c b/drivers/net/ixgbe/base/ixgbe_x550.c
index f5143f9..69aa9d5 100644
--- a/drivers/net/ixgbe/base/ixgbe_x550.c
+++ b/drivers/net/ixgbe/base/ixgbe_x550.c
@@ -4660,7 +4660,7 @@ s32 ixgbe_check_link_t_X550em(struct ixgbe_hw *hw, ixgbe_link_speed *speed,
bool *link_up, bool link_up_wait_to_complete)
{
u32 status;
- u16 autoneg_status;
+ u16 i, autoneg_status = 0;
if (hw->mac.ops.get_media_type(hw) != ixgbe_media_type_copper)
return IXGBE_ERR_CONFIG;
@@ -4673,21 +4673,18 @@ s32 ixgbe_check_link_t_X550em(struct ixgbe_hw *hw, ixgbe_link_speed *speed,
return status;
/* MAC link is up, so check external PHY link.
- * Read this twice back to back to indicate current status.
+ * X557 PHY. Link status is latching low, and can only be used to detect
+ * link drop, and not the current status of the link without performing
+ * back-to-back reads.
*/
- status = hw->phy.ops.read_reg(hw, IXGBE_MDIO_AUTO_NEG_STATUS,
- IXGBE_MDIO_AUTO_NEG_DEV_TYPE,
- &autoneg_status);
-
- if (status != IXGBE_SUCCESS)
- return status;
-
- status = hw->phy.ops.read_reg(hw, IXGBE_MDIO_AUTO_NEG_STATUS,
- IXGBE_MDIO_AUTO_NEG_DEV_TYPE,
- &autoneg_status);
+ for (i = 0; i < 2; i++) {
+ status = hw->phy.ops.read_reg(hw, IXGBE_MDIO_AUTO_NEG_STATUS,
+ IXGBE_MDIO_AUTO_NEG_DEV_TYPE,
+ &autoneg_status);
- if (status != IXGBE_SUCCESS)
- return status;
+ if (status != IXGBE_SUCCESS)
+ return status;
+ }
/* If external PHY link is not up, then indicate link not up */
if (!(autoneg_status & IXGBE_MDIO_AUTO_NEG_LINK_STATUS))
--
2.7.4
next prev parent reply other threads:[~2016-12-04 6:35 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-04 6:31 [dpdk-dev] [PATCH 01/29] net/ixgbe/base: fix check for PHY reset Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 02/29] net/ixgbe/base: fix condition to clear RAR entry Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 03/29] net/ixgbe/base: use fast MDIO for non-10G MDIO devices Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 04/29] net/ixgbe/base: fix PHY identification Wei Dai
2016-12-04 6:31 ` Wei Dai [this message]
2016-12-04 6:31 ` [dpdk-dev] [PATCH 06/29] net/ixgbe/base: add driver version to firmware Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 07/29] net/ixgbe/base: add support to store LED link active Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 08/29] net/ixgbe/base: cleanup logic in X540 checksum calculation Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 09/29] net/ixgbe/base: enable LASI interrupts only for X552 devices Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 10/29] net/ixgbe/base: add X552 MAC check for iXFI flows Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 11/29] net/ixgbe/base: fix getting phy type Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 12/29] net/ixgbe/base: fix SGMII link setup for M88 PHYs Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 13/29] net/ixgbe/base: cleanup dead EEE code Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 14/29] net/ixgbe/base: update setup PHY link to unset all speeds Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 15/29] net/ixgbe/base: support FW commands to control some PHYs Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 16/29] net/ixgbe/base: use " Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 17/29] net/ixgbe/base: support busy SGMII register reads Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 18/29] net/ixgbe/base: include new speeds in VFLINK interpretation Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 19/29] net/ixgbe/base: check only X550 devices support 5G Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 20/29] net/ixgbe/base: add physical layer options for FW PHY type Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 21/29] net/ixgbe/base: remove unneeded MAC check Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 22/29] net/ixgbe/base: remove unused PHY ID Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 23/29] net/ixgbe/base: update FW PHY flow control Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 24/29] net/ixgbe/base: add EEE support for DNL-controlled PHYs Wei Dai
2016-12-05 19:40 ` Ferruh Yigit
2016-12-21 10:17 ` Dai, Wei
2016-12-04 6:31 ` [dpdk-dev] [PATCH 25/29] net/ixgbe/base: fix incorrect IXGBE LSWFW register Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 26/29] net/ixgbe/base: remove unused old EEE code Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 27/29] net/ixgbe/base: add write flush required by Inphi Wei Dai
2016-12-05 19:40 ` Ferruh Yigit
2016-12-21 10:31 ` Dai, Wei
2016-12-04 6:31 ` [dpdk-dev] [PATCH 28/29] net/ixgbe/base: report physical layer for SGMII PHY type Wei Dai
2016-12-04 6:31 ` [dpdk-dev] [PATCH 29/29] net/ixgbe/base: update version of basical codes in README Wei Dai
2016-12-05 19:41 ` Ferruh Yigit
2016-12-17 14:39 ` Dai, Wei
2016-12-21 10:32 ` Dai, Wei
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=1480833100-48545-5-git-send-email-wei.dai@intel.com \
--to=wei.dai@intel.com \
--cc=dev@dpdk.org \
--cc=helin.zhang@intel.com \
--cc=konstantin.ananyev@intel.com \
/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).