leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ixgbe: Check for adapter removal on register writes

Browse Source 
Prevent writes to an adapter that has been detected as removed
by a previous failing read. This also fixes some include file
ordering confusion that this patch revealed.

Signed-off-by: Mark Rustad <mark.d.rustad@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Mark Rustad 2014-01-14 18:53:16 -08:00 committed by David S. Miller
parent 2a1a091c1f
commit b12babd4d0
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/ethernet/intel/ixgbe/ixgbe_common.h
View File

@ -135,7 +135,11 @@ void ixgbe_check_remove(struct ixgbe_hw *hw, u32 reg);
static inline void ixgbe_write_reg(struct ixgbe_hw *hw, u32 reg, u32 value) static inline void ixgbe_write_reg(struct ixgbe_hw *hw, u32 reg, u32 value)
{ {
writel(value, hw->hw_addr + reg); u8 __iomem *reg_addr = ACCESS_ONCE(hw->hw_addr);
if (ixgbe_removed(reg_addr))
return;
writel(value, reg_addr + reg);
} }
#define IXGBE_WRITE_REG(a, reg, value) ixgbe_write_reg((a), (reg), (value)) #define IXGBE_WRITE_REG(a, reg, value) ixgbe_write_reg((a), (reg), (value))
@ -150,7 +154,11 @@ static inline void writeq(u64 val, void __iomem *addr)
static inline void ixgbe_write_reg64(struct ixgbe_hw *hw, u32 reg, u64 value) static inline void ixgbe_write_reg64(struct ixgbe_hw *hw, u32 reg, u64 value)
{ {
writeq(value, hw->hw_addr + reg); u8 __iomem *reg_addr = ACCESS_ONCE(hw->hw_addr);
if (ixgbe_removed(reg_addr))
return;
writeq(value, reg_addr + reg);
} }
#define IXGBE_WRITE_REG64(a, reg, value) ixgbe_write_reg64((a), (reg), (value)) #define IXGBE_WRITE_REG64(a, reg, value) ixgbe_write_reg64((a), (reg), (value))

3
drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c
View File

@ -27,8 +27,7 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/delay.h> #include <linux/delay.h>
#include "ixgbe_type.h" #include "ixgbe.h"
#include "ixgbe_common.h"
#include "ixgbe_mbx.h" #include "ixgbe_mbx.h"
/** /**

2
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
View File

@ -29,7 +29,7 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/sched.h> #include <linux/sched.h>
#include "ixgbe_common.h" #include "ixgbe.h"
#include "ixgbe_phy.h" #include "ixgbe_phy.h"
static void ixgbe_i2c_start(struct ixgbe_hw *hw); static void ixgbe_i2c_start(struct ixgbe_hw *hw);