ixgbe: Add X553 PHY FC autoneg support
Subsystems (2)
PATCH 1/1 ixgbe: Add X553 PHY FC autoneg support
This patch adds X553 flow control auto negotiation for fiber and backplain. To enable this new function pointers were added as well as creating a function to dynamically set function pointer we can't define only on MAC type.
--- drivers/net/ethernet/intel/ixgbe/ixgbe.h | 2 + drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | 3 +- drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 1 + drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 16 +- drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 6 + drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 1 + drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 211 ++++++++++++++++++++++++ 7 files changed, 232 insertions(+), 8 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe.h +2 -0
@@ -1027,4 +1027,6 @@ netdev_tx_t ixgbe_xmit_frame_ring(struct sk_buff *skb, struct ixgbe_ring *tx_ring);u32 ixgbe_rss_indir_tbl_entries (struct ixgbe_adapter *adapter);void ixgbe_store_reta (struct ixgbe_adapter *adapter); +s32 ixgbe_negotiate_fc (struct ixgbe_hw *hw,u32 adv_reg,u32 lp_reg, +u32 adv_sym,u32 adv_asm,u32 lp_sym,u32 lp_asm);#endif /* _IXGBE_H_ */
drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c +2 -1
@@ -367,7 +367,7 @@ static s32 ixgbe_fc_enable_82598(struct ixgbe_hw *hw) }/* Negotiate the fc mode to use */ -ixgbe_fc_autoneg (hw); + hw->mac.ops.fc_autoneg (hw);/* Disable any previous flow control settings */ fctrl_reg =IXGBE_READ_REG (hw,IXGBE_FCTRL );
@@ -1193,6 +1193,7 @@ static const struct ixgbe_mac_operations mac_ops_82598 = { .set_vfta = &ixgbe_set_vfta_82598, .fc_enable = &ixgbe_fc_enable_82598, .setup_fc = ixgbe_setup_fc_generic, + .fc_autoneg = ixgbe_fc_autoneg, .set_fw_drv_ver = NULL, .acquire_swfw_sync = &ixgbe_acquire_swfw_sync, .release_swfw_sync = &ixgbe_release_swfw_sync,
drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c +1 -0
@@ -2219,6 +2219,7 @@ static const struct ixgbe_mac_operations mac_ops_82599 = { .set_vfta = &ixgbe_set_vfta_generic, .fc_enable = &ixgbe_fc_enable_generic, .setup_fc = ixgbe_setup_fc_generic, + .fc_autoneg = ixgbe_fc_autoneg, .set_fw_drv_ver = &ixgbe_set_fw_drv_ver_generic, .init_uta_tables = &ixgbe_init_uta_tables_generic, .setup_sfp = &ixgbe_setup_sfp_modules_82599,
drivers/net/ethernet/intel/ixgbe/ixgbe_common.c +9 -7
@@ -298,10 +298,12 @@ s32 ixgbe_start_hw_generic(struct ixgbe_hw *hw)IXGBE_WRITE_REG (hw,IXGBE_CTRL_EXT , ctrl_ext);IXGBE_WRITE_FLUSH (hw); -/* Setup flow control */ - ret_val = hw->mac.ops.setup_fc (hw); -if (ret_val) -return ret_val; +/* Setup flow control if method for doing so */ +if (hw->mac.ops.setup_fc) { + ret_val = hw->mac.ops.setup_fc (hw); +if (ret_val) +return ret_val; + }/* Cashe bit indicating need for crosstalk fix */ switch (hw->mac.type) {
@@ -2127,7 +2129,7 @@ s32 ixgbe_fc_enable_generic(struct ixgbe_hw *hw) }/* Negotiate the fc mode to use */ -ixgbe_fc_autoneg (hw); + hw->mac.ops.fc_autoneg (hw);/* Disable any previous flow control settings */ mflcn_reg =IXGBE_READ_REG (hw,IXGBE_MFLCN );
@@ -2231,8 +2233,8 @@ s32 ixgbe_fc_enable_generic(struct ixgbe_hw *hw)* Find the intersection between advertised settings and link partner's * advertised settings **/ -static s32 ixgbe_negotiate_fc (struct ixgbe_hw *hw,u32 adv_reg,u32 lp_reg, -u32 adv_sym,u32 adv_asm,u32 lp_sym,u32 lp_asm) +s32 ixgbe_negotiate_fc (struct ixgbe_hw *hw,u32 adv_reg,u32 lp_reg, +u32 adv_sym,u32 adv_asm,u32 lp_sym,u32 lp_asm) {if ((!(adv_reg)) || (!(lp_reg)))return IXGBE_ERR_FC_NOT_NEGOTIATED ;
drivers/net/ethernet/intel/ixgbe/ixgbe_type.h +6 -0
@@ -3372,6 +3372,7 @@ struct ixgbe_mac_operations {/* Flow Control */ s32 (*fc_enable)(struct ixgbe_hw *);s32 (*setup_fc)(struct ixgbe_hw *); +void (*fc_autoneg)(struct ixgbe_hw *);/* Manageability interface */ s32 (*set_fw_drv_ver)(struct ixgbe_hw *,u8 ,u8 ,u8 ,u8 );
@@ -3593,10 +3594,12 @@ struct ixgbe_info {#define IXGBE_FUSES0_REV_MASK (3u << 6)#define IXGBE_KRM_PORT_CAR_GEN_CTRL (P ) ((P) ? 0x8010 : 0x4010) +#define IXGBE_KRM_LINK_S1 (P ) ((P) ? 0x8200 : 0x4200)#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_LP_BASE_PAGE_HIGH (P ) ((P) ? 0x836C : 0x436C)#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)
@@ -3618,6 +3621,7 @@ struct ixgbe_info {#define IXGBE_KRM_LINK_CTRL_1_TETH_AN_CAP_KR BIT(18)#define IXGBE_KRM_LINK_CTRL_1_TETH_EEE_CAP_KX BIT(24)#define IXGBE_KRM_LINK_CTRL_1_TETH_EEE_CAP_KR BIT(26) +#define IXGBE_KRM_LINK_S1_MAC_AN_COMPLETE BIT(28)#define IXGBE_KRM_LINK_CTRL_1_TETH_AN_ENABLE BIT(29)#define IXGBE_KRM_LINK_CTRL_1_TETH_AN_RESTART BIT(31)
@@ -3627,6 +3631,8 @@ struct ixgbe_info {#define IXGBE_KRM_AN_CNTL_8_LINEAR BIT(0)#define IXGBE_KRM_AN_CNTL_8_LIMITING BIT(1) +#define IXGBE_KRM_LP_BASE_PAGE_HIGH_SYM_PAUSE BIT(10) +#define IXGBE_KRM_LP_BASE_PAGE_HIGH_ASM_PAUSE BIT(11)#define IXGBE_KRM_SGMII_CTRL_MAC_TAR_FORCE_100_D BIT(12)#define IXGBE_KRM_SGMII_CTRL_MAC_TAR_FORCE_10_D BIT(19)
drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c +1 -0
@@ -866,6 +866,7 @@ static const struct ixgbe_mac_operations mac_ops_X540 = { .set_vfta = &ixgbe_set_vfta_generic, .fc_enable = &ixgbe_fc_enable_generic, .setup_fc = ixgbe_setup_fc_generic, + .fc_autoneg = ixgbe_fc_autoneg, .set_fw_drv_ver = &ixgbe_set_fw_drv_ver_generic, .init_uta_tables = &ixgbe_init_uta_tables_generic, .setup_sfp = NULL,
drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c +211 -0
259 lines not on this page · raw message
Signature · 1 line
2.4.3
Singh
PATCH 1/1 ixgbe: Add X553 PHY FC autoneg support
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Donald C Skidmore
Sent: Tuesday, September 27, 2016 11:31 AM
To: [email protected]
Subject: [Intel-wired-lan] [PATCH] ixgbe: Add X553 PHY FC autoneg support
This patch adds X553 flow control auto negotiation for fiber and backplain. To enable this new function pointers were added as well as creating a function to dynamically set function pointer we can't define only on MAC type.
---