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 21/29] net/ixgbe/base: remove unneeded MAC check
Date: Sun, 4 Dec 2016 14:31:32 +0800 [thread overview]
Message-ID: <1480833100-48545-21-git-send-email-wei.dai@intel.com> (raw)
In-Reply-To: <1480833100-48545-1-git-send-email-wei.dai@intel.com>
ixgbe_read_i2c_combined_generic_int() is only used by devices >= X550.
Set the initial value accordingly and remove the MAC check.
Signed-off-by: Wei Dai <wei.dai@intel.com>
---
drivers/net/ixgbe/base/ixgbe_phy.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/net/ixgbe/base/ixgbe_phy.c b/drivers/net/ixgbe/base/ixgbe_phy.c
index 8901fc1..209e9d0 100644
--- a/drivers/net/ixgbe/base/ixgbe_phy.c
+++ b/drivers/net/ixgbe/base/ixgbe_phy.c
@@ -113,7 +113,7 @@ s32 ixgbe_read_i2c_combined_generic_int(struct ixgbe_hw *hw, u8 addr, u16 reg,
u16 *val, bool lock)
{
u32 swfw_mask = hw->phy.phy_semaphore_mask;
- int max_retry = 10;
+ int max_retry = 3;
int retry = 0;
u8 csum_byte;
u8 high_bits;
@@ -121,8 +121,6 @@ s32 ixgbe_read_i2c_combined_generic_int(struct ixgbe_hw *hw, u8 addr, u16 reg,
u8 reg_high;
u8 csum;
- if (hw->mac.type >= ixgbe_mac_X550)
- max_retry = 3;
reg_high = ((reg >> 7) & 0xFE) | 1; /* Indicate read combined */
csum = ixgbe_ones_comp_byte_add(reg_high, reg & 0xFF);
csum = ~csum;
--
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 ` [dpdk-dev] [PATCH 05/29] net/ixgbe/base: clean up X557 link status check Wei Dai
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 ` Wei Dai [this message]
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-21-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).