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

Commit ed19231c authored by Jacob Keller's avatar Jacob Keller Committed by Jeff Kirsher
Browse files

ixgbe: add ixgbe_write_pci_cfg_word with ixgbe_removed check 



Inline with the current use for ixgbe_read_pci_cfg_word, create a
similar function for writing PCI config, which checks whether the
adapter has been removed first, if Live Error Recovery has been enabled.

Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 0c375ac1

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

+1 −5
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ static s32 ixgbe_read_i2c_eeprom_82598(struct ixgbe_hw *hw, u8 byte_offset, 
 **/

static void ixgbe_set_pcie_completion_timeout(struct ixgbe_hw *hw)

{

	struct ixgbe_adapter *adapter = hw->back;

	u32 gcr = IXGBE_READ_REG(hw, IXGBE_GCR);

	u16 pcie_devctl2;
@@ -84,11 +83,8 @@ static void ixgbe_set_pcie_completion_timeout(struct ixgbe_hw *hw) 
	 * 16ms to 55ms

	 */

	pcie_devctl2 = ixgbe_read_pci_cfg_word(hw, IXGBE_PCI_DEVICE_CONTROL2);

	if (ixgbe_removed(hw->hw_addr))

		return;

	pcie_devctl2 |= IXGBE_PCI_DEVICE_CONTROL2_16ms;

	pci_write_config_word(adapter->pdev,

	                      IXGBE_PCI_DEVICE_CONTROL2, pcie_devctl2);

	ixgbe_write_pci_cfg_word(hw, IXGBE_PCI_DEVICE_CONTROL2, pcie_devctl2);

out:

	/* disable completion timeout resend */

	gcr &= ~IXGBE_GCR_CMPL_TMOUT_RESEND;

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

+1 −0
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ s32 ixgbe_init_thermal_sensor_thresh_generic(struct ixgbe_hw *hw); 
#define IXGBE_FAILED_READ_CFG_WORD 0xffffU



u16 ixgbe_read_pci_cfg_word(struct ixgbe_hw *hw, u32 reg);

void ixgbe_write_pci_cfg_word(struct ixgbe_hw *hw, u32 reg, u16 value);



static inline bool ixgbe_removed(void __iomem *addr)

{

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

+9 −0
Original line number Diff line number Diff line
@@ -361,6 +361,15 @@ static u32 ixgbe_read_pci_cfg_dword(struct ixgbe_hw *hw, u32 reg) 
}

#endif /* CONFIG_PCI_IOV */



void ixgbe_write_pci_cfg_word(struct ixgbe_hw *hw, u32 reg, u16 value)

{

	struct ixgbe_adapter *adapter = hw->back;



	if (ixgbe_removed(hw->hw_addr))

		return;

	pci_write_config_word(adapter->pdev, reg, value);

}



static void ixgbe_service_event_complete(struct ixgbe_adapter *adapter)

{

	BUG_ON(!test_bit(__IXGBE_SERVICE_SCHED, &adapter->state));