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

Commit 6a14ee0c authored by Don Skidmore's avatar Don Skidmore Committed by Jeff Kirsher
Browse files

ixgbe: Add X550 support function pointers 



This patch extends the function pointer structure to include the new
X550 class MAC types. This creates a new file ixgbe_x550.c that contains
all of the new methods.  Because of similarities to the X540 part in
some cases we just use it's methods where they can be used without any
modification.  These exported functions are now defined in the new
ixgbe_x540.h file.

Signed-off-by: default avatarDon Skidmore <donald.c.skidmore@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 735c35af

drivers/net/ethernet/intel/ixgbe/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -34,7 +34,7 @@ obj-$(CONFIG_IXGBE) += ixgbe.o 




ixgbe-objs := ixgbe_main.o ixgbe_common.o ixgbe_ethtool.o \

ixgbe-objs := ixgbe_main.o ixgbe_common.o ixgbe_ethtool.o \

              ixgbe_82599.o ixgbe_82598.o ixgbe_phy.o ixgbe_sriov.o \

              ixgbe_82599.o ixgbe_82598.o ixgbe_phy.o ixgbe_sriov.o \

              ixgbe_mbx.o ixgbe_x540.o ixgbe_lib.o ixgbe_ptp.o

              ixgbe_mbx.o ixgbe_x540.o ixgbe_x550.o ixgbe_lib.o ixgbe_ptp.o





ixgbe-$(CONFIG_IXGBE_DCB) +=  ixgbe_dcb.o ixgbe_dcb_82598.o \

ixgbe-$(CONFIG_IXGBE_DCB) +=  ixgbe_dcb.o ixgbe_dcb_82598.o \

                              ixgbe_dcb_82599.o ixgbe_dcb_nl.o

                              ixgbe_dcb_82599.o ixgbe_dcb_nl.o

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -815,11 +815,15 @@ enum ixgbe_boards { 
	board_82598,

	board_82598,

	board_82599,

	board_82599,

	board_X540,

	board_X540,

	board_X550,

	board_X550EM_x,

};

};





extern struct ixgbe_info ixgbe_82598_info;

extern struct ixgbe_info ixgbe_82598_info;

extern struct ixgbe_info ixgbe_82599_info;

extern struct ixgbe_info ixgbe_82599_info;

extern struct ixgbe_info ixgbe_X540_info;

extern struct ixgbe_info ixgbe_X540_info;

extern struct ixgbe_info ixgbe_X550_info;

extern struct ixgbe_info ixgbe_X550EM_x_info;

#ifdef CONFIG_IXGBE_DCB

#ifdef CONFIG_IXGBE_DCB

extern const struct dcbnl_rtnl_ops dcbnl_ops;

extern const struct dcbnl_rtnl_ops dcbnl_ops;

#endif

#endif

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -3479,7 +3479,7 @@ static u8 ixgbe_calculate_checksum(u8 *buffer, u32 length) 
 *  Communicates with the manageability block.  On success return 0

 *  Communicates with the manageability block.  On success return 0

 *  else return IXGBE_ERR_HOST_INTERFACE_COMMAND.

 *  else return IXGBE_ERR_HOST_INTERFACE_COMMAND.

 **/

 **/

static s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, u32 *buffer,

s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, u32 *buffer,

				 u32 length, u32 timeout,

				 u32 length, u32 timeout,

				 bool return_data)

				 bool return_data)

{

{

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -110,6 +110,8 @@ 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);

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

s32 ixgbe_set_fw_drv_ver_generic(struct ixgbe_hw *hw, u8 maj, u8 min,

s32 ixgbe_set_fw_drv_ver_generic(struct ixgbe_hw *hw, u8 maj, u8 min,

				 u8 build, u8 ver);

				 u8 build, u8 ver);

s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, u32 *buffer,

				 u32 length, u32 timeout, bool return_data);

void ixgbe_clear_tx_pending(struct ixgbe_hw *hw);

void ixgbe_clear_tx_pending(struct ixgbe_hw *hw);

bool ixgbe_mng_enabled(struct ixgbe_hw *hw);

bool ixgbe_mng_enabled(struct ixgbe_hw *hw);

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

+8 −3
Original line number Original line Diff line number Diff line
@@ -84,6 +84,8 @@ static const struct ixgbe_info *ixgbe_info_tbl[] = { 
	[board_82598]		= &ixgbe_82598_info,

	[board_82598]		= &ixgbe_82598_info,

	[board_82599]		= &ixgbe_82599_info,

	[board_82599]		= &ixgbe_82599_info,

	[board_X540]		= &ixgbe_X540_info,

	[board_X540]		= &ixgbe_X540_info,

	[board_X550]		= &ixgbe_X550_info,

	[board_X550EM_x]	= &ixgbe_X550EM_x_info,

};

};





/* ixgbe_pci_tbl - PCI Device ID Table

/* ixgbe_pci_tbl - PCI Device ID Table
@@ -125,6 +127,9 @@ static const struct pci_device_id ixgbe_pci_tbl[] = { 
	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599EN_SFP), board_82599 },

	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599EN_SFP), board_82599 },

	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP_SF_QP), board_82599 },

	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP_SF_QP), board_82599 },

	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X540T1), board_X540 },

	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X540T1), board_X540 },

	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550T), board_X550},

	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_X_KX4), board_X550EM_x},

	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_X_KR), board_X550EM_x},

	/* required last entry */

	/* required last entry */

	{0, }

	{0, }

};

};