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

Commit b776d104 authored by Emil Tantilov's avatar Emil Tantilov Committed by Jeff Kirsher
Browse files

ixgbe: make device_caps() generic 



x540 has the same device capability word in the EEPROM as 82599.
This patch renames ixgbe_get_device_caps_82599 to
ixgbe_get_device_caps_generic, moves it to ixgbe_common.h and
sets up the function pointer for x540.

Signed-off-by: default avatarEmil Tantilov <emil.s.tantilov@intel.com>
Tested-by: default avatarEvan Swanson <evan.swanson@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent a59e8a1a

drivers/net/ixgbe/ixgbe_82599.c

+1 −16
Original line number Original line Diff line number Diff line
@@ -1972,21 +1972,6 @@ static s32 ixgbe_enable_rx_dma_82599(struct ixgbe_hw *hw, u32 regval) 
	return 0;

	return 0;

}

}





/**

 *  ixgbe_get_device_caps_82599 - Get additional device capabilities

 *  @hw: pointer to hardware structure

 *  @device_caps: the EEPROM word with the extra device capabilities

 *

 *  This function will read the EEPROM location for the device capabilities,

 *  and return the word through device_caps.

 **/

static s32 ixgbe_get_device_caps_82599(struct ixgbe_hw *hw, u16 *device_caps)

{

	hw->eeprom.ops.read(hw, IXGBE_DEVICE_CAPS, device_caps);



	return 0;

}



/**

/**

 *  ixgbe_verify_fw_version_82599 - verify fw version for 82599

 *  ixgbe_verify_fw_version_82599 - verify fw version for 82599

 *  @hw: pointer to hardware structure

 *  @hw: pointer to hardware structure
@@ -2087,7 +2072,7 @@ static struct ixgbe_mac_operations mac_ops_82599 = { 
	.enable_rx_dma          = &ixgbe_enable_rx_dma_82599,

	.enable_rx_dma          = &ixgbe_enable_rx_dma_82599,

	.get_mac_addr           = &ixgbe_get_mac_addr_generic,

	.get_mac_addr           = &ixgbe_get_mac_addr_generic,

	.get_san_mac_addr       = &ixgbe_get_san_mac_addr_generic,

	.get_san_mac_addr       = &ixgbe_get_san_mac_addr_generic,

	.get_device_caps        = &ixgbe_get_device_caps_82599,

	.get_device_caps        = &ixgbe_get_device_caps_generic,

	.get_wwn_prefix         = &ixgbe_get_wwn_prefix_generic,

	.get_wwn_prefix         = &ixgbe_get_wwn_prefix_generic,

	.stop_adapter           = &ixgbe_stop_adapter_generic,

	.stop_adapter           = &ixgbe_stop_adapter_generic,

	.get_bus_info           = &ixgbe_get_bus_info_generic,

	.get_bus_info           = &ixgbe_get_bus_info_generic,

drivers/net/ixgbe/ixgbe_common.c

+15 −0
Original line number Original line Diff line number Diff line
@@ -2968,3 +2968,18 @@ void ixgbe_set_vlan_anti_spoofing(struct ixgbe_hw *hw, bool enable, int vf) 
		pfvfspoof &= ~(1 << vf_target_shift);

		pfvfspoof &= ~(1 << vf_target_shift);

	IXGBE_WRITE_REG(hw, IXGBE_PFVFSPOOF(vf_target_reg), pfvfspoof);

	IXGBE_WRITE_REG(hw, IXGBE_PFVFSPOOF(vf_target_reg), pfvfspoof);

}

}



/**

 *  ixgbe_get_device_caps_generic - Get additional device capabilities

 *  @hw: pointer to hardware structure

 *  @device_caps: the EEPROM word with the extra device capabilities

 *

 *  This function will read the EEPROM location for the device capabilities,

 *  and return the word through device_caps.

 **/

s32 ixgbe_get_device_caps_generic(struct ixgbe_hw *hw, u16 *device_caps)

{

	hw->eeprom.ops.read(hw, IXGBE_DEVICE_CAPS, device_caps);



	return 0;

}

drivers/net/ixgbe/ixgbe_common.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -90,6 +90,7 @@ s32 ixgbe_blink_led_start_generic(struct ixgbe_hw *hw, u32 index); 
s32 ixgbe_blink_led_stop_generic(struct ixgbe_hw *hw, u32 index);

s32 ixgbe_blink_led_stop_generic(struct ixgbe_hw *hw, u32 index);

void ixgbe_set_mac_anti_spoofing(struct ixgbe_hw *hw, bool enable, int pf);

void ixgbe_set_mac_anti_spoofing(struct ixgbe_hw *hw, bool enable, int pf);

void ixgbe_set_vlan_anti_spoofing(struct ixgbe_hw *hw, bool enable, int vf);

void ixgbe_set_vlan_anti_spoofing(struct ixgbe_hw *hw, bool enable, int vf);

s32 ixgbe_get_device_caps_generic(struct ixgbe_hw *hw, u16 *device_caps);





#define IXGBE_WRITE_REG(a, reg, value) writel((value), ((a)->hw_addr + (reg)))

#define IXGBE_WRITE_REG(a, reg, value) writel((value), ((a)->hw_addr + (reg)))

drivers/net/ixgbe/ixgbe_x540.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -754,7 +754,7 @@ static struct ixgbe_mac_operations mac_ops_X540 = { 
	.enable_rx_dma          = &ixgbe_enable_rx_dma_generic,

	.enable_rx_dma          = &ixgbe_enable_rx_dma_generic,

	.get_mac_addr           = &ixgbe_get_mac_addr_generic,

	.get_mac_addr           = &ixgbe_get_mac_addr_generic,

	.get_san_mac_addr       = &ixgbe_get_san_mac_addr_generic,

	.get_san_mac_addr       = &ixgbe_get_san_mac_addr_generic,

	.get_device_caps        = NULL,

	.get_device_caps        = &ixgbe_get_device_caps_generic,

	.get_wwn_prefix         = &ixgbe_get_wwn_prefix_generic,

	.get_wwn_prefix         = &ixgbe_get_wwn_prefix_generic,

	.stop_adapter           = &ixgbe_stop_adapter_generic,

	.stop_adapter           = &ixgbe_stop_adapter_generic,

	.get_bus_info           = &ixgbe_get_bus_info_generic,

	.get_bus_info           = &ixgbe_get_bus_info_generic,