From: Zhu Yanjun <zyjzyj2...@gmail.com>
When the fiber tranceiver is plugged/unplugged, a netdev notifier is
sent. The userspace tools or kernel can receive this notifier.
Signed-off-by: Zhu Yanjun <zyjzyj2...@gmail.com>
---
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 26 ++++++++++++++++++++++++-
drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 3 +++
include/linux/netdevice.h | 2 ++
3 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index cb19cbc..df0eed3 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -5635,6 +5635,8 @@ static int ixgbe_sw_init(struct ixgbe_adapter *adapter)
hw->revision_id = pdev->revision;
hw->subsystem_vendor_id = pdev->subsystem_vendor;
hw->subsystem_device_id = pdev->subsystem_device;
+ hw->last_tranceiver_status = IXGBE_NOT_IMPLEMENTED;
+ hw->tranceiver_polltime = 0;
/* Set common capability flags and settings */
rss = min_t(int, ixgbe_max_rss_indices(adapter), num_online_cpus());
@@ -7067,7 +7069,25 @@ static void ixgbe_watchdog_subtask(struct ixgbe_adapter
*adapter)
static void ixgbe_sfp_detection_subtask(struct ixgbe_adapter *adapter)
{
struct ixgbe_hw *hw = &adapter->hw;
- s32 err;
+ s32 err, status;
+
+ if ((hw->mac.ops.get_media_type(hw) == ixgbe_media_type_fiber) &&
+ time_after(jiffies, hw->tranceiver_polltime)) {
+ u8 identifier;
+
+ status = hw->phy.ops.read_i2c_eeprom(hw,
+ 0x0,
+ &identifier);
+ if ((status != hw->last_tranceiver_status) && status) {
+ hw->phy.sfp_type = ixgbe_sfp_type_not_present;
+ rtnl_lock();
+ call_netdevice_notifiers(NETDEV_FIBER_TRANCEIVER_UNPLUG,
+ adapter->netdev);
+ rtnl_unlock();
+ }
+ hw->last_tranceiver_status = status;
+ hw->tranceiver_polltime = jiffies + 3 * HZ;
+ }
/* If crosstalk fix enabled verify the SFP+ cage is full */
if (adapter->need_crosstalk_fix) {
@@ -7130,6 +7150,10 @@ static void ixgbe_sfp_detection_subtask(struct
ixgbe_adapter *adapter)
adapter->flags |= IXGBE_FLAG_NEED_LINK_CONFIG;
e_info(probe, "detected SFP+: %d\n", hw->phy.sfp_type);
+ rtnl_lock();
+ call_netdevice_notifiers(NETDEV_FIBER_TRANCEIVER_PLUG, adapter->netdev);
+ rtnl_unlock();
+
sfp_out:
clear_bit(__IXGBE_IN_SFP_INIT, &adapter->state);
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
index da3d835..0dde95c 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
@@ -3525,6 +3525,8 @@ struct ixgbe_hw {
bool force_full_reset;
bool allow_unsupported_sfp;
bool wol_enabled;
+ s32 last_tranceiver_status;
+ unsigned long tranceiver_polltime;
};
struct ixgbe_info {
@@ -3574,6 +3576,7 @@ struct ixgbe_info {
#define IXGBE_ERR_FDIR_CMD_INCOMPLETE -38
#define IXGBE_ERR_FW_RESP_INVALID -39
#define IXGBE_ERR_TOKEN_RETRY -40
+#define IXGBE_ERR_TRANCEIVER_NOT_PRESENT -41
#define IXGBE_NOT_IMPLEMENTED 0x7FFFFFFF
#define IXGBE_FUSES0_GROUP(_i) (0x11158 + ((_i) * 4))
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index d101e4d..693ba92 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -2253,6 +2253,8 @@ struct netdev_lag_lower_state_info {
#define NETDEV_CHANGELOWERSTATE 0x001B
#define NETDEV_OFFLOAD_PUSH_VXLAN 0x001C
#define NETDEV_OFFLOAD_PUSH_GENEVE 0x001D
+#define NETDEV_FIBER_TRANCEIVER_PLUG 0x001E
+#define NETDEV_FIBER_TRANCEIVER_UNPLUG 0x001F
int register_netdevice_notifier(struct notifier_block *nb);
int unregister_netdevice_notifier(struct notifier_block *nb);
--
1.7.9.5
