Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b12babd4 authored by Mark Rustad's avatar Mark Rustad Committed by David S. Miller
Browse files

ixgbe: Check for adapter removal on register writes 



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: default avatarMark Rustad <mark.d.rustad@intel.com>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2a1a091c

drivers/net/ethernet/intel/ixgbe/ixgbe_common.h

+10 −2
Original line number Diff line number Diff line
@@ -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)

{

	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))
@@ -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)

{

	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))

drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c

+1 −2
Original line number Diff line number Diff line
@@ -27,8 +27,7 @@ 


#include <linux/pci.h>

#include <linux/delay.h>

#include "ixgbe_type.h"

#include "ixgbe_common.h"

#include "ixgbe.h"

#include "ixgbe_mbx.h"



/**

drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#include <linux/delay.h>

#include <linux/sched.h>



#include "ixgbe_common.h"

#include "ixgbe.h"

#include "ixgbe_phy.h"



static void ixgbe_i2c_start(struct ixgbe_hw *hw);