Commit 34b41577 authored by Piotr Kwapulinski's avatar Piotr Kwapulinski Committed by Tony Nguyen
Browse files

ixgbe: Clean up the E610 link management related code 



Required for enabling the link management in E610 device.

Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Tested-by: default avatarBharath R <bharath.r@intel.com>
Signed-off-by: default avatarPiotr Kwapulinski <piotr.kwapulinski@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent a0834bd5

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

+11 −6
Original line number Diff line number Diff line
@@ -237,6 +237,9 @@ static int ixgbe_get_parent_bus_info(struct ixgbe_adapter *adapter) 
 * bandwidth details should be gathered from the parent bus instead of from the

 * device. Used to ensure that various locations all have the correct device ID

 * checks.

 *

 * Return: true if information should be collected from the parent bus, false

 *         otherwise

 */

static inline bool ixgbe_pcie_from_parent(struct ixgbe_hw *hw)

{
@@ -5533,7 +5536,9 @@ static void ixgbe_sfp_link_config(struct ixgbe_adapter *adapter) 
 * ixgbe_non_sfp_link_config - set up non-SFP+ link

 * @hw: pointer to private hardware struct

 *

 * Returns 0 on success, negative on failure

 * Configure non-SFP link.

 *

 * Return: 0 on success, negative on failure

 **/

static int ixgbe_non_sfp_link_config(struct ixgbe_hw *hw)

{
@@ -7222,11 +7227,11 @@ void ixgbe_update_stats(struct ixgbe_adapter *adapter) 
	for (i = 0; i < 16; i++) {

		hwstats->qptc[i] += IXGBE_READ_REG(hw, IXGBE_QPTC(i));

		hwstats->qprc[i] += IXGBE_READ_REG(hw, IXGBE_QPRC(i));

		if ((hw->mac.type == ixgbe_mac_82599EB) ||

		    (hw->mac.type == ixgbe_mac_X540) ||

		    (hw->mac.type == ixgbe_mac_X550) ||

		    (hw->mac.type == ixgbe_mac_X550EM_x) ||

		    (hw->mac.type == ixgbe_mac_x550em_a)) {

		if (hw->mac.type == ixgbe_mac_82599EB ||

		    hw->mac.type == ixgbe_mac_X540 ||

		    hw->mac.type == ixgbe_mac_X550 ||

		    hw->mac.type == ixgbe_mac_X550EM_x ||

		    hw->mac.type == ixgbe_mac_x550em_a) {

			hwstats->qbtc[i] += IXGBE_READ_REG(hw, IXGBE_QBTC_L(i));

			IXGBE_READ_REG(hw, IXGBE_QBTC_H(i)); /* to clear */

			hwstats->qbrc[i] += IXGBE_READ_REG(hw, IXGBE_QBRC_L(i));

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

+6 −6
Original line number Diff line number Diff line
@@ -3505,13 +3505,13 @@ static int ixgbe_reset_hw_X550em(struct ixgbe_hw *hw) 
	return status;

}



/** ixgbe_set_ethertype_anti_spoofing_X550 - Enable/Disable Ethertype

/** ixgbe_set_ethertype_anti_spoofing_x550 - Enable/Disable Ethertype

 *	anti-spoofing

 *  @hw:  pointer to hardware structure

 *  @enable: enable or disable switch for Ethertype anti-spoofing

 *  @vf: Virtual Function pool - VF Pool to set for Ethertype anti-spoofing

 **/

static void ixgbe_set_ethertype_anti_spoofing_X550(struct ixgbe_hw *hw,

static void ixgbe_set_ethertype_anti_spoofing_x550(struct ixgbe_hw *hw,

						   bool enable, int vf)

{

	int vf_target_reg = vf >> 3;
@@ -3527,12 +3527,12 @@ static void ixgbe_set_ethertype_anti_spoofing_X550(struct ixgbe_hw *hw, 
	IXGBE_WRITE_REG(hw, IXGBE_PFVFSPOOF(vf_target_reg), pfvfspoof);

}



/** ixgbe_set_source_address_pruning_X550 - Enable/Disbale src address pruning

/** ixgbe_set_source_address_pruning_x550 - Enable/Disable src address pruning

 *  @hw: pointer to hardware structure

 *  @enable: enable or disable source address pruning

 *  @pool: Rx pool to set source address pruning for

 **/

static void ixgbe_set_source_address_pruning_X550(struct ixgbe_hw *hw,

static void ixgbe_set_source_address_pruning_x550(struct ixgbe_hw *hw,

						  bool enable,

						  unsigned int pool)

{
@@ -3831,9 +3831,9 @@ static int ixgbe_write_phy_reg_x550a(struct ixgbe_hw *hw, u32 reg_addr, 
	.set_mac_anti_spoofing		= &ixgbe_set_mac_anti_spoofing, \

	.set_vlan_anti_spoofing		= &ixgbe_set_vlan_anti_spoofing, \

	.set_source_address_pruning	= \

				&ixgbe_set_source_address_pruning_X550, \

				&ixgbe_set_source_address_pruning_x550, \

	.set_ethertype_anti_spoofing	= \

				&ixgbe_set_ethertype_anti_spoofing_X550, \

				&ixgbe_set_ethertype_anti_spoofing_x550, \

	.disable_rx_buff		= &ixgbe_disable_rx_buff_generic, \

	.enable_rx_buff			= &ixgbe_enable_rx_buff_generic, \

	.get_thermal_sensor_data	= NULL, \