From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Henry Tieman <henry.w.tieman@intel.com>,
netdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com,
jogreene@redhat.com, guru.anbalagane@oracle.com,
Harshitha Ramamurthy <harshitha.ramamurthy@intel.com>,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next v2 06/19] i40e: Blink LED on 1G BaseT boards
Date: Wed, 7 Dec 2016 14:19:05 -0800 [thread overview]
Message-ID: <20161207221918.57932-7-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <20161207221918.57932-1-jeffrey.t.kirsher@intel.com>
From: Henry Tieman <henry.w.tieman@intel.com>
Before this patch "ethtool -p" was not blinking the LEDs on boards
with 1G BaseT PHYs.
This commit identifies 1G BaseT boards as having the LEDs connected
to the MAC. Also, renamed the flag to be more descriptive of usage.
The flag is now I40E_FLAG_PHY_CONTROLS_LEDS.
Change-ID: I4eb741da9780da7849ddf2dc4c0cb27ffa42a801
Signed-off-by: Henry Tieman <henry.w.tieman@intel.com>
Signed-off-by: Harshitha Ramamurthy <harshitha.ramamurthy@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/i40e/i40e.h | 2 +-
drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 10 +++++-----
drivers/net/ethernet/intel/i40e/i40e_main.c | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h
index 06e3c23..b8f2978 100644
--- a/drivers/net/ethernet/intel/i40e/i40e.h
+++ b/drivers/net/ethernet/intel/i40e/i40e.h
@@ -356,7 +356,7 @@ struct i40e_pf {
#define I40E_FLAG_NO_DCB_SUPPORT BIT_ULL(45)
#define I40E_FLAG_USE_SET_LLDP_MIB BIT_ULL(46)
#define I40E_FLAG_STOP_FW_LLDP BIT_ULL(47)
-#define I40E_FLAG_HAVE_10GBASET_PHY BIT_ULL(48)
+#define I40E_FLAG_PHY_CONTROLS_LEDS BIT_ULL(48)
#define I40E_FLAG_PF_MAC BIT_ULL(50)
#define I40E_FLAG_TRUE_PROMISC_SUPPORT BIT_ULL(51)
#define I40E_FLAG_HAVE_CRT_RETIMER BIT_ULL(52)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
index 76753e1..6ba0035 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
@@ -1890,7 +1890,7 @@ static int i40e_set_phys_id(struct net_device *netdev,
switch (state) {
case ETHTOOL_ID_ACTIVE:
- if (!(pf->flags & I40E_FLAG_HAVE_10GBASET_PHY)) {
+ if (!(pf->flags & I40E_FLAG_PHY_CONTROLS_LEDS)) {
pf->led_status = i40e_led_get(hw);
} else {
i40e_aq_set_phy_debug(hw, I40E_PHY_DEBUG_ALL, NULL);
@@ -1900,20 +1900,20 @@ static int i40e_set_phys_id(struct net_device *netdev,
}
return blink_freq;
case ETHTOOL_ID_ON:
- if (!(pf->flags & I40E_FLAG_HAVE_10GBASET_PHY))
+ if (!(pf->flags & I40E_FLAG_PHY_CONTROLS_LEDS))
i40e_led_set(hw, 0xf, false);
else
ret = i40e_led_set_phy(hw, true, pf->led_status, 0);
break;
case ETHTOOL_ID_OFF:
- if (!(pf->flags & I40E_FLAG_HAVE_10GBASET_PHY))
+ if (!(pf->flags & I40E_FLAG_PHY_CONTROLS_LEDS))
i40e_led_set(hw, 0x0, false);
else
ret = i40e_led_set_phy(hw, false, pf->led_status, 0);
break;
case ETHTOOL_ID_INACTIVE:
- if (!(pf->flags & I40E_FLAG_HAVE_10GBASET_PHY)) {
- i40e_led_set(hw, false, pf->led_status);
+ if (!(pf->flags & I40E_FLAG_PHY_CONTROLS_LEDS)) {
+ i40e_led_set(hw, pf->led_status, false);
} else {
ret = i40e_led_set_phy(hw, false, pf->led_status,
(pf->phy_led_val |
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index ae4a2b2..dbb854b 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -11380,8 +11380,8 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
pf->main_vsi_seid);
if ((pf->hw.device_id == I40E_DEV_ID_10G_BASE_T) ||
- (pf->hw.device_id == I40E_DEV_ID_10G_BASE_T4))
- pf->flags |= I40E_FLAG_HAVE_10GBASET_PHY;
+ (pf->hw.device_id == I40E_DEV_ID_10G_BASE_T4))
+ pf->flags |= I40E_FLAG_PHY_CONTROLS_LEDS;
if (pf->hw.device_id == I40E_DEV_ID_SFP_I_X722)
pf->flags |= I40E_FLAG_HAVE_CRT_RETIMER;
/* print a string summarizing features */
--
2.9.3
next prev parent reply other threads:[~2016-12-07 22:20 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-07 22:18 [net-next v2 00/19][pull request] 40GbE Intel Wired LAN Driver Updates 2016-12-07 Jeff Kirsher
2016-12-07 22:19 ` [net-next v2 01/19] i40e: Driver prints log message on link speed change Jeff Kirsher
2016-12-07 22:19 ` [net-next v2 02/19] i40e: simplify txd use count calculation Jeff Kirsher
2016-12-08 0:16 ` Eric Dumazet
2016-12-08 0:35 ` Duyck, Alexander H
2016-12-08 1:03 ` Eric Dumazet
2016-12-08 1:09 ` Duyck, Alexander H
2016-12-07 22:19 ` [net-next v2 03/19] i40e: restore workaround for removing default MAC filter Jeff Kirsher
2016-12-07 22:19 ` [net-next v2 04/19] i40e/i40evf: napi_poll must return the work done Jeff Kirsher
2016-12-07 22:19 ` [net-next v2 05/19] i40e: remove code to handle dev_addr specially Jeff Kirsher
2016-12-07 22:19 ` Jeff Kirsher [this message]
2016-12-07 22:19 ` [net-next v2 07/19] Changed version from 1.6.21 to 1.6.25 Jeff Kirsher
2016-12-07 22:19 ` [net-next v2 08/19] i40e: use unsigned printf format specifier for active_filters count Jeff Kirsher
2016-12-07 22:19 ` [net-next v2 09/19] i40e: Add support for 25G devices Jeff Kirsher
2016-12-07 22:19 ` [net-next v2 10/19] i40e: Add FEC for 25g Jeff Kirsher
2016-12-07 22:19 ` [net-next v2 11/19] i40e: Add functions which apply correct PHY access method for read and write operation Jeff Kirsher
2016-12-07 22:19 ` [net-next v2 12/19] i40e: lock service task correctly Jeff Kirsher
2016-12-07 22:19 ` [net-next v2 13/19] i40e: defeature support for PTP L4 frame detection on XL710 Jeff Kirsher
2016-12-07 22:19 ` [net-next v2 14/19] i40e: recalculate vsi->active_filters from hash contents Jeff Kirsher
2016-12-07 22:19 ` [net-next v2 15/19] i40e: refactor i40e_update_filter_state to avoid passing aq_err Jeff Kirsher
2016-12-07 22:19 ` [net-next v2 16/19] i40e: delete filter after adding its replacement when converting Jeff Kirsher
2016-12-07 22:19 ` [net-next v2 17/19] i40e: factor out addition/deletion of VLAN per each MAC address Jeff Kirsher
2016-12-07 22:19 ` [net-next v2 18/19] i40e: use (add|rm)_vlan_all_mac helper functions when changing PVID Jeff Kirsher
2016-12-07 22:19 ` [net-next v2 19/19] i40e: move all updates for VLAN mode into i40e_sync_vsi_filters Jeff Kirsher
2016-12-08 0:15 ` [net-next v2 00/19][pull request] 40GbE Intel Wired LAN Driver Updates 2016-12-07 David Miller
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=20161207221918.57932-7-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=davem@davemloft.net \
--cc=guru.anbalagane@oracle.com \
--cc=harshitha.ramamurthy@intel.com \
--cc=henry.w.tieman@intel.com \
--cc=jogreene@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=nhorman@redhat.com \
--cc=sassmann@redhat.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