From: David Decotigny <david.decotigny@google.com>
To: Jeff Kirsher <jeffrey.t.kirsher@intel.com>,
Jesse Brandeburg <jesse.brandeburg@intel.com>,
Bruce Allan <bruce.w.allan@intel.com>,
Carolyn Wyborny <carolyn.wyborny@intel.com>,
Don Skidmore <donald.c.skidmore@intel.com>,
Greg Rose <gregory.v.rose@intel.com>,
Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>,
Alex Duyck <alexander.h.duyck@intel.com>,
John Ronciak <john.ronciak@intel.com>,
e1000-devel@lists.sourceforge.net, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: "David Decotigny" <david.decotigny@google.com>,
"David S. Miller" <davem@davemloft.net>,
"Eric Dumazet" <eric.dumazet@gmail.com>,
"Ian Campbell" <ian.campbell@citrix.com>,
"Paul Gortmaker" <paul.gortmaker@windriver.com>,
"Maciej Żenczykowski" <zenczykowski@gmail.com>
Subject: [PATCH net-next v2 4/4] net-e1000e: Report carrier in loopback mode
Date: Tue, 22 Nov 2011 11:23:38 -0800 [thread overview]
Message-ID: <9f22e42c3077643fe66221eb180be6e66a0ef32a.1321989502.git.david.decotigny@google.com> (raw)
In-Reply-To: <cover.1321989502.git.david.decotigny@google.com>
In-Reply-To: <cover.1321989502.git.david.decotigny@google.com>
From: Maciej Żenczykowski <zenczykowski@gmail.com>
When interface is configured in loopback mode, force carrier check
positive. This is useful when interface does not have carrier and
test puts the interface in loopback mode.
Tested: pktgen loopback on 80003ES2LAN
Signed-off-by: David Decotigny <david.decotigny@google.com>
---
drivers/net/ethernet/intel/e1000e/phy.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/drivers/net/ethernet/intel/e1000e/phy.c b/drivers/net/ethernet/intel/e1000e/phy.c
index f487a7f..9476c8f 100644
--- a/drivers/net/ethernet/intel/e1000e/phy.c
+++ b/drivers/net/ethernet/intel/e1000e/phy.c
@@ -1781,6 +1781,11 @@ s32 e1000e_phy_has_link_generic(struct e1000_hw *hw, u32 iterations,
u16 phy_reg;
int good_reads_phy_status = 0;
+ /* If loopback is enabled, we claim the link is up */
+ if ((0 == e1e_rphy(hw, PHY_CONTROL, &phy_reg))
+ && (phy_reg & MII_CR_LOOPBACK)) {
+ *success = true;
+ return 0;
}
/*
--
1.7.3.1
next prev parent reply other threads:[~2011-11-22 19:24 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-22 19:23 [PATCH net-next v2 0/4] e1000e: ethtool setfeatures fixes + loopback David Decotigny
2011-11-22 19:23 ` [PATCH net-next v2 1/4] net-e1000e: fix ethtool set_features taking new features into account too late David Decotigny
2011-11-22 19:23 ` [PATCH net-next v2 2/4] net-e1000e: ethtool loopback support David Decotigny
2011-11-22 19:23 ` [PATCH net-next v2 3/4] net-e1000e: reworked carrier detection logic David Decotigny
2011-11-22 19:23 ` David Decotigny [this message]
2011-11-22 20:46 ` [PATCH net-next v2 0/4] e1000e: ethtool setfeatures fixes + loopback Jeff Kirsher
2011-11-22 21:13 ` David Decotigny
2011-11-23 1:56 ` Maciej Żenczykowski
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=9f22e42c3077643fe66221eb180be6e66a0ef32a.1321989502.git.david.decotigny@google.com \
--to=david.decotigny@google.com \
--cc=alexander.h.duyck@intel.com \
--cc=bruce.w.allan@intel.com \
--cc=carolyn.wyborny@intel.com \
--cc=davem@davemloft.net \
--cc=donald.c.skidmore@intel.com \
--cc=e1000-devel@lists.sourceforge.net \
--cc=eric.dumazet@gmail.com \
--cc=gregory.v.rose@intel.com \
--cc=ian.campbell@citrix.com \
--cc=jeffrey.t.kirsher@intel.com \
--cc=jesse.brandeburg@intel.com \
--cc=john.ronciak@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=paul.gortmaker@windriver.com \
--cc=peter.p.waskiewicz.jr@intel.com \
--cc=zenczykowski@gmail.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
all inboxes | Powered by JetHome®