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

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

ixgbe: use ixgbe_read_pci_cfg_word 



This patch replaces some direct uses of pci_read_config_word with the
protected ixgbe_read_pci_cfg_word function, which checks for whether the
adapter is removed when LER is enabled. We shouldn't use the
pci_read_config_word calls directly because of these checks.

This patch also cleans up an unnecessary save of a pointer to the mac
object, as our standard style is to just use the hw pointer.

CC: Arun Sharma <asharma@fb.com>
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 cbcc6370

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

+3 −8
Original line number Diff line number Diff line
@@ -646,20 +646,17 @@ enum ixgbe_bus_speed ixgbe_convert_bus_speed(u16 link_status) 
 **/

s32 ixgbe_get_bus_info_generic(struct ixgbe_hw *hw)

{

	struct ixgbe_adapter *adapter = hw->back;

	struct ixgbe_mac_info *mac = &hw->mac;

	u16 link_status;



	hw->bus.type = ixgbe_bus_type_pci_express;



	/* Get the negotiated link width and speed from PCI config space */

	pci_read_config_word(adapter->pdev, IXGBE_PCI_LINK_STATUS,

	                     &link_status);

	link_status = ixgbe_read_pci_cfg_word(hw, IXGBE_PCI_LINK_STATUS);



	hw->bus.width = ixgbe_convert_bus_width(link_status);

	hw->bus.speed = ixgbe_convert_bus_speed(link_status);



	mac->ops.set_lan_id(hw);

	hw->mac.ops.set_lan_id(hw);



	return 0;

}
@@ -2437,12 +2434,10 @@ void ixgbe_fc_autoneg(struct ixgbe_hw *hw) 
 **/

static u32 ixgbe_pcie_timeout_poll(struct ixgbe_hw *hw)

{

	struct ixgbe_adapter *adapter = hw->back;

	s16 devctl2;

	u32 pollcnt;



	pci_read_config_word(adapter->pdev, IXGBE_PCI_DEVICE_CONTROL2,

			     &devctl2);

	devctl2 = ixgbe_read_pci_cfg_word(hw, IXGBE_PCI_DEVICE_CONTROL2);

	devctl2 &= IXGBE_PCIDEVCTRL2_TIMEO_MASK;



	switch (devctl2) {