i40e: use unsigned printf format specifier for active_filters count
Subsystems (2)
PATCH 1/5 i40e: use unsigned printf format specifier for active_filters count
From: Jacob Keller <[email protected]>
Replace the %d specifier used for printing vsi->active_filters and vsi->promisc_threshold with an unsigned %u format specifier. While it is unlikely in practice that these values will ever reach such a large number they are unsigned values and thus should not be interpreted as negative numbers.
---
Testing-hints:
This should go upstream, even though it is in debugfs code. We're not adding features but simply correcting output of existing features.
drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/intel/i40e/i40e_debugfs.c +1 -1
@@ -172,7 +172,7 @@ static void i40e_dbg_dump_vsi_seid(struct i40e_pf *pf, int seid) f->macaddr, f->vlan, i40e_filter_state_string[f->state]); } -dev_info (&pf->pdev->dev," active_filters %d, promisc_threshold %d, overflow promisc %s\n" , +dev_info (&pf->pdev->dev," active_filters %u, promisc_threshold %u, overflow promisc %s\n" , vsi->active_filters, vsi->promisc_threshold, (test_bit (__I40E_FILTER_OVERFLOW_PROMISC, &vsi->state) ?"ON" :"OFF" ));
Signature · 1 line
2.4.11
PATCH 2/5 i40e: Add support for 25G devices
From: Carolyn Wyborny <[email protected]>
Add support for 25G devices - defines and data structures.
One tricky part here is that the firmware support for these Devices introduces a mismatch between the PHY type enum and the bitfields for the phy types.
This change creates a macro and uses it to increment the 25G PHY values when creating 25G bitfields.
---
Testing Hints : Check that 25G devices link and report correct device speed.
drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 30 +++++++- drivers/net/ethernet/intel/i40e/i40e_common.c | 11 ++- drivers/net/ethernet/intel/i40e/i40e_devids.h | 2 + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 20 +++++- drivers/net/ethernet/intel/i40e/i40e_main.c | 6 +- drivers/net/ethernet/intel/i40e/i40e_type.h | 82 +++++++++++++--------- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 3 + .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 30 +++++++- drivers/net/ethernet/intel/i40evf/i40e_common.c | 2 + drivers/net/ethernet/intel/i40evf/i40e_devids.h | 2 + drivers/net/ethernet/intel/i40evf/i40e_type.h | 82 +++++++++++++--------- drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c | 8 +++ .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 3 + 13 files changed, 202 insertions(+), 79 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h +27 -3
@@ -1642,6 +1642,10 @@ enum i40e_aq_phy_type {I40E_PHY_TYPE_1000BASE_LX =0x1C ,I40E_PHY_TYPE_1000BASE_T_OPTICAL =0x1D ,I40E_PHY_TYPE_20GBASE_KR2 =0x1E , +I40E_PHY_TYPE_25GBASE_KR =0x1F , +I40E_PHY_TYPE_25GBASE_CR =0x20 , +I40E_PHY_TYPE_25GBASE_SR =0x21 , +I40E_PHY_TYPE_25GBASE_LR =0x22 , I40E_PHY_TYPE_MAX };
@@ -1650,6 +1654,7 @@ enum i40e_aq_phy_type {#define I40E_LINK_SPEED_10GB_SHIFT 0x3#define I40E_LINK_SPEED_40GB_SHIFT 0x4#define I40E_LINK_SPEED_20GB_SHIFT 0x5 +#define I40E_LINK_SPEED_25GB_SHIFT 0x6enum i40e_aq_link_speed {I40E_LINK_SPEED_UNKNOWN =0 ,
@@ -1657,7 +1662,8 @@ enum i40e_aq_link_speed {I40E_LINK_SPEED_1GB =BIT (I40E_LINK_SPEED_1000MB_SHIFT ),I40E_LINK_SPEED_10GB =BIT (I40E_LINK_SPEED_10GB_SHIFT ),I40E_LINK_SPEED_40GB =BIT (I40E_LINK_SPEED_40GB_SHIFT ), -I40E_LINK_SPEED_20GB =BIT (I40E_LINK_SPEED_20GB_SHIFT ) +I40E_LINK_SPEED_20GB =BIT (I40E_LINK_SPEED_20GB_SHIFT ), + I40E_LINK_SPEED_25GB = BIT(I40E_LINK_SPEED_25GB_SHIFT), }; struct i40e_aqc_module_desc {
@@ -1690,7 +1696,13 @@ struct i40e_aq_get_phy_abilities_resp {__le32 eeer_val;u8 d3_lpan;#define I40E_AQ_SET_PHY_D3_LPAN_ENA 0x01 -u8 reserved[3 ]; +u8 phy_type_ext; +#define I40E_AQ_PHY_TYPE_EXT_25G_KR 0X01 +#define I40E_AQ_PHY_TYPE_EXT_25G_CR 0X02 +#define I40E_AQ_PHY_TYPE_EXT_25G_SR 0x04 +#define I40E_AQ_PHY_TYPE_EXT_25G_LR 0x08 +u8 mod_type_ext; +u8 ext_comp_code;u8 phy_id[4 ];u8 module_type[3 ];u8 qualified_module_count;
@@ -1712,7 +1724,12 @@ struct i40e_aq_set_phy_config { /* same bits as above in all */__le16 eee_capability;__le32 eeer;u8 low_power_ctrl; -u8 reserved[3 ]; +u8 phy_type_ext; +#define I40E_AQ_PHY_TYPE_EXT_25G_KR 0X01 +#define I40E_AQ_PHY_TYPE_EXT_25G_CR 0X02 +#define I40E_AQ_PHY_TYPE_EXT_25G_SR 0x04 +#define I40E_AQ_PHY_TYPE_EXT_25G_LR 0x08 +u8 reserved[2 ]; };I40E_CHECK_CMD_LENGTH (i40e_aq_set_phy_config);
@@ -1792,6 +1809,13 @@ struct i40e_aqc_get_link_status {#define I40E_AQ_LINK_TX_DRAINED 0x01#define I40E_AQ_LINK_TX_FLUSHED 0x03#define I40E_AQ_LINK_FORCED_40G 0x10 +/* 25G Error Codes */ +#define I40E_AQ_25G_NO_ERR 0X00 +#define I40E_AQ_25G_NOT_PRESENT 0X01 +#define I40E_AQ_25G_NVM_CRC_ERR 0X02 +#define I40E_AQ_25G_SBUS_UCODE_ERR 0X03 +#define I40E_AQ_25G_SERDES_UCODE_ERR 0X04 +#define I40E_AQ_25G_NIMB_UCODE_ERR 0X05u8 loopback;/* use defines from i40e_aqc_set_lb_mode */ __le16 max_frame_size;u8 config;
drivers/net/ethernet/intel/i40e/i40e_common.c +10 -1
@@ -53,6 +53,8 @@ static i40e_status i40e_set_mac_type(struct i40e_hw *hw)case I40E_DEV_ID_10G_BASE_T4 :case I40E_DEV_ID_20G_KR2 :case I40E_DEV_ID_20G_KR2_A : +case I40E_DEV_ID_25G_B : +case I40E_DEV_ID_25G_SFP28 : hw->mac.type =I40E_MAC_XL710 ;break ;case I40E_DEV_ID_KX_X722 :
@@ -1183,6 +1185,8 @@ static enum i40e_media_type i40e_get_media_type(struct i40e_hw *hw)case I40E_PHY_TYPE_1000BASE_LX :case I40E_PHY_TYPE_40GBASE_SR4 :case I40E_PHY_TYPE_40GBASE_LR4 : +case I40E_PHY_TYPE_25GBASE_LR : +case I40E_PHY_TYPE_25GBASE_SR : media =I40E_MEDIA_TYPE_FIBER ;break ;case I40E_PHY_TYPE_100BASE_TX :
@@ -1197,6 +1201,7 @@ static enum i40e_media_type i40e_get_media_type(struct i40e_hw *hw)case I40E_PHY_TYPE_10GBASE_SFPP_CU :case I40E_PHY_TYPE_40GBASE_AOC :case I40E_PHY_TYPE_10GBASE_AOC : +case I40E_PHY_TYPE_25GBASE_CR : media =I40E_MEDIA_TYPE_DA ;break ;case I40E_PHY_TYPE_1000BASE_KX :
@@ -1204,6 +1209,7 @@ static enum i40e_media_type i40e_get_media_type(struct i40e_hw *hw)case I40E_PHY_TYPE_10GBASE_KR :case I40E_PHY_TYPE_40GBASE_KR4 :case I40E_PHY_TYPE_20GBASE_KR2 : +case I40E_PHY_TYPE_25GBASE_KR : media =I40E_MEDIA_TYPE_BACKPLANE ;break ;case I40E_PHY_TYPE_SGMII :
@@ -1608,8 +1614,10 @@ i40e_status i40e_aq_get_phy_capabilities(struct i40e_hw *hw,if (hw->aq.asq_last_status ==I40E_AQ_RC_EIO ) status =I40E_ERR_UNKNOWN_PHY ; -if (report_init) +if (report_init) { hw->phy.phy_types =le32_to_cpu (abilities->phy_type); + hw->phy.phy_types |= ((u64 )abilities->phy_type_ext <<32 ); + }return status; }
@@ -1701,6 +1709,7 @@ enum i40e_status_code i40e_set_fc(struct i40e_hw *hw, u8 *aq_failures, config.abilities |=I40E_AQ_PHY_ENABLE_ATOMIC_LINK ;/* Copy over all the old settings */ config.phy_type = abilities.phy_type; + config.phy_type_ext = abilities.phy_type_ext; config.link_speed = abilities.link_speed; config.eee_capability = abilities.eee_capability; config.eeer = abilities.eeer_val;
drivers/net/ethernet/intel/i40e/i40e_devids.h +2 -0
@@ -39,6 +39,8 @@#define I40E_DEV_ID_20G_KR2 0x1587#define I40E_DEV_ID_20G_KR2_A 0x1588#define I40E_DEV_ID_10G_BASE_T4 0x1589 +#define I40E_DEV_ID_25G_B 0x158A +#define I40E_DEV_ID_25G_SFP28 0x158B#define I40E_DEV_ID_KX_X722 0x37CE#define I40E_DEV_ID_QSFP_X722 0x37CF#define I40E_DEV_ID_SFP_X722 0x37D0
drivers/net/ethernet/intel/i40e/i40e_ethtool.c +19 -1
@@ -265,8 +265,9 @@ static void i40e_partition_setting_complaint(struct i40e_pf *pf)static void i40e_phy_type_to_ethtool (struct i40e_pf *pf,u32 *supported,u32 *advertising) { -enum i40e_aq_capabilities_phy_type phy_types = pf->hw.phy.phy_types;struct i40e_link_status *hw_link_info = &pf->hw.phy.link_info; +u64 phy_types = pf->hw.phy.phy_types; + *supported =0x0 ; *advertising =0x0 ;
@@ -369,6 +370,15 @@ static void i40e_phy_type_to_ethtool(struct i40e_pf *pf, u32 *supported,if (!(pf->flags &I40E_FLAG_HAVE_CRT_RETIMER )) *advertising |= ADVERTISED_1000baseKX_Full; } +if (phy_types &I40E_CAP_PHY_TYPE_25GBASE_KR || + phy_types &I40E_CAP_PHY_TYPE_25GBASE_CR || + phy_types &I40E_CAP_PHY_TYPE_25GBASE_SR || + phy_types &I40E_CAP_PHY_TYPE_25GBASE_LR ) { + *supported |= SUPPORTED_Autoneg | + SUPPORTED_2500baseX_Full; + *advertising |= ADVERTISED_Autoneg | + ADVERTISED_2500baseX_Full; + } }/**
@@ -491,6 +501,14 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw, ADVERTISED_1000baseKX_Full | ADVERTISED_Autoneg;break ; +case I40E_PHY_TYPE_25GBASE_KR : +case I40E_PHY_TYPE_25GBASE_CR : +case I40E_PHY_TYPE_25GBASE_SR : +case I40E_PHY_TYPE_25GBASE_LR : + ecmd->supported |= SUPPORTED_2500baseX_Full | + SUPPORTED_Autoneg; + ecmd->advertising |= ADVERTISED_2500baseX_Full | + ADVERTISED_Autoneg;default :/* if we got here and link is up something bad is afoot */ netdev_info(netdev, "WARNING: Link is up but PHY type 0x%x is not recognized.\n",
drivers/net/ethernet/intel/i40e/i40e_main.c +5 -1
@@ -86,6 +86,8 @@ static const struct pci_device_id i40e_pci_tbl[] = { {PCI_VDEVICE(INTEL, I40E_DEV_ID_SFP_I_X722), 0}, {PCI_VDEVICE(INTEL, I40E_DEV_ID_20G_KR2), 0}, {PCI_VDEVICE(INTEL, I40E_DEV_ID_20G_KR2_A), 0}, + {PCI_VDEVICE(INTEL, I40E_DEV_ID_25G_B), 0}, + {PCI_VDEVICE(INTEL, I40E_DEV_ID_25G_SFP28), 0},/* required last entry */ {0, } };
@@ -5248,6 +5250,9 @@ void i40e_print_link_message(struct i40e_vsi *vsi, bool isup)case I40E_LINK_SPEED_20GB : speed ="20 G" ;break ; +case I40E_LINK_SPEED_25GB : + speed ="25 G" ; +break ;case I40E_LINK_SPEED_10GB : speed ="10 G" ;break ;
@@ -11356,7 +11361,6 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)dev_dbg (&pf->pdev->dev,"get supported phy types ret = %s last_status = %s\n" ,i40e_stat_str (&pf->hw, err),i40e_aq_str (&pf->hw, pf->hw.aq.asq_last_status)); - pf->hw.phy.phy_types =le32_to_cpu (abilities.phy_type);/* Add a filter to drop all Flow control frames from any VSI from being * transmitted. By doing so we stop a malicious VF from sending out
drivers/net/ethernet/intel/i40e/i40e_type.h +47 -35
94 lines not on this page · raw message
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +3 -0
@@ -2921,6 +2921,9 @@ int i40e_ndo_set_vf_bw(struct net_device *netdev, int vf_id, int min_tx_rate,case I40E_LINK_SPEED_40GB : speed =40000 ;break ; +case I40E_LINK_SPEED_25GB : + speed =25000 ; +break ;case I40E_LINK_SPEED_20GB : speed =20000 ;break ;
drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h +27 -3
@@ -1639,6 +1639,10 @@ enum i40e_aq_phy_type {I40E_PHY_TYPE_1000BASE_LX =0x1C ,I40E_PHY_TYPE_1000BASE_T_OPTICAL =0x1D ,I40E_PHY_TYPE_20GBASE_KR2 =0x1E , +I40E_PHY_TYPE_25GBASE_KR =0x1F , +I40E_PHY_TYPE_25GBASE_CR =0x20 , +I40E_PHY_TYPE_25GBASE_SR =0x21 , +I40E_PHY_TYPE_25GBASE_LR =0x22 , I40E_PHY_TYPE_MAX };
@@ -1647,6 +1651,7 @@ enum i40e_aq_phy_type {#define I40E_LINK_SPEED_10GB_SHIFT 0x3#define I40E_LINK_SPEED_40GB_SHIFT 0x4#define I40E_LINK_SPEED_20GB_SHIFT 0x5 +#define I40E_LINK_SPEED_25GB_SHIFT 0x6enum i40e_aq_link_speed {I40E_LINK_SPEED_UNKNOWN =0 ,
@@ -1654,7 +1659,8 @@ enum i40e_aq_link_speed {I40E_LINK_SPEED_1GB =BIT (I40E_LINK_SPEED_1000MB_SHIFT ),I40E_LINK_SPEED_10GB =BIT (I40E_LINK_SPEED_10GB_SHIFT ),I40E_LINK_SPEED_40GB =BIT (I40E_LINK_SPEED_40GB_SHIFT ), -I40E_LINK_SPEED_20GB =BIT (I40E_LINK_SPEED_20GB_SHIFT ) +I40E_LINK_SPEED_20GB =BIT (I40E_LINK_SPEED_20GB_SHIFT ), + I40E_LINK_SPEED_25GB = BIT(I40E_LINK_SPEED_25GB_SHIFT), }; struct i40e_aqc_module_desc {
@@ -1687,7 +1693,13 @@ struct i40e_aq_get_phy_abilities_resp {__le32 eeer_val;u8 d3_lpan;#define I40E_AQ_SET_PHY_D3_LPAN_ENA 0x01 -u8 reserved[3 ]; +u8 phy_type_ext; +#define I40E_AQ_PHY_TYPE_EXT_25G_KR 0X01 +#define I40E_AQ_PHY_TYPE_EXT_25G_CR 0X02 +#define I40E_AQ_PHY_TYPE_EXT_25G_SR 0x04 +#define I40E_AQ_PHY_TYPE_EXT_25G_LR 0x08 +u8 mod_type_ext; +u8 ext_comp_code;u8 phy_id[4 ];u8 module_type[3 ];u8 qualified_module_count;
@@ -1709,7 +1721,12 @@ struct i40e_aq_set_phy_config { /* same bits as above in all */__le16 eee_capability;__le32 eeer;u8 low_power_ctrl; -u8 reserved[3 ]; +u8 phy_type_ext; +#define I40E_AQ_PHY_TYPE_EXT_25G_KR 0X01 +#define I40E_AQ_PHY_TYPE_EXT_25G_CR 0X02 +#define I40E_AQ_PHY_TYPE_EXT_25G_SR 0x04 +#define I40E_AQ_PHY_TYPE_EXT_25G_LR 0x08 +u8 reserved[2 ]; };I40E_CHECK_CMD_LENGTH (i40e_aq_set_phy_config);
@@ -1789,6 +1806,13 @@ struct i40e_aqc_get_link_status {#define I40E_AQ_LINK_TX_DRAINED 0x01#define I40E_AQ_LINK_TX_FLUSHED 0x03#define I40E_AQ_LINK_FORCED_40G 0x10 +/* 25G Error Codes */ +#define I40E_AQ_25G_NO_ERR 0X00 +#define I40E_AQ_25G_NOT_PRESENT 0X01 +#define I40E_AQ_25G_NVM_CRC_ERR 0X02 +#define I40E_AQ_25G_SBUS_UCODE_ERR 0X03 +#define I40E_AQ_25G_SERDES_UCODE_ERR 0X04 +#define I40E_AQ_25G_NIMB_UCODE_ERR 0X05u8 loopback;/* use defines from i40e_aqc_set_lb_mode */ __le16 max_frame_size;u8 config;
drivers/net/ethernet/intel/i40evf/i40e_common.c +2 -0
@@ -53,6 +53,8 @@ i40e_status i40e_set_mac_type(struct i40e_hw *hw)case I40E_DEV_ID_10G_BASE_T4 :case I40E_DEV_ID_20G_KR2 :case I40E_DEV_ID_20G_KR2_A : +case I40E_DEV_ID_25G_B : +case I40E_DEV_ID_25G_SFP28 : hw->mac.type =I40E_MAC_XL710 ;break ;case I40E_DEV_ID_SFP_X722 :
drivers/net/ethernet/intel/i40evf/i40e_devids.h +2 -0
@@ -39,6 +39,8 @@#define I40E_DEV_ID_20G_KR2 0x1587#define I40E_DEV_ID_20G_KR2_A 0x1588#define I40E_DEV_ID_10G_BASE_T4 0x1589 +#define I40E_DEV_ID_25G_B 0x158A +#define I40E_DEV_ID_25G_SFP28 0x158B#define I40E_DEV_ID_VF 0x154C#define I40E_DEV_ID_VF_HV 0x1571#define I40E_DEV_ID_SFP_X722 0x37D0
drivers/net/ethernet/intel/i40evf/i40e_type.h +47 -35
94 lines not on this page · raw message
drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c +8 -0
@@ -85,6 +85,14 @@ static int i40evf_get_settings(struct net_device *netdev,case I40E_LINK_SPEED_40GB :ethtool_cmd_speed_set (ecmd,SPEED_40000 );break ; +case I40E_LINK_SPEED_25GB : +#ifdef SPEED_25000 +ethtool_cmd_speed_set (ecmd,SPEED_25000 ); +#else +netdev_info (netdev, +"Speed is 25G, display not supported by this version of ethtool.\n" ); +#endif +break ;case I40E_LINK_SPEED_20GB :ethtool_cmd_speed_set (ecmd,SPEED_20000 );break ;
drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c +3 -0
@@ -836,6 +836,9 @@ static void i40evf_print_link_message(struct i40evf_adapter *adapter)case I40E_LINK_SPEED_40GB : speed ="40 G" ;break ; +case I40E_LINK_SPEED_25GB : + speed ="25 G" ; +break ;case I40E_LINK_SPEED_20GB : speed ="20 G" ;break ;
Signature · 1 line
2.4.11
Bowers
PATCH 2/5 i40e: Add support for 25G devices
Quoted 12 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Bimmy Pujari
Sent: Monday, November 14, 2016 1:07 PM
To: intel-wired-lan at lists.osuosl.org
Cc: Tieman, Henry W <[email protected]>; Joyner, Eric <[email protected]>; Kosiarz, Michal <[email protected]>
Subject: [Intel-wired-lan] [next PATCH S53-V2 2/5] i40e: Add support for 25G devicesFrom: Carolyn Wyborny <[email protected]>
Quoted 8 lines
Add support for 25G devices - defines and data structures.
One tricky part here is that the firmware support for these Devices introduces a mismatch between the PHY type enum and the bitfields for the phy types.
This change creates a macro and uses it to increment the 25G PHY values when creating 25G bitfields.
25G devices identified correctly, show correct link speed, and pass traffic correctly
PATCH 3/5 i40e: Add FEC for 25g
In reply to Bimmy PujariFrom: Carolyn Wyborny <[email protected]>
This patch adds adminq support for Forward Error Correction ("FEC")for 25g products.
--- drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 25 ++++++++++++++++++++-- drivers/net/ethernet/intel/i40e/i40e_common.c | 2 ++ .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 25 ++++++++++++++++++++-- 3 files changed, 48 insertions(+), 4 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h +23 -2
@@ -1686,6 +1686,8 @@ struct i40e_aq_get_phy_abilities_resp {#define I40E_AQ_PHY_LINK_ENABLED 0x08#define I40E_AQ_PHY_AN_ENABLED 0x10#define I40E_AQ_PHY_FLAG_MODULE_QUAL 0x20 +#define I40E_AQ_PHY_FEC_ABILITY_KR 0x40 +#define I40E_AQ_PHY_FEC_ABILITY_RS 0x80__le16 eee_capability;#define I40E_AQ_EEE_100BASE_TX 0x0002#define I40E_AQ_EEE_1000BASE_T 0x0004
@@ -1701,7 +1703,16 @@ struct i40e_aq_get_phy_abilities_resp {#define I40E_AQ_PHY_TYPE_EXT_25G_CR 0X02#define I40E_AQ_PHY_TYPE_EXT_25G_SR 0x04#define I40E_AQ_PHY_TYPE_EXT_25G_LR 0x08 -u8 mod_type_ext; +u8 fec_cfg_curr_mod_ext_info; +#define I40E_AQ_ENABLE_FEC_KR 0x01 +#define I40E_AQ_ENABLE_FEC_RS 0x02 +#define I40E_AQ_REQUEST_FEC_KR 0x04 +#define I40E_AQ_REQUEST_FEC_RS 0x08 +#define I40E_AQ_ENABLE_FEC_AUTO 0x10 +#define I40E_AQ_FEC +#define I40E_AQ_MODULE_TYPE_EXT_MASK 0xE0 +#define I40E_AQ_MODULE_TYPE_EXT_SHIFT 5 +u8 ext_comp_code;u8 phy_id[4 ];u8 module_type[3 ];
@@ -1729,7 +1740,15 @@ struct i40e_aq_set_phy_config { /* same bits as above in all */#define I40E_AQ_PHY_TYPE_EXT_25G_CR 0X02#define I40E_AQ_PHY_TYPE_EXT_25G_SR 0x04#define I40E_AQ_PHY_TYPE_EXT_25G_LR 0x08 -u8 reserved[2 ]; +u8 fec_config; +#define I40E_AQ_SET_FEC_ABILITY_KR BIT(0) +#define I40E_AQ_SET_FEC_ABILITY_RS BIT(1) +#define I40E_AQ_SET_FEC_REQUEST_KR BIT(2) +#define I40E_AQ_SET_FEC_REQUEST_RS BIT(3) +#define I40E_AQ_SET_FEC_AUTO BIT(4) +#define I40E_AQ_PHY_FEC_CONFIG_SHIFT 0x0 +#define I40E_AQ_PHY_FEC_CONFIG_MASK (0x1F << I40E_AQ_PHY_FEC_CONFIG_SHIFT) +u8 reserved; };I40E_CHECK_CMD_LENGTH (i40e_aq_set_phy_config);
@@ -1819,6 +1838,8 @@ struct i40e_aqc_get_link_status {u8 loopback;/* use defines from i40e_aqc_set_lb_mode */ __le16 max_frame_size;u8 config; +#define I40E_AQ_CONFIG_FEC_KR_ENA 0x01 +#define I40E_AQ_CONFIG_FEC_RS_ENA 0x02#define I40E_AQ_CONFIG_CRC_ENA 0x04#define I40E_AQ_CONFIG_PACING_MASK 0x78u8 external_power_ability;
drivers/net/ethernet/intel/i40e/i40e_common.c +2 -0
@@ -1714,6 +1714,8 @@ enum i40e_status_code i40e_set_fc(struct i40e_hw *hw, u8 *aq_failures, config.eee_capability = abilities.eee_capability; config.eeer = abilities.eeer_val; config.low_power_ctrl = abilities.d3_lpan; + config.fec_config = abilities.fec_cfg_curr_mod_ext_info & +I40E_AQ_PHY_FEC_CONFIG_MASK ; status =i40e_aq_set_phy_config (hw, &config,NULL );if (status)
drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h +23 -2
@@ -1683,6 +1683,8 @@ struct i40e_aq_get_phy_abilities_resp {#define I40E_AQ_PHY_LINK_ENABLED 0x08#define I40E_AQ_PHY_AN_ENABLED 0x10#define I40E_AQ_PHY_FLAG_MODULE_QUAL 0x20 +#define I40E_AQ_PHY_FEC_ABILITY_KR 0x40 +#define I40E_AQ_PHY_FEC_ABILITY_RS 0x80__le16 eee_capability;#define I40E_AQ_EEE_100BASE_TX 0x0002#define I40E_AQ_EEE_1000BASE_T 0x0004
@@ -1698,7 +1700,16 @@ struct i40e_aq_get_phy_abilities_resp {#define I40E_AQ_PHY_TYPE_EXT_25G_CR 0X02#define I40E_AQ_PHY_TYPE_EXT_25G_SR 0x04#define I40E_AQ_PHY_TYPE_EXT_25G_LR 0x08 -u8 mod_type_ext; +u8 fec_cfg_curr_mod_ext_info; +#define I40E_AQ_ENABLE_FEC_KR 0x01 +#define I40E_AQ_ENABLE_FEC_RS 0x02 +#define I40E_AQ_REQUEST_FEC_KR 0x04 +#define I40E_AQ_REQUEST_FEC_RS 0x08 +#define I40E_AQ_ENABLE_FEC_AUTO 0x10 +#define I40E_AQ_FEC +#define I40E_AQ_MODULE_TYPE_EXT_MASK 0xE0 +#define I40E_AQ_MODULE_TYPE_EXT_SHIFT 5 +u8 ext_comp_code;u8 phy_id[4 ];u8 module_type[3 ];
@@ -1726,7 +1737,15 @@ struct i40e_aq_set_phy_config { /* same bits as above in all */#define I40E_AQ_PHY_TYPE_EXT_25G_CR 0X02#define I40E_AQ_PHY_TYPE_EXT_25G_SR 0x04#define I40E_AQ_PHY_TYPE_EXT_25G_LR 0x08 -u8 reserved[2 ]; +u8 fec_config; +#define I40E_AQ_SET_FEC_ABILITY_KR BIT(0) +#define I40E_AQ_SET_FEC_ABILITY_RS BIT(1) +#define I40E_AQ_SET_FEC_REQUEST_KR BIT(2) +#define I40E_AQ_SET_FEC_REQUEST_RS BIT(3) +#define I40E_AQ_SET_FEC_AUTO BIT(4) +#define I40E_AQ_PHY_FEC_CONFIG_SHIFT 0x0 +#define I40E_AQ_PHY_FEC_CONFIG_MASK (0x1F << I40E_AQ_PHY_FEC_CONFIG_SHIFT) +u8 reserved; };I40E_CHECK_CMD_LENGTH (i40e_aq_set_phy_config);
@@ -1816,6 +1835,8 @@ struct i40e_aqc_get_link_status {u8 loopback;/* use defines from i40e_aqc_set_lb_mode */ __le16 max_frame_size;u8 config; +#define I40E_AQ_CONFIG_FEC_KR_ENA 0x01 +#define I40E_AQ_CONFIG_FEC_RS_ENA 0x02#define I40E_AQ_CONFIG_CRC_ENA 0x04#define I40E_AQ_CONFIG_PACING_MASK 0x78u8 external_power_ability;
Signature · 1 line
2.4.11
Bowers
PATCH 3/5 i40e: Add FEC for 25g
Quoted 17 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Bimmy Pujari
Sent: Monday, November 14, 2016 1:07 PM
To: intel-wired-lan at lists.osuosl.org
Cc: Naczyk, Jacek <[email protected]>
Subject: [Intel-wired-lan] [next PATCH S53-V2 3/5] i40e: Add FEC for 25gFrom: Carolyn Wyborny <[email protected]>
This patch adds adminq support for Forward Error Correction ("FEC")for 25g products.
Signed-off-by Carolyn Wyborny <[email protected]>Signed-off-by Mitch Williams <[email protected]>Signed-off-by Jacek Naczyk <[email protected]>Change-ID Iaff4910737c239d2c730e5c22a313ce9c37d3964
Quoted 7 lines
--- drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 25 ++++++++++++++++++++-- drivers/net/ethernet/intel/i40e/i40e_common.c | 2 ++ .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 25 ++++++++++++++++++++-- 3 files changed, 48 insertions(+), 4 deletions(-)
Bowers
PATCH 3/5 i40e: Add FEC for 25g
In reply to Bimmy PujariQuoted 17 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Bimmy Pujari
Sent: Monday, November 14, 2016 1:07 PM
To: intel-wired-lan at lists.osuosl.org
Cc: Naczyk, Jacek <[email protected]>
Subject: [Intel-wired-lan] [next PATCH S53-V2 3/5] i40e: Add FEC for 25gFrom: Carolyn Wyborny <[email protected]>
This patch adds adminq support for Forward Error Correction ("FEC")for 25g products.
Signed-off-by Carolyn Wyborny <[email protected]>Signed-off-by Mitch Williams <[email protected]>Signed-off-by Jacek Naczyk <[email protected]>Change-ID Iaff4910737c239d2c730e5c22a313ce9c37d3964
Quoted 7 lines
--- drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 25 ++++++++++++++++++++-- drivers/net/ethernet/intel/i40e/i40e_common.c | 2 ++ .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 25 ++++++++++++++++++++-- 3 files changed, 48 insertions(+), 4 deletions(-)
PATCH 4/5 i40e: Add functions which apply correct PHY access method for read and write operation
In reply to Bimmy PujariFrom: Michal Kosiarz <[email protected]>
Depending on external PHY type, register access method should be different. Clause22 or Clause45 can be chosen for different PHYs. Implemented functions apply correct access method for used device.
--- drivers/net/ethernet/intel/i40e/i40e_common.c | 72 ++++++++++++++++++++++ drivers/net/ethernet/intel/i40e/i40e_prototype.h | 4 ++ drivers/net/ethernet/intel/i40evf/i40e_prototype.h | 4 ++ 3 files changed, 80 insertions(+)
drivers/net/ethernet/intel/i40e/i40e_common.c +72 -0
@@ -4676,6 +4676,78 @@ i40e_status i40e_write_phy_register_clause45(struct i40e_hw *hw, u8 page, }/** +* i40e_write_phy_register +* @hw: pointer to the HW structure +* @page: registers page number +* @reg: register address in the page +* @phy_adr: PHY address on MDIO interface +* @value: PHY register value +* +* Writes value to specified PHY register +**/ +i40e_status i40e_write_phy_register (struct i40e_hw *hw, +u8 page,u16 reg,u8 phy_addr,u16 value) +{ +i40e_status status; + +switch (hw->device_id) { +case I40E_DEV_ID_1G_BASE_T_X722 : + status =i40e_write_phy_register_clause22 (hw, + reg, phy_addr, value); +break ; +case I40E_DEV_ID_10G_BASE_T : +case I40E_DEV_ID_10G_BASE_T4 : +case I40E_DEV_ID_10G_BASE_T_X722 : +case I40E_DEV_ID_25G_B : +case I40E_DEV_ID_25G_SFP28 : + status =i40e_write_phy_register_clause45 (hw, + page, reg, phy_addr, value); +break ; +default : + status =I40E_ERR_UNKNOWN_PHY ; +break ; + } + +return status; +} + +/** +* i40e_read_phy_register +* @hw: pointer to the HW structure +* @page: registers page number +* @reg: register address in the page +* @phy_adr: PHY address on MDIO interface +* @value: PHY register value +* +* Reads specified PHY register value +**/ +i40e_status i40e_read_phy_register (struct i40e_hw *hw, +u8 page,u16 reg,u8 phy_addr,u16 *value) +{ +i40e_status status; + +switch (hw->device_id) { +case I40E_DEV_ID_1G_BASE_T_X722 : + status =i40e_read_phy_register_clause22 (hw, reg, phy_addr, + value); +break ; +case I40E_DEV_ID_10G_BASE_T : +case I40E_DEV_ID_10G_BASE_T4 : +case I40E_DEV_ID_10G_BASE_T_X722 : +case I40E_DEV_ID_25G_B : +case I40E_DEV_ID_25G_SFP28 : + status =i40e_read_phy_register_clause45 (hw, page, reg, + phy_addr, value); +break ; +default : + status =I40E_ERR_UNKNOWN_PHY ; +break ; + } + +return status; +} + +/** * i40e_get_phy_address * @hw: pointer to the HW structure * @dev_num: PHY port num that address we want
drivers/net/ethernet/intel/i40e/i40e_prototype.h +4 -0
@@ -373,6 +373,10 @@ i40e_status i40e_read_phy_register_clause45(struct i40e_hw *hw, u8 page, u16 reg, u8 phy_addr, u16 *value);i40e_status i40e_write_phy_register_clause45 (struct i40e_hw *hw,u8 page,u16 reg,u8 phy_addr,u16 value); +i40e_status i40e_read_phy_register (struct i40e_hw *hw, +u8 page,u16 reg,u8 phy_addr,u16 *value); +i40e_status i40e_write_phy_register (struct i40e_hw *hw, +u8 page,u16 reg,u8 phy_addr,u16 value);u8 i40e_get_phy_address (struct i40e_hw *hw,u8 dev_num);i40e_status i40e_blink_phy_link_led (struct i40e_hw *hw,u32 time,u32 interval);
drivers/net/ethernet/intel/i40evf/i40e_prototype.h +4 -0
@@ -115,6 +115,10 @@ i40e_status i40e_read_phy_register(struct i40e_hw *hw, u8 page, u16 reg, u8 phy_addr, u16 *value);i40e_status i40e_write_phy_register (struct i40e_hw *hw,u8 page,u16 reg,u8 phy_addr,u16 value); +i40e_status i40e_read_phy_register (struct i40e_hw *hw, +u8 page,u16 reg,u8 phy_addr,u16 *value); +i40e_status i40e_write_phy_register (struct i40e_hw *hw, +u8 page,u16 reg,u8 phy_addr,u16 value);u8 i40e_get_phy_address (struct i40e_hw *hw,u8 dev_num);i40e_status i40e_blink_phy_link_led (struct i40e_hw *hw,u32 time,u32 interval);
Signature · 1 line
2.4.11
Bowers
PATCH 4/5 i40e: Add functions which apply correct PHY access method for read and write operation
Quoted 15 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Bimmy Pujari
Sent: Monday, November 14, 2016 1:07 PM
To: intel-wired-lan at lists.osuosl.org
Cc: Kosiarz, Michal <[email protected]>
Subject: [Intel-wired-lan] [next PATCH S53-V2 4/5] i40e: Add functions which apply correct PHY access method for read and write operationFrom: Michal Kosiarz <[email protected]>
Depending on external PHY type, register access method should be different. Clause22 or Clause45 can be chosen for different PHYs. Implemented functions apply correct access method for used device.
Quoted 8 lines
Signed-off-by Michal Kosiarz <[email protected]>Change-ID If39d5f0da9c0b905a8cbdc1ab89885535e7d0426--- drivers/net/ethernet/intel/i40e/i40e_common.c | 72 ++++++++++++++++++++++ drivers/net/ethernet/intel/i40e/i40e_prototype.h | 4 ++ drivers/net/ethernet/intel/i40evf/i40e_prototype.h | 4 ++ 3 files changed, 80 insertions(+)
PATCH 5/5 i40e: lock service task correctly
In reply to Bimmy PujariFrom: Mitch Williams <[email protected]>
The service task lock was being set in the scheduling function, not the actual service task. This would potentially leave the bit set for a long time before the task actually ran. Furthermore, if the service task takes too long, it calls the schedule function to reschedule itself - which would fail to take the lock and do nothing.
Instead, set and clear the lock bit in the service task itself. In the process, get rid of the i40e_service_event_complete() function, which is really just two lines of code that can be put right in the service task itself.
---
Testing Hints : Should be no functional change, particularly around link up/down events. This is prep work for using this lock bit in the client.
drivers/net/ethernet/intel/i40e/i40e_main.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_main.c +7 -17
@@ -288,8 +288,7 @@ struct i40e_vsi *i40e_find_vsi_from_id(struct i40e_pf *pf, u16 id)void i40e_service_event_schedule (struct i40e_pf *pf) {if (!test_bit (__I40E_DOWN, &pf->state) && - !test_bit (__I40E_RESET_RECOVERY_PENDING, &pf->state) && - !test_and_set_bit (__I40E_SERVICE_SCHED, &pf->state)) + !test_bit (__I40E_RESET_RECOVERY_PENDING, &pf->state))queue_work (i40e_wq, &pf->service_task); }
@@ -5943,19 +5942,6 @@ static void i40e_handle_lan_overflow_event(struct i40e_pf *pf, }/** -* i40e_service_event_complete - Finish up the service event -* @pf: board private structure -**/ -static void i40e_service_event_complete (struct i40e_pf *pf) -{ -WARN_ON (!test_bit (__I40E_SERVICE_SCHED, &pf->state)); - -/* flush memory to make sure state is correct before next watchog */ -smp_mb__before_atomic (); -clear_bit (__I40E_SERVICE_SCHED, &pf->state); -} - -/** * i40e_get_cur_guaranteed_fd_count - Get the consumed guaranteed FD filters * @pf: board private structure **/
@@ -7264,10 +7250,12 @@ static void i40e_service_task(struct work_struct *work)/* don't bother with service tasks if a reset is in progress */ if (test_bit (__I40E_RESET_RECOVERY_PENDING, &pf->state)) { -i40e_service_event_complete (pf);return ; } +if (test_and_set_bit (__I40E_SERVICE_SCHED, &pf->state)) +return ; +i40e_detect_recover_hung (pf);i40e_sync_filters_subtask (pf);i40e_reset_subtask (pf);
@@ -7280,7 +7268,9 @@ static void i40e_service_task(struct work_struct *work)i40e_sync_udp_filters_subtask (pf);i40e_clean_adminq_subtask (pf); -i40e_service_event_complete (pf); +/* flush memory to make sure state is correct before next watchdog */ +smp_mb__before_atomic (); +clear_bit (__I40E_SERVICE_SCHED, &pf->state);/* If the tasks have taken longer than one timer cycle or there * is more work to be done, reschedule the service task now
Signature · 1 line
2.4.11
Bowers
PATCH 5/5 i40e: lock service task correctly
Quoted 20 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Bimmy Pujari
Sent: Monday, November 14, 2016 1:07 PM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [next PATCH S53-V2 5/5] i40e: lock service task correctlyFrom: Mitch Williams <[email protected]>
The service task lock was being set in the scheduling function, not the actual service task. This would potentially leave the bit set for a long time before the task actually ran. Furthermore, if the service task takes too long, it calls the schedule function to reschedule itself - which would fail to take the lock and do nothing.
Instead, set and clear the lock bit in the service task itself. In the process, get rid of the
i40e_service_event_complete()function, which is really just two lines of code that can be put right in the service task itself.
Quoted 8 lines
Signed-off-by Mitch Williams <[email protected]>Change-ID I83155e682b686121e2897f4429eb7d3f7c669168---
Testing Hints : Should be no functional change, particularly around link up/down events. This is prep work for using this lock bit in the client.drivers/net/ethernet/intel/i40e/i40e_main.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-)
Bowers
PATCH 1/5 i40e: use unsigned printf format specifier for active_filters count
In reply to Bimmy PujariQuoted 18 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Bimmy Pujari
Sent: Monday, November 14, 2016 1:07 PM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [next PATCH S53-V2 1/5] i40e: use unsigned printf format specifier foractive_filterscountFrom: Jacob Keller <[email protected]>
Replace the %d specifier used for printing
vsi->active_filtersandvsi->promisc_thresholdwith an unsigned %u format specifier. While it is unlikely in practice that these values will ever reach such a large number they are unsigned values and thus should not be interpreted as negative numbers.Signed-off-by Jacob Keller <[email protected]>Change-ID Iff050fad5a1c8537c4c57fcd527441cd95cfc0d4
Quoted 7 lines
---
Testing-hints:
This should go upstream, even though it is in debugfs code. We're not adding features but simply correcting output of existing features.drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)