diff options
author | Carolyn Wyborny <carolyn.wyborny@intel.com> | 2014-07-09 00:55:45 -0400 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2014-07-24 06:00:37 -0400 |
commit | 1516f0a6492a3d1bd9fbebeac331950986ec9a9b (patch) | |
tree | 358c2635502a5721cd44bb7e8c6a7df9c0b0475b /drivers/net/ethernet/intel/igb | |
parent | caafb95d6952c4c977c1b9ddf32bb56bfcda8059 (diff) |
igb: Add message when malformed packets detected by hw
This patch adds a check and prints the error cause register value when
the hardware detects a malformed packet. This is a very unlikely
scenario but has been seen occasionally, so printing the message to
assist the user.
Signed-off-by: Carolyn Wyborny <carolyn.wyborny@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/igb')
-rw-r--r-- | drivers/net/ethernet/intel/igb/e1000_regs.h | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/igb/igb_main.c | 25 |
2 files changed, 26 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/igb/e1000_regs.h b/drivers/net/ethernet/intel/igb/e1000_regs.h index f5ba4e4eafb9..6f0490d0e981 100644 --- a/drivers/net/ethernet/intel/igb/e1000_regs.h +++ b/drivers/net/ethernet/intel/igb/e1000_regs.h | |||
@@ -355,6 +355,7 @@ | |||
355 | #define E1000_UTA 0x0A000 /* Unicast Table Array - RW */ | 355 | #define E1000_UTA 0x0A000 /* Unicast Table Array - RW */ |
356 | #define E1000_IOVTCL 0x05BBC /* IOV Control Register */ | 356 | #define E1000_IOVTCL 0x05BBC /* IOV Control Register */ |
357 | #define E1000_TXSWC 0x05ACC /* Tx Switch Control */ | 357 | #define E1000_TXSWC 0x05ACC /* Tx Switch Control */ |
358 | #define E1000_LVMMC 0x03548 /* Last VM Misbehavior cause */ | ||
358 | /* These act per VF so an array friendly macro is used */ | 359 | /* These act per VF so an array friendly macro is used */ |
359 | #define E1000_P2VMAILBOX(_n) (0x00C00 + (4 * (_n))) | 360 | #define E1000_P2VMAILBOX(_n) (0x00C00 + (4 * (_n))) |
360 | #define E1000_VMBMEM(_n) (0x00800 + (64 * (_n))) | 361 | #define E1000_VMBMEM(_n) (0x00800 + (64 * (_n))) |
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index 4d2dc17fd31b..bd8de67c17a9 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c | |||
@@ -4167,6 +4167,26 @@ static bool igb_thermal_sensor_event(struct e1000_hw *hw, u32 event) | |||
4167 | } | 4167 | } |
4168 | 4168 | ||
4169 | /** | 4169 | /** |
4170 | * igb_check_lvmmc - check for malformed packets received | ||
4171 | * and indicated in LVMMC register | ||
4172 | * @adapter: pointer to adapter | ||
4173 | **/ | ||
4174 | static void igb_check_lvmmc(struct igb_adapter *adapter) | ||
4175 | { | ||
4176 | struct e1000_hw *hw = &adapter->hw; | ||
4177 | u32 lvmmc; | ||
4178 | |||
4179 | lvmmc = rd32(E1000_LVMMC); | ||
4180 | if (lvmmc) { | ||
4181 | if (unlikely(net_ratelimit())) { | ||
4182 | netdev_warn(adapter->netdev, | ||
4183 | "malformed Tx packet detected and dropped, LVMMC:0x%08x\n", | ||
4184 | lvmmc); | ||
4185 | } | ||
4186 | } | ||
4187 | } | ||
4188 | |||
4189 | /** | ||
4170 | * igb_watchdog - Timer Call-back | 4190 | * igb_watchdog - Timer Call-back |
4171 | * @data: pointer to adapter cast into an unsigned long | 4191 | * @data: pointer to adapter cast into an unsigned long |
4172 | **/ | 4192 | **/ |
@@ -4361,6 +4381,11 @@ static void igb_watchdog_task(struct work_struct *work) | |||
4361 | igb_spoof_check(adapter); | 4381 | igb_spoof_check(adapter); |
4362 | igb_ptp_rx_hang(adapter); | 4382 | igb_ptp_rx_hang(adapter); |
4363 | 4383 | ||
4384 | /* Check LVMMC register on i350/i354 only */ | ||
4385 | if ((adapter->hw.mac.type == e1000_i350) || | ||
4386 | (adapter->hw.mac.type == e1000_i354)) | ||
4387 | igb_check_lvmmc(adapter); | ||
4388 | |||
4364 | /* Reset the timer */ | 4389 | /* Reset the timer */ |
4365 | if (!test_bit(__IGB_DOWN, &adapter->state)) { | 4390 | if (!test_bit(__IGB_DOWN, &adapter->state)) { |
4366 | if (adapter->flags & IGB_FLAG_NEED_LINK_UPDATE) | 4391 | if (adapter->flags & IGB_FLAG_NEED_LINK_UPDATE) |