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-dev] [PATCH v2 04/30] net/ixgbe/base: fix PHY identification for x550a
Date: Wed, 21 Dec 2016 17:47:48 +0800 [thread overview]
Message-ID: <1482313694-31602-5-git-send-email-wei.dai@intel.com> (raw)
In-Reply-To: <1482313694-31602-1-git-send-email-wei.dai@intel.com>
Method to identify the CS4223/CS4227 is incorrect and unreliable.
Provide a new register to differentiate between these PHY SKUs.
Fixes: fc0559bdb5e3 ("net/ixgbe/base: add link MAC setup for X550a SFP+")
CC: stable@dpdk.org
Signed-off-by: Wei Dai <wei.dai@intel.com>
---
drivers/net/ixgbe/base/ixgbe_phy.h | 5 +++--
drivers/net/ixgbe/base/ixgbe_x550.c | 6 +++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ixgbe/base/ixgbe_phy.h b/drivers/net/ixgbe/base/ixgbe_phy.h
index da14abc..816de36 100644
--- a/drivers/net/ixgbe/base/ixgbe_phy.h
+++ b/drivers/net/ixgbe/base/ixgbe_phy.h
@@ -92,8 +92,9 @@ POSSIBILITY OF SUCH DAMAGE.
#define IXGBE_CS4227_GLOBAL_ID_MSB 1
#define IXGBE_CS4227_SCRATCH 2
#define IXGBE_CS4227_GLOBAL_ID_VALUE 0x03E5
-#define IXGBE_CS4223_PHY_ID 0x7003 /* Quad port */
-#define IXGBE_CS4227_PHY_ID 0x3003 /* Dual port */
+#define IXGBE_CS4227_EFUSE_PDF_SKU 0x19F
+#define IXGBE_CS4223_SKU_ID 0x0010 /* Quad port */
+#define IXGBE_CS4227_SKU_ID 0x0014 /* Dual port */
#define IXGBE_CS4227_RESET_PENDING 0x1357
#define IXGBE_CS4227_RESET_COMPLETE 0x5AA5
#define IXGBE_CS4227_RETRIES 15
diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c b/drivers/net/ixgbe/base/ixgbe_x550.c
index c1fac1a..f5143f9 100644
--- a/drivers/net/ixgbe/base/ixgbe_x550.c
+++ b/drivers/net/ixgbe/base/ixgbe_x550.c
@@ -2927,8 +2927,8 @@ s32 ixgbe_setup_mac_link_sfp_x550a(struct ixgbe_hw *hw,
return IXGBE_ERR_PHY_ADDR_INVALID;
}
- /* Get external PHY device id */
- ret_val = hw->phy.ops.read_reg(hw, IXGBE_CS4227_GLOBAL_ID_MSB,
+ /* Get external PHY SKU id */
+ ret_val = hw->phy.ops.read_reg(hw, IXGBE_CS4227_EFUSE_PDF_SKU,
IXGBE_MDIO_ZERO_DEV_TYPE, ®_phy_ext);
if (ret_val != IXGBE_SUCCESS)
@@ -2937,7 +2937,7 @@ s32 ixgbe_setup_mac_link_sfp_x550a(struct ixgbe_hw *hw,
/* When configuring quad port CS4223, the MAC instance is part
* of the slice offset.
*/
- if (reg_phy_ext == IXGBE_CS4223_PHY_ID)
+ if (reg_phy_ext == IXGBE_CS4223_SKU_ID)
slice_offset = (hw->bus.lan_id +
(hw->bus.instance_id << 1)) << 12;
else
--
2.7.4
next prev parent reply other threads:[~2016-12-21 9:51 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-21 9:47 [dpdk-dev] [PATCH v2 00/30] update ixgbe shared code to version 16.11.21 Wei Dai
2016-12-21 9:47 ` [dpdk-dev] [PATCH v2 01/30] net/ixgbe/base: fix PHY reset check for x550em-ext Wei Dai
2016-12-21 9:47 ` [dpdk-dev] [PATCH v2 02/30] net/ixgbe/base: fix clearing SAN MAC address Wei Dai
2016-12-21 9:47 ` [dpdk-dev] [PATCH v2 03/30] net/ixgbe/base: use fast MDIO for non-10G devices Wei Dai
2016-12-21 9:47 ` Wei Dai [this message]
2016-12-21 9:47 ` [dpdk-dev] [PATCH v2 05/30] net/ixgbe/base: clean up X557 link status check Wei Dai
2016-12-21 9:47 ` [dpdk-dev] [PATCH v2 06/30] net/ixgbe/base: add driver version to firmware Wei Dai
2016-12-21 9:47 ` [dpdk-dev] [PATCH v2 07/30] net/ixgbe/base: store link active LED Wei Dai
2016-12-21 9:47 ` [dpdk-dev] [PATCH v2 08/30] net/ixgbe/base: cleanup X540 checksum calculation Wei Dai
2016-12-21 9:47 ` [dpdk-dev] [PATCH v2 09/30] net/ixgbe/base: enable LASI only for X552 devices Wei Dai
2016-12-21 9:47 ` [dpdk-dev] [PATCH v2 10/30] net/ixgbe/base: limit iXFI setup to " Wei Dai
2016-12-21 9:47 ` [dpdk-dev] [PATCH v2 11/30] net/ixgbe/base: fix getting PHY type for some x550 devices Wei Dai
2016-12-21 9:47 ` [dpdk-dev] [PATCH v2 12/30] net/ixgbe/base: fix SGMII link setup for M88 PHYs Wei Dai
2016-12-21 9:47 ` [dpdk-dev] [PATCH v2 13/30] net/ixgbe/base: cleanup dead EEE code Wei Dai
2016-12-21 9:47 ` [dpdk-dev] [PATCH v2 14/30] net/ixgbe/base: fix setting unsupported autoneg speeds Wei Dai
2016-12-21 9:47 ` [dpdk-dev] [PATCH v2 15/30] net/ixgbe/base: support FW commands to control some PHYs Wei Dai
2016-12-21 9:48 ` [dpdk-dev] [PATCH v2 16/30] net/ixgbe/base: use " Wei Dai
2016-12-21 9:48 ` [dpdk-dev] [PATCH v2 17/30] net/ixgbe/base: support busy SGMII register reads Wei Dai
2016-12-21 9:48 ` [dpdk-dev] [PATCH v2 18/30] net/ixgbe/base: include new speeds in VFLINK interpretation Wei Dai
2016-12-21 9:48 ` [dpdk-dev] [PATCH v2 19/30] net/ixgbe/base: limit 5Gb support to X550 devices Wei Dai
2016-12-21 9:48 ` [dpdk-dev] [PATCH v2 20/30] net/ixgbe/base: add physical layer options for FW PHY type Wei Dai
2016-12-21 9:48 ` [dpdk-dev] [PATCH v2 21/30] net/ixgbe/base: remove unneeded MAC type check Wei Dai
2016-12-21 9:48 ` [dpdk-dev] [PATCH v2 22/30] net/ixgbe/base: remove unused PHY ID Wei Dai
2016-12-21 9:48 ` [dpdk-dev] [PATCH v2 23/30] net/ixgbe/base: update FW PHY flow control Wei Dai
2016-12-21 9:48 ` [dpdk-dev] [PATCH v2 24/30] net/ixgbe/base: add EEE support for some PHYs Wei Dai
2016-12-21 9:48 ` [dpdk-dev] [PATCH v2 25/30] net/ixgbe/base: remove unused enum type Wei Dai
2016-12-21 9:48 ` [dpdk-dev] [PATCH v2 26/30] net/ixgbe/base: fix IXGBE LSWFW register Wei Dai
2016-12-21 9:48 ` [dpdk-dev] [PATCH v2 27/30] net/ixgbe/base: remove unused EEE code Wei Dai
2016-12-21 9:48 ` [dpdk-dev] [PATCH v2 28/30] net/ixgbe/base: add write flush required by Inphi PHY Wei Dai
2016-12-21 9:48 ` [dpdk-dev] [PATCH v2 29/30] net/ixgbe/base: report physical layer for SGMII PHY type Wei Dai
2016-12-21 9:48 ` [dpdk-dev] [PATCH v2 30/30] net/ixgbe/base: update shared code version to 2016.11.21 Wei Dai
2016-12-21 17:20 ` [dpdk-dev] [PATCH v2 00/30] update ixgbe shared code to version 16.11.21 Ferruh Yigit
2016-12-22 2:35 ` 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=1482313694-31602-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 \
--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).