git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/virtio: add packed virtqueue defines
[dpdk.git]
/
drivers
/
net
/
e1000
/
base
/
e1000_82571.c
diff --git
a/drivers/net/e1000/base/e1000_82571.c
b/drivers/net/e1000/base/e1000_82571.c
index
5e0e43c
..
397dd94
100644
(file)
--- a/
drivers/net/e1000/base/e1000_82571.c
+++ b/
drivers/net/e1000/base/e1000_82571.c
@@
-1257,6
+1257,11
@@
STATIC s32 e1000_init_hw_82571(struct e1000_hw *hw)
*/
e1000_clear_hw_cntrs_82571(hw);
*/
e1000_clear_hw_cntrs_82571(hw);
+ /* MSI-X configure for 82574 */
+ if (mac->type == e1000_82574)
+ E1000_WRITE_REG(hw, E1000_IVAR,
+ (E1000_IVAR_INT_ALLOC_VALID << 16));
+
return ret_val;
}
return ret_val;
}
@@
-1452,10
+1457,14
@@
STATIC void e1000_clear_vfta_82571(struct e1000_hw *hw)
STATIC bool e1000_check_mng_mode_82574(struct e1000_hw *hw)
{
u16 data;
STATIC bool e1000_check_mng_mode_82574(struct e1000_hw *hw)
{
u16 data;
+ s32 ret_val;
DEBUGFUNC("e1000_check_mng_mode_82574");
DEBUGFUNC("e1000_check_mng_mode_82574");
- hw->nvm.ops.read(hw, NVM_INIT_CONTROL2_REG, 1, &data);
+ ret_val = hw->nvm.ops.read(hw, NVM_INIT_CONTROL2_REG, 1, &data);
+ if (ret_val)
+ return false;
+
return (data & E1000_NVM_INIT_CTRL2_MNGM) != 0;
}
return (data & E1000_NVM_INIT_CTRL2_MNGM) != 0;
}