From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Don Skidmore <donald.c.skidmore@intel.com>,
netdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com,
jogreene@redhat.com, Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 07/18] ixgbe: Add reset for X550 device
Date: Tue, 9 Jun 2015 18:10:18 -0700 [thread overview]
Message-ID: <1433898629-76729-8-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1433898629-76729-1-git-send-email-jeffrey.t.kirsher@intel.com>
From: Don Skidmore <donald.c.skidmore@intel.com>
This patch adds a PHY reset function ixgbe_reset_phy_t_X550em. Which
allows devices that have LASI support in enable their interrupt.
Signed-off-by: Don Skidmore <donald.c.skidmore@intel.com>
Tested-by: Krishneil Singh <krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
index 3ca0777..a48134e 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
@@ -1385,6 +1385,22 @@ static s32 ixgbe_setup_internal_phy_t_x550em(struct ixgbe_hw *hw)
return ixgbe_setup_ixfi_x550em(hw, &force_speed);
}
+/** ixgbe_reset_phy_t_X550em - Performs X557 PHY reset and enables LASI
+ * @hw: pointer to hardware structure
+ **/
+static s32 ixgbe_reset_phy_t_X550em(struct ixgbe_hw *hw)
+{
+ s32 status;
+
+ status = ixgbe_reset_phy_generic(hw);
+
+ if (status)
+ return status;
+
+ /* Configure Link Status Alarm and Temperature Threshold interrupts */
+ return ixgbe_enable_lasi_ext_t_x550em(hw);
+}
+
/** ixgbe_init_phy_ops_X550em - PHY/SFP specific init
* @hw: pointer to hardware structure
*
@@ -1454,6 +1470,7 @@ static s32 ixgbe_init_phy_ops_X550em(struct ixgbe_hw *hw)
}
phy->ops.handle_lasi = ixgbe_handle_lasi_ext_t_x550em;
+ phy->ops.reset = ixgbe_reset_phy_t_X550em;
break;
default:
break;
--
2.4.2
next prev parent reply other threads:[~2015-06-10 1:10 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-10 1:10 [net-next 00/18][pull request] Intel Wired LAN Driver Updates 2015-06-09 Jeff Kirsher
2015-06-10 1:10 ` [net-next 01/18] ixgbe: add array of MAC type dependent values Jeff Kirsher
2015-06-10 1:10 ` [net-next 02/18] ixgbe: add support for WoL and autoneg FC for some X550 devices Jeff Kirsher
2015-06-10 1:10 ` [net-next 03/18] ixgbe: add define for X557 PHY ID Jeff Kirsher
2015-06-10 1:10 ` [net-next 04/18] ixgbe: Add a PHY power state method Jeff Kirsher
2015-06-10 1:10 ` [net-next 05/18] ixgbe: Restore ESDP settings after MAC reset Jeff Kirsher
2015-06-10 1:10 ` [net-next 06/18] ixgbe: add X550 support for external PHY and forced 1G/10G support Jeff Kirsher
2015-06-10 1:10 ` Jeff Kirsher [this message]
2015-06-10 1:10 ` [net-next 08/18] ixgbe: Add const string for overheat message Jeff Kirsher
2015-06-10 1:10 ` [net-next 09/18] ixgbe: add support for interrupts from X550 external PHY Jeff Kirsher
2015-06-10 1:10 ` [net-next 10/18] ixgbe: fix issue with sfp events with new X550 devices Jeff Kirsher
2015-06-10 1:10 ` [net-next 11/18] ixgbe: fix bug in not clearing counters for " Jeff Kirsher
2015-06-10 1:10 ` [net-next 12/18] ixgbe: fix X550 devices init flow Jeff Kirsher
2015-06-10 1:10 ` [net-next 13/18] ixgbe: fix X550 PHY function pointers Jeff Kirsher
2015-06-10 1:10 ` [net-next 14/18] ixgbe: Add support for another X550 device Jeff Kirsher
2015-06-10 1:10 ` [net-next 15/18] ixgbe: add link check for X550 copper Jeff Kirsher
2015-06-10 1:10 ` [net-next 16/18] ixgbe: Set lan_id before using I2C Jeff Kirsher
2015-06-10 1:10 ` [net-next 17/18] ixgbe: fix X550 default set_phy_power method Jeff Kirsher
2015-06-10 1:10 ` [net-next 18/18] ixgbe: Remember to write ixfi changes after modifying Jeff Kirsher
2015-06-11 5:14 ` [net-next 00/18][pull request] Intel Wired LAN Driver Updates 2015-06-09 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=1433898629-76729-8-git-send-email-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=davem@davemloft.net \
--cc=donald.c.skidmore@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;
as well as URLs for NNTP newsgroup(s).