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

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

ixgbe: create conversion functions from link_status to bus/speed 



This patch cleans up ixgbe_get_bus_info_generic to call some conversion
functions, which are used also in a follow on patch that needs to convert
between the link_status PCIe config values into ixgbe's internal enum
representations.

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 e8710a5f

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

+32 −32
Original line number Original line Diff line number Diff line
@@ -592,6 +592,36 @@ s32 ixgbe_get_mac_addr_generic(struct ixgbe_hw *hw, u8 *mac_addr) 
	return 0;

	return 0;

}

}





enum ixgbe_bus_width ixgbe_convert_bus_width(u16 link_status)

{

	switch (link_status & IXGBE_PCI_LINK_WIDTH) {

	case IXGBE_PCI_LINK_WIDTH_1:

		return ixgbe_bus_width_pcie_x1;

	case IXGBE_PCI_LINK_WIDTH_2:

		return ixgbe_bus_width_pcie_x2;

	case IXGBE_PCI_LINK_WIDTH_4:

		return ixgbe_bus_width_pcie_x4;

	case IXGBE_PCI_LINK_WIDTH_8:

		return ixgbe_bus_width_pcie_x8;

	default:

		return ixgbe_bus_width_unknown;

	}

}



enum ixgbe_bus_speed ixgbe_convert_bus_speed(u16 link_status)

{

	switch (link_status & IXGBE_PCI_LINK_SPEED) {

	case IXGBE_PCI_LINK_SPEED_2500:

		return ixgbe_bus_speed_2500;

	case IXGBE_PCI_LINK_SPEED_5000:

		return ixgbe_bus_speed_5000;

	case IXGBE_PCI_LINK_SPEED_8000:

		return ixgbe_bus_speed_8000;

	default:

		return ixgbe_bus_speed_unknown;

	}

}



/**

/**

 *  ixgbe_get_bus_info_generic - Generic set PCI bus info

 *  ixgbe_get_bus_info_generic - Generic set PCI bus info

 *  @hw: pointer to hardware structure

 *  @hw: pointer to hardware structure
@@ -610,38 +640,8 @@ s32 ixgbe_get_bus_info_generic(struct ixgbe_hw *hw) 
	pci_read_config_word(adapter->pdev, IXGBE_PCI_LINK_STATUS,

	pci_read_config_word(adapter->pdev, IXGBE_PCI_LINK_STATUS,

	                     &link_status);

	                     &link_status);





	switch (link_status & IXGBE_PCI_LINK_WIDTH) {

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

	case IXGBE_PCI_LINK_WIDTH_1:

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

		hw->bus.width = ixgbe_bus_width_pcie_x1;

		break;

	case IXGBE_PCI_LINK_WIDTH_2:

		hw->bus.width = ixgbe_bus_width_pcie_x2;

		break;

	case IXGBE_PCI_LINK_WIDTH_4:

		hw->bus.width = ixgbe_bus_width_pcie_x4;

		break;

	case IXGBE_PCI_LINK_WIDTH_8:

		hw->bus.width = ixgbe_bus_width_pcie_x8;

		break;

	default:

		hw->bus.width = ixgbe_bus_width_unknown;

		break;

	}



	switch (link_status & IXGBE_PCI_LINK_SPEED) {

	case IXGBE_PCI_LINK_SPEED_2500:

		hw->bus.speed = ixgbe_bus_speed_2500;

		break;

	case IXGBE_PCI_LINK_SPEED_5000:

		hw->bus.speed = ixgbe_bus_speed_5000;

		break;

	case IXGBE_PCI_LINK_SPEED_8000:

		hw->bus.speed = ixgbe_bus_speed_8000;

		break;

	default:

		hw->bus.speed = ixgbe_bus_speed_unknown;

		break;

	}





	mac->ops.set_lan_id(hw);

	mac->ops.set_lan_id(hw);

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -40,6 +40,8 @@ s32 ixgbe_clear_hw_cntrs_generic(struct ixgbe_hw *hw); 
s32 ixgbe_read_pba_string_generic(struct ixgbe_hw *hw, u8 *pba_num,

s32 ixgbe_read_pba_string_generic(struct ixgbe_hw *hw, u8 *pba_num,

                                  u32 pba_num_size);

                                  u32 pba_num_size);

s32 ixgbe_get_mac_addr_generic(struct ixgbe_hw *hw, u8 *mac_addr);

s32 ixgbe_get_mac_addr_generic(struct ixgbe_hw *hw, u8 *mac_addr);

enum ixgbe_bus_width ixgbe_convert_bus_width(u16 link_status);

enum ixgbe_bus_speed ixgbe_convert_bus_speed(u16 link_status);

s32 ixgbe_get_bus_info_generic(struct ixgbe_hw *hw);

s32 ixgbe_get_bus_info_generic(struct ixgbe_hw *hw);

void ixgbe_set_lan_id_multi_port_pcie(struct ixgbe_hw *hw);

void ixgbe_set_lan_id_multi_port_pcie(struct ixgbe_hw *hw);

s32 ixgbe_stop_adapter_generic(struct ixgbe_hw *hw);

s32 ixgbe_stop_adapter_generic(struct ixgbe_hw *hw);