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

Commit 200157c2 authored by Mark Rustad's avatar Mark Rustad Committed by Jeff Kirsher
Browse files

ixgbe: Add support for SGMII backplane interface 



Add support for an SGMII backplane interface.

Signed-off-by: default avatarMark Rustad <mark.d.rustad@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 2d40cd17

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

+2 −0
Original line number Diff line number Diff line
@@ -132,6 +132,8 @@ static const struct pci_device_id ixgbe_pci_tbl[] = { 
	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_X_10G_T), board_X550EM_x},

	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_X_SFP), board_X550EM_x},

	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_A_SFP_N), board_x550em_a },

	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_A_SGMII), board_x550em_a },

	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_A_SGMII_L), board_x550em_a },

	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_A_SFP), board_x550em_a },

	/* required last entry */

	{0, }

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

+9 −0
Original line number Diff line number Diff line
@@ -82,6 +82,8 @@ 
#define IXGBE_DEV_ID_X550EM_X_10G_T	0x15AD

#define IXGBE_DEV_ID_X550EM_X_1G_T	0x15AE

#define IXGBE_DEV_ID_X550EM_A_SFP_N	0x15C4

#define IXGBE_DEV_ID_X550EM_A_SGMII	0x15C6

#define IXGBE_DEV_ID_X550EM_A_SGMII_L	0x15C7

#define IXGBE_DEV_ID_X550EM_A_SFP	0x15CE



