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

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

ixgbe: add MAC and PHY support for x540 



Adds the new x540.c file and Aquantia 1202 PHY for X540 support.

Signed-off-by: default avatarDon Skidmore <donald.c.skidmore@intel.com>
Tested-by: default avatarStephen Ko <stephen.s.ko@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent a391f1d5

drivers/net/ixgbe/Makefile

+1 −1
Original line number 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_82599.o ixgbe_82598.o ixgbe_phy.o ixgbe_sriov.o \

              ixgbe_mbx.o

              ixgbe_mbx.o ixgbe_x540.o



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

                              ixgbe_dcb_82599.o ixgbe_dcb_nl.o

drivers/net/ixgbe/ixgbe.h

+2 −0
Original line number Diff line number Diff line
@@ -481,10 +481,12 @@ struct ixgbe_rsc_cb { 
enum ixgbe_boards {

	board_82598,

	board_82599,

	board_X540,

};



extern struct ixgbe_info ixgbe_82598_info;

extern struct ixgbe_info ixgbe_82599_info;

extern struct ixgbe_info ixgbe_X540_info;

#ifdef CONFIG_IXGBE_DCB

extern const struct dcbnl_rtnl_ops dcbnl_ops;

extern int ixgbe_copy_dcb_cfg(struct ixgbe_dcb_config *src_dcb_cfg,

drivers/net/ixgbe/ixgbe_82599.c

+7 −1
Original line number Diff line number Diff line
@@ -181,6 +181,10 @@ static s32 ixgbe_init_phy_ops_82599(struct ixgbe_hw *hw) 
		phy->ops.get_firmware_version =

		             &ixgbe_get_phy_firmware_version_tnx;

		break;

	case ixgbe_phy_aq:

		phy->ops.get_firmware_version =

			&ixgbe_get_phy_firmware_version_generic;

		break;

	default:

		break;

	}
@@ -298,7 +302,8 @@ static enum ixgbe_media_type ixgbe_get_media_type_82599(struct ixgbe_hw *hw) 


	/* Detect if there is a copper PHY attached. */

	if (hw->phy.type == ixgbe_phy_cu_unknown ||

	    hw->phy.type == ixgbe_phy_tn) {

	    hw->phy.type == ixgbe_phy_tn ||

	    hw->phy.type == ixgbe_phy_aq) {

		media_type = ixgbe_media_type_copper;

		goto out;

	}
@@ -1890,6 +1895,7 @@ static u32 ixgbe_get_supported_physical_layer_82599(struct ixgbe_hw *hw) 
	hw->phy.ops.identify(hw);



	if (hw->phy.type == ixgbe_phy_tn ||

	    hw->phy.type == ixgbe_phy_aq ||

	    hw->phy.type == ixgbe_phy_cu_unknown) {

		hw->phy.ops.read_reg(hw, MDIO_PMA_EXTABLE, MDIO_MMD_PMAPMD,

				     &ext_ability);

drivers/net/ixgbe/ixgbe_ethtool.c

+1 −0
Original line number Diff line number Diff line
@@ -214,6 +214,7 @@ static int ixgbe_get_settings(struct net_device *netdev, 
	/* Get PHY type */

	switch (adapter->hw.phy.type) {

	case ixgbe_phy_tn:

	case ixgbe_phy_aq:

	case ixgbe_phy_cu_unknown:

		/* Copper 10G-BASET */

		ecmd->port = PORT_TP;

drivers/net/ixgbe/ixgbe_main.c

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ static char ixgbe_copyright[] = "Copyright (c) 1999-2010 Intel Corporation."; 
static const struct ixgbe_info *ixgbe_info_tbl[] = {

	[board_82598] = &ixgbe_82598_info,

	[board_82599] = &ixgbe_82599_info,

	[board_X540] = &ixgbe_X540_info,

};



/* ixgbe_pci_tbl - PCI Device ID Table