aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/e1000e/defines.h
diff options
context:
space:
mode:
authorBruce Allan <bruce.w.allan@intel.com>2013-03-06 09:02:31 +0000
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2013-03-27 23:13:47 -0700
commitbb034512da74dce901f738f7c7cea332ff971608 (patch)
tree946c82771e4f965025e41b52cb5ec37f4860e818 /drivers/net/ethernet/intel/e1000e/defines.h
parentbnx2x: fix compilation without CONFIG_BNX2X_SRIOV (diff)
downloadlinux-dev-bb034512da74dce901f738f7c7cea332ff971608.tar.xz
linux-dev-bb034512da74dce901f738f7c7cea332ff971608.zip
e1000e: additional error handling on PHY register accesses
PHY reads/writes via the MDIC register could potentially return results from a previous PHY register access. If that happens, the offset in the returned results will be that of the previous access and if that is different from the expected offset, log a debug message and error out. Signed-off-by: Bruce Allan <bruce.w.allan@intel.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e/defines.h')
-rw-r--r--drivers/net/ethernet/intel/e1000e/defines.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/defines.h b/drivers/net/ethernet/intel/e1000e/defines.h
index b7c664f2a95f..a6aeb195390f 100644
--- a/drivers/net/ethernet/intel/e1000e/defines.h
+++ b/drivers/net/ethernet/intel/e1000e/defines.h
@@ -788,6 +788,7 @@
GG82563_REG(194, 18) /* Inband Control */
/* MDI Control */
+#define E1000_MDIC_REG_MASK 0x001F0000
#define E1000_MDIC_REG_SHIFT 16
#define E1000_MDIC_PHY_SHIFT 21
#define E1000_MDIC_OP_WRITE 0x04000000