/* VF Device IDs */
@@ -3065,6 +3067,7 @@ enum ixgbe_phy_type { 
	ixgbe_phy_qsfp_intel,

	ixgbe_phy_qsfp_unknown,

	ixgbe_phy_sfp_unsupported,

	ixgbe_phy_sgmii,

	ixgbe_phy_generic

};
@@ -3582,6 +3585,7 @@ struct ixgbe_info { 
#define IXGBE_KRM_LINK_CTRL_1(P)	((P) ? 0x820C : 0x420C)

#define IXGBE_KRM_AN_CNTL_1(P)		((P) ? 0x822C : 0x422C)

#define IXGBE_KRM_AN_CNTL_8(P)		((P) ? 0x8248 : 0x4248)

#define IXGBE_KRM_SGMII_CTRL(P)		((P) ? 0x82A0 : 0x42A0)

#define IXGBE_KRM_DSP_TXFFE_STATE_4(P)	((P) ? 0x8634 : 0x4634)

#define IXGBE_KRM_DSP_TXFFE_STATE_5(P)	((P) ? 0x8638 : 0x4638)

#define IXGBE_KRM_RX_TRN_LINKUP_CTRL(P)	((P) ? 0x8B00 : 0x4B00)
@@ -3595,6 +3599,8 @@ struct ixgbe_info { 
#define IXGBE_KRM_LINK_CTRL_1_TETH_FORCE_SPEED_MASK	(0x7 << 8)

#define IXGBE_KRM_LINK_CTRL_1_TETH_FORCE_SPEED_1G	(2 << 8)

#define IXGBE_KRM_LINK_CTRL_1_TETH_FORCE_SPEED_10G	(4 << 8)

#define IXGBE_KRM_LINK_CTRL_1_TETH_AN_SGMII_EN		BIT(12)

#define IXGBE_KRM_LINK_CTRL_1_TETH_AN_CLAUSE_37_EN	BIT(13)

#define IXGBE_KRM_LINK_CTRL_1_TETH_AN_FEC_REQ		(1 << 14)

#define IXGBE_KRM_LINK_CTRL_1_TETH_AN_CAP_FEC		(1 << 15)

#define IXGBE_KRM_LINK_CTRL_1_TETH_AN_CAP_KX		(1 << 16)
@@ -3610,6 +3616,9 @@ struct ixgbe_info { 
#define IXGBE_KRM_AN_CNTL_8_LINEAR			BIT(0)

#define IXGBE_KRM_AN_CNTL_8_LIMITING			BIT(1)



#define IXGBE_KRM_SGMII_CTRL_MAC_TAR_FORCE_100_D	BIT(12)

#define IXGBE_KRM_SGMII_CTRL_MAC_TAR_FORCE_10_D		BIT(19)



#define IXGBE_KRM_DSP_TXFFE_STATE_C0_EN			(1 << 6)

#define IXGBE_KRM_DSP_TXFFE_STATE_CP1_CN1_EN		(1 << 15)

#define IXGBE_KRM_DSP_TXFFE_STATE_CO_ADAPT_EN		(1 << 16)

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

+58 −0
Original line number Diff line number Diff line
@@ -1558,6 +1558,57 @@ static s32 ixgbe_check_link_t_X550em(struct ixgbe_hw *hw, 
	return 0;

}



/**

 * ixgbe_setup_sgmii - Set up link for sgmii

 * @hw: pointer to hardware structure

 */

static s32

ixgbe_setup_sgmii(struct ixgbe_hw *hw, __always_unused ixgbe_link_speed speed,

		  __always_unused bool autoneg_wait_to_complete)

{

	struct ixgbe_mac_info *mac = &hw->mac;

	u32 lval, sval;

	s32 rc;



	rc = mac->ops.read_iosf_sb_reg(hw,

				       IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),

				       IXGBE_SB_IOSF_TARGET_KR_PHY, &lval);

	if (rc)

		return rc;



	lval &= ~IXGBE_KRM_LINK_CTRL_1_TETH_AN_ENABLE;

	lval &= ~IXGBE_KRM_LINK_CTRL_1_TETH_FORCE_SPEED_MASK;

	lval |= IXGBE_KRM_LINK_CTRL_1_TETH_AN_SGMII_EN;

	lval |= IXGBE_KRM_LINK_CTRL_1_TETH_AN_CLAUSE_37_EN;

	lval |= IXGBE_KRM_LINK_CTRL_1_TETH_FORCE_SPEED_1G;

	rc = mac->ops.write_iosf_sb_reg(hw,

					IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),

					IXGBE_SB_IOSF_TARGET_KR_PHY, lval);

	if (rc)

		return rc;



	rc = mac->ops.read_iosf_sb_reg(hw,

				       IXGBE_KRM_SGMII_CTRL(hw->bus.lan_id),

				       IXGBE_SB_IOSF_TARGET_KR_PHY, &sval);

	if (rc)

		return rc;



	sval |= IXGBE_KRM_SGMII_CTRL_MAC_TAR_FORCE_10_D;

	sval |= IXGBE_KRM_SGMII_CTRL_MAC_TAR_FORCE_100_D;

	rc = mac->ops.write_iosf_sb_reg(hw,

					IXGBE_KRM_SGMII_CTRL(hw->bus.lan_id),

					IXGBE_SB_IOSF_TARGET_KR_PHY, sval);

	if (rc)

		return rc;



	lval |= IXGBE_KRM_LINK_CTRL_1_TETH_AN_RESTART;

	rc = mac->ops.write_iosf_sb_reg(hw,

					IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),

					IXGBE_SB_IOSF_TARGET_KR_PHY, lval);



	return rc;

}



/** ixgbe_init_mac_link_ops_X550em - init mac link function pointers

 *  @hw: pointer to hardware structure

 **/
@@ -1597,6 +1648,9 @@ static void ixgbe_init_mac_link_ops_X550em(struct ixgbe_hw *hw) 
		mac->ops.check_link = ixgbe_check_link_t_X550em;

		return;

	case ixgbe_media_type_backplane:

		if (hw->device_id == IXGBE_DEV_ID_X550EM_A_SGMII ||

		    hw->device_id == IXGBE_DEV_ID_X550EM_A_SGMII_L)

			mac->ops.setup_link = ixgbe_setup_sgmii;

		break;

	default:

		mac->ops.setup_fc = ixgbe_setup_fc_x550em;
@@ -2377,6 +2431,10 @@ static enum ixgbe_media_type ixgbe_get_media_type_X550em(struct ixgbe_hw *hw) 


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

	switch (hw->device_id) {

	case IXGBE_DEV_ID_X550EM_A_SGMII:

	case IXGBE_DEV_ID_X550EM_A_SGMII_L:

		hw->phy.type = ixgbe_phy_sgmii;

		/* Fallthrough */

	case IXGBE_DEV_ID_X550EM_X_KR:

	case IXGBE_DEV_ID_X550EM_X_KX4:

		media_type = ixgbe_media_type_backplane;