From: Wei Dai <wei.dai@intel.com>
To: dev@dpdk.org
Cc: helin.zhang@intel.com, konstantin.ananyev@intel.com,
Wei Dai <wei.dai@intel.com>,
stable@dpdk.org
Subject: [dpdk-stable] [PATCH v2 01/30] net/ixgbe/base: fix PHY reset check for x550em-ext
Date: Wed, 21 Dec 2016 17:47:45 +0800 [thread overview]
Message-ID: <1482313694-31602-2-git-send-email-wei.dai@intel.com> (raw)
In-Reply-To: <1482313694-31602-1-git-send-email-wei.dai@intel.com>
PHY type ixgbe_phy_x550em_ext_t requires different check
to verify reset status.
Fixes: af75078fece3 ("first public release")
CC: stable@dpdk.org
Signed-off-by: Wei Dai <wei.dai@intel.com>
---
drivers/net/ixgbe/base/ixgbe_phy.c | 29 ++++++++++++++++++++++++-----
1 file changed, 24 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ixgbe/base/ixgbe_phy.c b/drivers/net/ixgbe/base/ixgbe_phy.c
index 43c55d7..1d9fb3e 100644
--- a/drivers/net/ixgbe/base/ixgbe_phy.c
+++ b/drivers/net/ixgbe/base/ixgbe_phy.c
@@ -528,11 +528,30 @@ s32 ixgbe_reset_phy_generic(struct ixgbe_hw *hw)
*/
for (i = 0; i < 30; i++) {
msec_delay(100);
- hw->phy.ops.read_reg(hw, IXGBE_MDIO_PHY_XS_CONTROL,
- IXGBE_MDIO_PHY_XS_DEV_TYPE, &ctrl);
- if (!(ctrl & IXGBE_MDIO_PHY_XS_RESET)) {
- usec_delay(2);
- break;
+ if (hw->phy.type == ixgbe_phy_x550em_ext_t) {
+ status = hw->phy.ops.read_reg(hw,
+ IXGBE_MDIO_TX_VENDOR_ALARMS_3,
+ IXGBE_MDIO_PMA_PMD_DEV_TYPE,
+ &ctrl);
+ if (status != IXGBE_SUCCESS)
+ return status;
+
+ if (ctrl & IXGBE_MDIO_TX_VENDOR_ALARMS_3_RST_MASK) {
+ usec_delay(2);
+ break;
+ }
+ } else {
+ status = hw->phy.ops.read_reg(hw,
+ IXGBE_MDIO_PHY_XS_CONTROL,
+ IXGBE_MDIO_PHY_XS_DEV_TYPE,
+ &ctrl);
+ if (status != IXGBE_SUCCESS)
+ return status;
+
+ if (!(ctrl & IXGBE_MDIO_PHY_XS_RESET)) {
+ usec_delay(2);
+ break;
+ }
}
}
--
2.7.4
next parent reply other threads:[~2016-12-21 9:51 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1482313694-31602-1-git-send-email-wei.dai@intel.com>
2016-12-21 9:47 ` Wei Dai [this message]
2016-12-21 9:47 ` [dpdk-stable] [PATCH v2 02/30] net/ixgbe/base: fix clearing SAN MAC address Wei Dai
2016-12-21 9:47 ` [dpdk-stable] [PATCH v2 04/30] net/ixgbe/base: fix PHY identification for x550a Wei Dai
2016-12-21 9:47 ` [dpdk-stable] [PATCH v2 11/30] net/ixgbe/base: fix getting PHY type for some x550 devices Wei Dai
2016-12-21 9:47 ` [dpdk-stable] [PATCH v2 12/30] net/ixgbe/base: fix SGMII link setup for M88 PHYs Wei Dai
2016-12-21 9:47 ` [dpdk-stable] [PATCH v2 14/30] net/ixgbe/base: fix setting unsupported autoneg speeds Wei Dai
2016-12-21 9:48 ` [dpdk-stable] [PATCH v2 26/30] net/ixgbe/base: fix IXGBE LSWFW register Wei Dai
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=1482313694-31602-2-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 \
--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).