i40e: Fix for persistent lldp support
Subsystems (2)
PATCH 1/10 i40e: Fix for persistent lldp support
From: Sylwia Wnuczko <[email protected]>
This patch fixes function to read nvm module data and uses it to read current lldp agent configuration from nvm api version 1.8.
--- drivers/net/ethernet/intel/i40e/i40e_dcb.c | 4 +- drivers/net/ethernet/intel/i40e/i40e_dcb.h | 3 + drivers/net/ethernet/intel/i40e/i40e_nvm.c | 61 ++++++++++--------- .../net/ethernet/intel/i40e/i40e_prototype.h | 10 +-- 4 files changed, 44 insertions(+), 34 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_dcb.c +3 -1
@@ -889,7 +889,9 @@ i40e_status i40e_init_dcb(struct i40e_hw *hw, bool enable_mib_change) ret =i40e_read_nvm_module_data (hw,I40E_SR_EMP_SR_SETTINGS_PTR , - offset,1 , + offset, +I40E_LLDP_CURRENT_STATUS_OFFSET , +I40E_LLDP_CURRENT_STATUS_SIZE , &lldp_cfg.adminstatus); }else { ret =i40e_read_lldp_cfg (hw, &lldp_cfg);
drivers/net/ethernet/intel/i40e/i40e_dcb.h +3 -0
@@ -32,6 +32,9 @@#define I40E_CEE_MAX_FEAT_TYPE 3#define I40E_LLDP_CURRENT_STATUS_XL710_OFFSET 0x2B#define I40E_LLDP_CURRENT_STATUS_X722_OFFSET 0x31 +#define I40E_LLDP_CURRENT_STATUS_OFFSET 1 +#define I40E_LLDP_CURRENT_STATUS_SIZE 1 +/* Defines for LLDP TLV header */ #define I40E_LLDP_TLV_LEN_SHIFT 0#define I40E_LLDP_TLV_LEN_MASK (0x01FF << I40E_LLDP_TLV_LEN_SHIFT)
drivers/net/ethernet/intel/i40e/i40e_nvm.c +32 -29
88 lines not on this page · raw message
drivers/net/ethernet/intel/i40e/i40e_prototype.h +6 -4
@@ -315,10 +315,12 @@ i40e_status i40e_acquire_nvm(struct i40e_hw *hw,void i40e_release_nvm (struct i40e_hw *hw);i40e_status i40e_read_nvm_word (struct i40e_hw *hw,u16 offset,u16 *data); -i40e_status i40e_read_nvm_module_data (struct i40e_hw *hw, -u8 module_ptr,u16 offset, -u16 words_data_size, -u16 *data_ptr); +enum i40e_status_code i40e_read_nvm_module_data (struct i40e_hw *hw, +u8 module_ptr, +u16 module_offset, +u16 data_offset, +u16 words_data_size, +u16 *data_ptr);i40e_status i40e_read_nvm_buffer (struct i40e_hw *hw,u16 offset,u16 *words,u16 *data);i40e_status i40e_update_nvm_checksum (struct i40e_hw *hw);
Signature · 1 line
2.21.0
PATCH 2/10 i40e: Add ability to display VF stats along with PF core stats
From: Arkadiusz Grubba <[email protected]>
This change introduces the ability to display extended (enhanced) statistics for PF interfaces (in accordance to the new build flags also introduced here).
The patch introduces new arrays and preprocessor symbols defined for these extra stats (in i40e_ethtool.c file) and enhances/extends ethtool ops functions intended for dealing with PF stats (i.e.: i40e_get_stats_count(), i40e_get_ethtool_stats(), i40e_get_stat_strings() ).
There have also been introduced the new build flag named "I40E_PF_EXTRA_STATS_OFF" to exclude from the driver code all code snippets associated with these extra stats.
--- .../net/ethernet/intel/i40e/i40e_ethtool.c | 149 ++++++++++++++++++ 1 file changed, 149 insertions(+)
drivers/net/ethernet/intel/i40e/i40e_ethtool.c +149 -0
@@ -389,6 +389,7 @@ static const struct i40e_stats i40e_gstrings_pfc_stats[] = {#define I40E_GLOBAL_STATS_LEN ARRAY_SIZE(i40e_gstrings_stats) +/* Length (number) of PF core stats only (i.e. without queues / extra stats): */ #define I40E_PF_STATS_LEN (I40E_GLOBAL_STATS_LEN + \ I40E_PFC_STATS_LEN + \ I40E_VEB_STATS_LEN + \
@@ -397,6 +398,44 @@ static const struct i40e_stats i40e_gstrings_pfc_stats[] = {/* Length of stats for a single queue */ #define I40E_QUEUE_STATS_LEN ARRAY_SIZE(i40e_gstrings_queue_stats) +#define I40E_STATS_NAME_VFID_EXTRA "vf___." +#define I40E_STATS_NAME_VFID_EXTRA_LEN (sizeof(I40E_STATS_NAME_VFID_EXTRA) - 1) + +static struct i40e_stats i40e_gstrings_eth_stats_extra[] = { +I40E_VSI_STAT (I40E_STATS_NAME_VFID_EXTRA +"rx_bytes" , eth_stats.rx_bytes), +I40E_VSI_STAT (I40E_STATS_NAME_VFID_EXTRA +"rx_unicast" , eth_stats.rx_unicast), +I40E_VSI_STAT (I40E_STATS_NAME_VFID_EXTRA +"rx_multicast" , eth_stats.rx_multicast), +I40E_VSI_STAT (I40E_STATS_NAME_VFID_EXTRA +"rx_broadcast" , eth_stats.rx_broadcast), +I40E_VSI_STAT (I40E_STATS_NAME_VFID_EXTRA +"rx_discards" , eth_stats.rx_discards), +I40E_VSI_STAT (I40E_STATS_NAME_VFID_EXTRA +"rx_unknown_protocol" , eth_stats.rx_unknown_protocol), +I40E_VSI_STAT (I40E_STATS_NAME_VFID_EXTRA +"tx_bytes" , eth_stats.tx_bytes), +I40E_VSI_STAT (I40E_STATS_NAME_VFID_EXTRA +"tx_unicast" , eth_stats.tx_unicast), +I40E_VSI_STAT (I40E_STATS_NAME_VFID_EXTRA +"tx_multicast" , eth_stats.tx_multicast), +I40E_VSI_STAT (I40E_STATS_NAME_VFID_EXTRA +"tx_broadcast" , eth_stats.tx_broadcast), +I40E_VSI_STAT (I40E_STATS_NAME_VFID_EXTRA +"tx_discards" , eth_stats.tx_discards), +I40E_VSI_STAT (I40E_STATS_NAME_VFID_EXTRA +"tx_errors" , eth_stats.tx_errors), +}; + +#define I40E_STATS_EXTRA_COUNT 128/* as for now only I40E_MAX_VF_COUNT */ +/* Following length value does not include the length values for queues stats */ +#define I40E_STATS_EXTRA_LEN ARRAY_SIZE(i40e_gstrings_eth_stats_extra) +/* Length (number) of PF extra stats only (i.e. without core stats / queues): */ +#define I40E_PF_STATS_EXTRA_LEN (I40E_STATS_EXTRA_COUNT * I40E_STATS_EXTRA_LEN) +/* Length (number) of enhanced/all PF stats (i.e. core with extra stats): */ +#define I40E_PF_STATS_ENHANCE_LEN (I40E_PF_STATS_LEN + I40E_PF_STATS_EXTRA_LEN) +enum i40e_ethtool_test_id {I40E_ETH_TEST_REG =0 ,I40E_ETH_TEST_EEPROM ,
@@ -2190,6 +2229,9 @@ static int i40e_get_stats_count(struct net_device *netdev)*/ stats_len +=I40E_QUEUE_STATS_LEN *2 * netdev->num_tx_queues; +if (vsi == pf->vsi[pf->lan_vsi] && pf->hw.partition_id ==1 ) + stats_len +=I40E_PF_STATS_EXTRA_LEN ; +return stats_len; }
@@ -2258,6 +2300,10 @@ static void i40e_get_ethtool_stats(struct net_device *netdev,struct i40e_vsi *vsi = np->vsi;struct i40e_pf *pf = vsi->back;struct i40e_veb *veb =NULL ; +unsigned int vsi_idx; +unsigned int vf_idx; +unsigned int vf_id; +bool is_vf_valid;unsigned int i;bool veb_stats;u64 *p = data;
@@ -2307,11 +2353,109 @@ static void i40e_get_ethtool_stats(struct net_device *netdev,i40e_add_ethtool_stats (&data, &pfc, i40e_gstrings_pfc_stats); } +/* As for now, we only process the SRIOV type VSIs (as extra stats to +* PF core stats) which are correlated with VF LAN VSI (hence below, +* in this for-loop instruction block, only VF's LAN VSIs are currently +* processed). +*/ +for (vf_id =0 ; vf_id < pf->num_alloc_vfs; vf_id++) { + is_vf_valid = true; +for (vf_idx =0 ; vf_idx < pf->num_alloc_vfs; vf_idx++) +if (pf->vf[vf_idx].vf_id == vf_id) +break ; +if (vf_idx >= pf->num_alloc_vfs) { +dev_info (&pf->pdev->dev, +"In the PF's array, there is no VF instance with VF_ID identifier %d or it is not set/initialized correctly yet\n" , + vf_id); + is_vf_valid = false; + goto check_vf; + } + vsi_idx = pf->vf[vf_idx].lan_vsi_idx; + + vsi = pf->vsi[vsi_idx]; +if (!vsi) { +/* It means empty field in the PF VSI array... */ +dev_info (&pf->pdev->dev, +"No LAN VSI instance referenced by VF %d or it is not set/initialized correctly yet\n" , + vf_id); + is_vf_valid = false; + goto check_vf; + } +if (vsi->vf_id != vf_id) { +dev_info (&pf->pdev->dev, +"In the PF's array, there is incorrectly set/initialized LAN VSI or reference to it from VF %d is not set/initialized correctly yet\n" , + vf_id); + is_vf_valid = false; + goto check_vf; + } +if (vsi->vf_id != pf->vf[vf_idx].vf_id || + !i40e_find_vsi_from_id (pf, pf->vf[vsi->vf_id].lan_vsi_id)) { +/* Disjointed identifiers or broken references VF-VSI */ +dev_warn (&pf->pdev->dev, +"SRIOV LAN VSI (index %d in PF VSI array) with invalid VF Identifier %d (referenced by VF %d, ordered as %d in VF array)\n" , + vsi_idx, pf->vsi[vsi_idx]->vf_id, + pf->vf[vf_idx].vf_id, vf_idx); + is_vf_valid = false; + } +check_vf: +if (!is_vf_valid) { +i40e_add_ethtool_stats (&data,NULL , + i40e_gstrings_eth_stats_extra); + }else { +i40e_update_eth_stats (vsi); +i40e_add_ethtool_stats (&data, vsi, + i40e_gstrings_eth_stats_extra); + } + } +for (; vf_id <I40E_STATS_EXTRA_COUNT ; vf_id++) +i40e_add_ethtool_stats (&data,NULL , + i40e_gstrings_eth_stats_extra); + check_data_pointer:WARN_ONCE (data - p !=i40e_get_stats_count (netdev),"ethtool stats count mismatch!" ); } +/** +* __i40e_update_vfid_in_stats_strings - print VF num to stats names +* @stats_extra: array of stats structs with stats name strings +* @strings_num: number of stats name strings in array above (length) +* @vf_id: VF number to update stats name strings with +* +* Helper function to i40e_get_stat_strings() in case of extra stats. +**/ +static inline void +__i40e_update_vfid_in_stats_strings (struct i40e_stats stats_extra[], +int strings_num,int vf_id) +{ +int i; + +for (i =0 ; i < strings_num; i++) { +snprintf (stats_extra[i].stat_string, +I40E_STATS_NAME_VFID_EXTRA_LEN ,"vf%03d" , vf_id); + stats_extra[i].stat_string[I40E_STATS_NAME_VFID_EXTRA_LEN - +1 ] ='.' ; + } +} + +/** +* i40e_update_vfid_in_stats - print VF num to stat names +* @stats_extra: array of stats structs with stats name strings +* @vf_id: VF number to update stats name strings with +* +* Helper macro to i40e_get_stat_strings() to ease use of +* __i40e_update_vfid_in_stats_strings() function due to extra stats. +* +* Macro to ease the use of __i40e_update_vfid_in_stats_strings by taking +* a static constant stats array and passing the ARRAY_SIZE(). This avoids typos +* by ensuring that we pass the size associated with the given stats array. +* +* The parameter @stats_extra is evaluated twice, so parameters with side +* effects should be avoided. +**/ +#define i40e_update_vfid_in_stats (stats_extra, vf_id) \ +__i40e_update_vfid_in_stats_strings(stats_extra, ARRAY_SIZE(stats_extra), vf_id) +/** * i40e_get_stat_strings - copy stat strings into supplied buffer * @netdev: the netdev to collect strings for
@@ -2354,6 +2498,11 @@ static void i40e_get_stat_strings(struct net_device *netdev, u8 *data)for (i =0 ; i <I40E_MAX_USER_PRIORITY ; i++)i40e_add_stat_strings (&data, i40e_gstrings_pfc_stats, i); +for (i =0 ; i <I40E_STATS_EXTRA_COUNT ; i++) { +i40e_update_vfid_in_stats (i40e_gstrings_eth_stats_extra, i); +i40e_add_stat_strings (&data, i40e_gstrings_eth_stats_extra); + } + check_data_pointer:WARN_ONCE (data - p !=i40e_get_stats_count (netdev) *ETH_GSTRING_LEN ,"stat strings count mismatch!" );
Signature · 1 line
2.21.0
Bowers
PATCH 2/10 i40e: Add ability to display VF stats along with PF core stats
Quoted 20 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Friday, September 20, 2019 2:17 AM
To: Michael, Alice <[email protected]>; intel-wired-
lan at lists.osuosl.org
Cc: Grubba, Arkadiusz <[email protected]>
Subject: [Intel-wired-lan] [next PATCH S10 02/10] i40e: Add ability to display VF stats along with PF core statsFrom: Arkadiusz Grubba <[email protected]>
This change introduces the ability to display extended (enhanced) statistics for PF interfaces (in accordance to the new build flags also introduced here).
The patch introduces new arrays and preprocessor symbols defined for these extra stats (in
i40e_ethtool.cfile) and enhances/extends ethtool ops functions intended for dealing with PF stats (i.e.:i40e_get_stats_count(),i40e_get_ethtool_stats(),i40e_get_stat_strings()).
Quoted 8 lines
There have also been introduced the new build flag named "
I40E_PF_EXTRA_STATS_OFF" to exclude from the driver code all code snippets associated with these extra stats.Signed-off-by Arkadiusz Grubba <[email protected]>--- .../net/ethernet/intel/i40e/i40e_ethtool.c | 149 ++++++++++++++++++ 1 file changed, 149 insertions(+)
PATCH 3/10 i40e: Wrong 'Advertised FEC modes' after set FEC to AUTO
In reply to Alice MichaelFrom: Jaroslaw Gawin <[email protected]>
Fix display of parameters "Configured FEC encodings:" and "Advertised FEC modes:" in ethtool. Implemented by setting proper FEC bits in ?advertising? bitmask of link_modes struct and ?fec? bitmask in ethtool_fecparam struct. Without this patch wrong FEC settings can be shown.
--- drivers/net/ethernet/intel/i40e/i40e_common.c | 13 ++++++-- .../net/ethernet/intel/i40e/i40e_ethtool.c | 32 +++++++++---------- 2 files changed, 26 insertions(+), 19 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_common.c +10 -3
@@ -2570,9 +2570,16 @@ noinline_for_stack i40e_status i40e_update_link_info(struct i40e_hw *hw)if (status)return status; - hw->phy.link_info.req_fec_info = - abilities.fec_cfg_curr_mod_ext_info & - (I40E_AQ_REQUEST_FEC_KR |I40E_AQ_REQUEST_FEC_RS ); +if (abilities.fec_cfg_curr_mod_ext_info & +I40E_AQ_ENABLE_FEC_AUTO ) + hw->phy.link_info.req_fec_info = + (I40E_AQ_REQUEST_FEC_KR | +I40E_AQ_REQUEST_FEC_RS ); +else + hw->phy.link_info.req_fec_info = + abilities.fec_cfg_curr_mod_ext_info & + (I40E_AQ_REQUEST_FEC_KR | +I40E_AQ_REQUEST_FEC_RS );memcpy (hw->phy.link_info.module_type, &abilities.module_type,sizeof (hw->phy.link_info.module_type));
drivers/net/ethernet/intel/i40e/i40e_ethtool.c +16 -16
@@ -761,7 +761,14 @@ static void i40e_get_settings_link_up_fec(u8 req_fec_info,ethtool_link_ksettings_add_link_mode (ks, supported,FEC_RS );ethtool_link_ksettings_add_link_mode (ks, supported,FEC_BASER ); -if (I40E_AQ_SET_FEC_REQUEST_RS & req_fec_info) { +if ((I40E_AQ_SET_FEC_REQUEST_RS & req_fec_info) && + (I40E_AQ_SET_FEC_REQUEST_KR & req_fec_info)) { +ethtool_link_ksettings_add_link_mode (ks, advertising, +FEC_NONE ); +ethtool_link_ksettings_add_link_mode (ks, advertising, +FEC_BASER ); +ethtool_link_ksettings_add_link_mode (ks, advertising,FEC_RS ); + }else if (I40E_AQ_SET_FEC_REQUEST_RS & req_fec_info) {ethtool_link_ksettings_add_link_mode (ks, advertising,FEC_RS ); }else if (I40E_AQ_SET_FEC_REQUEST_KR & req_fec_info) { ethtool_link_ksettings_add_link_mode(ks, advertising,
@@ -769,12 +776,6 @@ static void i40e_get_settings_link_up_fec(u8 req_fec_info, }else {ethtool_link_ksettings_add_link_mode (ks, advertising,FEC_NONE ); -if (I40E_AQ_SET_FEC_AUTO & req_fec_info) { -ethtool_link_ksettings_add_link_mode (ks, advertising, -FEC_RS ); -ethtool_link_ksettings_add_link_mode (ks, advertising, -FEC_BASER ); - } } }
@@ -1476,6 +1477,7 @@ static int i40e_get_fec_param(struct net_device *netdev,struct i40e_hw *hw = &pf->hw;i40e_status status =0 ;int err =0 ; +u8 fec_cfg;/* Get the current phy config */ memset (&abilities,0 ,sizeof (abilities));
@@ -1487,18 +1489,16 @@ static int i40e_get_fec_param(struct net_device *netdev, } fecparam->fec =0 ; -if (abilities.fec_cfg_curr_mod_ext_info &I40E_AQ_SET_FEC_AUTO ) + fec_cfg = abilities.fec_cfg_curr_mod_ext_info; +if (fec_cfg &I40E_AQ_SET_FEC_AUTO ) fecparam->fec |=ETHTOOL_FEC_AUTO ; -if ((abilities.fec_cfg_curr_mod_ext_info & -I40E_AQ_SET_FEC_REQUEST_RS ) || - (abilities.fec_cfg_curr_mod_ext_info & -I40E_AQ_SET_FEC_ABILITY_RS )) +else if (fec_cfg & (I40E_AQ_SET_FEC_REQUEST_RS | +I40E_AQ_SET_FEC_ABILITY_RS )) fecparam->fec |=ETHTOOL_FEC_RS ; -if ((abilities.fec_cfg_curr_mod_ext_info & -I40E_AQ_SET_FEC_REQUEST_KR ) || - (abilities.fec_cfg_curr_mod_ext_info &I40E_AQ_SET_FEC_ABILITY_KR )) +else if (fec_cfg & (I40E_AQ_SET_FEC_REQUEST_KR | +I40E_AQ_SET_FEC_ABILITY_KR )) fecparam->fec |=ETHTOOL_FEC_BASER ; -if (abilities.fec_cfg_curr_mod_ext_info ==0 ) +if (fec_cfg ==0 ) fecparam->fec |=ETHTOOL_FEC_OFF ;if (hw->phy.link_info.fec_info &I40E_AQ_CONFIG_FEC_KR_ENA )
Signature · 1 line
2.21.0
Bowers
PATCH 3/10 i40e: Wrong 'Advertised FEC modes' after set FEC to AUTO
Quoted 17 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Friday, September 20, 2019 2:17 AM
To: Michael, Alice <[email protected]>; intel-wired- lan at lists.osuosl.org
Cc: Gawin, JaroslawX <[email protected]>
Subject: [Intel-wired-lan] [next PATCH S10 03/10] i40e: Wrong 'Advertised FEC modes' after set FEC to AUTOFrom: Jaroslaw Gawin <[email protected]>
Fix display of parameters "Configured FEC encodings:" and "Advertised FEC modes:" in ethtool. Implemented by setting proper FEC bits in ?advertising? bitmask of
link_modesstruct and ?fec? bitmask inethtool_fecparamstruct. Without this patch wrong FEC settings can be shown.
Quoted 5 lines
Signed-off-by Jaroslaw Gawin <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_common.c | 13 ++++++-- .../net/ethernet/intel/i40e/i40e_ethtool.c | 32 +++++++++---------- 2 files changed, 26 insertions(+), 19 deletions(-)
PATCH 4/10 i40e: Extract detection of HW flags into a function
In reply to Alice MichaelFrom: Piotr Azarewicz <[email protected]>
Move code detecting HW flags based on device type and FW API version into a single function.
--- drivers/net/ethernet/intel/i40e/i40e_adminq.c | 71 +++++++++++++++---- drivers/net/ethernet/intel/i40e/i40e_common.c | 4 -- 2 files changed, 58 insertions(+), 17 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_adminq.c +58 -13
@@ -507,6 +507,59 @@ static i40e_status i40e_shutdown_arq(struct i40e_hw *hw)return ret_code; } +/** +* i40e_set_hw_flags - set HW flags +* @hw: pointer to the hardware structure +**/ +static void i40e_set_hw_flags (struct i40e_hw *hw) +{ +struct i40e_adminq_info *aq = &hw->aq; + + hw->flags =0 ; + +switch (hw->mac.type) { +case I40E_MAC_XL710 : +if (aq->api_maj_ver >1 || + (aq->api_maj_ver ==1 && + aq->api_min_ver >=I40E_MINOR_VER_GET_LINK_INFO_XL710 )) { + hw->flags |=I40E_HW_FLAG_AQ_PHY_ACCESS_CAPABLE ; + hw->flags |=I40E_HW_FLAG_FW_LLDP_STOPPABLE ; +/* The ability to RX (not drop) 802.1ad frames */ + hw->flags |=I40E_HW_FLAG_802_1AD_CAPABLE ; + } +break ; +case I40E_MAC_X722 : + hw->flags |=I40E_HW_FLAG_AQ_SRCTL_ACCESS_ENABLE | +I40E_HW_FLAG_NVM_READ_REQUIRES_LOCK ; + +if (aq->api_maj_ver >1 || + (aq->api_maj_ver ==1 && + aq->api_min_ver >=I40E_MINOR_VER_FW_LLDP_STOPPABLE_X722 )) + hw->flags |=I40E_HW_FLAG_FW_LLDP_STOPPABLE ; +/* fall through */ +default : +break ; + } + +/* Newer versions of firmware require lock when reading the NVM */ +if (aq->api_maj_ver >1 || + (aq->api_maj_ver ==1 && + aq->api_min_ver >=5 )) + hw->flags |=I40E_HW_FLAG_NVM_READ_REQUIRES_LOCK ; + +if (aq->api_maj_ver >1 || + (aq->api_maj_ver ==1 && + aq->api_min_ver >=8 )) { + hw->flags |=I40E_HW_FLAG_FW_LLDP_PERSISTENT ; + hw->flags |=I40E_HW_FLAG_DROP_MODE ; + } + +if (aq->api_maj_ver >1 || + (aq->api_maj_ver ==1 && + aq->api_min_ver >=9 )) + hw->flags |=I40E_HW_FLAG_AQ_PHY_ACCESS_EXTENDED ; +} +/** * i40e_init_adminq - main initialization routine for Admin Queue * @hw: pointer to the hardware structure
@@ -571,6 +624,11 @@ i40e_status i40e_init_adminq(struct i40e_hw *hw)if (ret_code !=I40E_SUCCESS ) goto init_adminq_free_arq; +/* Some features were introduced in different FW API version +* for different MAC type. +*/ +i40e_set_hw_flags (hw); +/* get the NVM version info */ i40e_read_nvm_word (hw,I40E_SR_NVM_DEV_STARTER_VERSION , &hw->nvm.version);
@@ -596,25 +654,12 @@ i40e_status i40e_init_adminq(struct i40e_hw *hw) hw->flags |=I40E_HW_FLAG_FW_LLDP_STOPPABLE ; } -/* Newer versions of firmware require lock when reading the NVM */ -if (hw->aq.api_maj_ver >1 || - (hw->aq.api_maj_ver ==1 && - hw->aq.api_min_ver >=5 )) - hw->flags |=I40E_HW_FLAG_NVM_READ_REQUIRES_LOCK ; -/* The ability to RX (not drop) 802.1ad frames was added in API 1.7 */ if (hw->aq.api_maj_ver >1 || (hw->aq.api_maj_ver ==1 && hw->aq.api_min_ver >=7 )) hw->flags |=I40E_HW_FLAG_802_1AD_CAPABLE ; -if (hw->aq.api_maj_ver >1 || - (hw->aq.api_maj_ver ==1 && - hw->aq.api_min_ver >=8 )) { - hw->flags |=I40E_HW_FLAG_FW_LLDP_PERSISTENT ; - hw->flags |=I40E_HW_FLAG_DROP_MODE ; - } -if (hw->aq.api_maj_ver >I40E_FW_API_VERSION_MAJOR ) { ret_code =I40E_ERR_FIRMWARE_API_VERSION ; goto init_adminq_free_arq;
drivers/net/ethernet/intel/i40e/i40e_common.c +0 -4
@@ -933,10 +933,6 @@ i40e_status i40e_init_shared_code(struct i40e_hw *hw)else hw->pf_id = (u8)(func_rid &0x7 ); -if (hw->mac.type ==I40E_MAC_X722 ) - hw->flags |=I40E_HW_FLAG_AQ_SRCTL_ACCESS_ENABLE | -I40E_HW_FLAG_NVM_READ_REQUIRES_LOCK ; - status =i40e_init_nvm (hw);return status; }
Signature · 1 line
2.21.0
Bowers
PATCH 4/10 i40e: Extract detection of HW flags into a function
Quoted 12 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Friday, September 20, 2019 2:17 AM
To: Michael, Alice <[email protected]>; intel-wired-
lan at lists.osuosl.org
Cc: Azarewicz, Piotr <[email protected]>
Subject: [Intel-wired-lan] [next PATCH S10 04/10] i40e: Extract detection of HW flags into a functionFrom: Piotr Azarewicz <[email protected]>
Quoted 8 lines
Move code detecting HW flags based on device type and FW API version into a single function.
Signed-off-by Piotr Azarewicz <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_adminq.c | 71 +++++++++++++++---- drivers/net/ethernet/intel/i40e/i40e_common.c | 4 -- 2 files changed, 58 insertions(+), 17 deletions(-)
PATCH 5/10 i40e: Extend PHY access with page change flag
In reply to Alice MichaelFrom: Piotr Azarewicz <[email protected]>
Currently FW use MDIO I/F number corresponded with current PF for PHY access. This code allow to specify used MDIO I/F number.
Add new field - command flags with only one flag for now. Added flag tells FW that it shouldn't change page while accessing QSFP module, as it was set manually.
--- .../net/ethernet/intel/i40e/i40e_adminq_cmd.h | 8 ++- drivers/net/ethernet/intel/i40e/i40e_common.c | 70 +++++++++++++++---- .../net/ethernet/intel/i40e/i40e_ethtool.c | 8 +-- .../net/ethernet/intel/i40e/i40e_prototype.h | 26 ++++--- drivers/net/ethernet/intel/i40e/i40e_type.h | 1 + 5 files changed, 87 insertions(+), 26 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h +7 -1
@@ -2249,7 +2249,13 @@ struct i40e_aqc_phy_register_access {#define I40E_AQ_PHY_REG_ACCESS_EXTERNAL 1#define I40E_AQ_PHY_REG_ACCESS_EXTERNAL_MODULE 2u8 dev_address; -u8 reserved1[2 ]; +u8 cmd_flags; +#define I40E_AQ_PHY_REG_ACCESS_DONT_CHANGE_QSFP_PAGE 0x01 +#define I40E_AQ_PHY_REG_ACCESS_SET_MDIO_IF_NUMBER 0x02 +#define I40E_AQ_PHY_REG_ACCESS_MDIO_IF_NUMBER_SHIFT 2 +#define I40E_AQ_PHY_REG_ACCESS_MDIO_IF_NUMBER_MASK (0x3 << \ + I40E_AQ_PHY_REG_ACCESS_MDIO_IF_NUMBER_SHIFT) +u8 reserved1;__le32 reg_address;__le32 reg_value;u8 reserved2[4 ];
drivers/net/ethernet/intel/i40e/i40e_common.c +57 -13
130 lines not on this page · raw message
drivers/net/ethernet/intel/i40e/i40e_ethtool.c +4 -4
@@ -5261,7 +5261,7 @@ static int i40e_get_module_info(struct net_device *netdev,case I40E_MODULE_TYPE_SFP : status =i40e_aq_get_phy_register (hw,I40E_AQ_PHY_REG_ACCESS_EXTERNAL_MODULE , -I40E_I2C_EEPROM_DEV_ADDR , +I40E_I2C_EEPROM_DEV_ADDR , true,I40E_MODULE_SFF_8472_COMP , &sff8472_comp,NULL );if (status)
@@ -5269,7 +5269,7 @@ static int i40e_get_module_info(struct net_device *netdev, status =i40e_aq_get_phy_register (hw,I40E_AQ_PHY_REG_ACCESS_EXTERNAL_MODULE , -I40E_I2C_EEPROM_DEV_ADDR , +I40E_I2C_EEPROM_DEV_ADDR , true,I40E_MODULE_SFF_8472_SWAP , &sff8472_swap,NULL );if (status)
@@ -5301,7 +5301,7 @@ static int i40e_get_module_info(struct net_device *netdev,/* Read from memory page 0. */ status =i40e_aq_get_phy_register (hw,I40E_AQ_PHY_REG_ACCESS_EXTERNAL_MODULE , -0 , +0 , true,I40E_MODULE_REVISION_ADDR , &sff8636_rev,NULL );if (status)
@@ -5372,7 +5372,7 @@ static int i40e_get_module_eeprom(struct net_device *netdev, status =i40e_aq_get_phy_register (hw,I40E_AQ_PHY_REG_ACCESS_EXTERNAL_MODULE , - addr, offset, &value,NULL ); + true, addr, offset, &value,NULL );if (status)return -EIO ; data[i] = value;
drivers/net/ethernet/intel/i40e/i40e_prototype.h +18 -8
@@ -411,14 +411,24 @@ i40e_status i40e_aq_rx_ctl_write_register(struct i40e_hw *hw, u32 reg_addr, u32 reg_val, struct i40e_asq_cmd_details *cmd_details);void i40e_write_rx_ctl (struct i40e_hw *hw,u32 reg_addr,u32 reg_val); -i40e_status i40e_aq_set_phy_register (struct i40e_hw *hw, -u8 phy_select,u8 dev_addr, -u32 reg_addr,u32 reg_val, -struct i40e_asq_cmd_details *cmd_details); -i40e_status i40e_aq_get_phy_register (struct i40e_hw *hw, -u8 phy_select,u8 dev_addr, -u32 reg_addr,u32 *reg_val, -struct i40e_asq_cmd_details *cmd_details); +enum i40e_status_code +i40e_aq_set_phy_register_ext (struct i40e_hw *hw, +u8 phy_select,u8 dev_addr,bool page_change, +bool set_mdio,u8 mdio_num, +u32 reg_addr,u32 reg_val, +struct i40e_asq_cmd_details *cmd_details); +enum i40e_status_code +i40e_aq_get_phy_register_ext (struct i40e_hw *hw, +u8 phy_select,u8 dev_addr,bool page_change, +bool set_mdio,u8 mdio_num, +u32 reg_addr,u32 *reg_val, +struct i40e_asq_cmd_details *cmd_details); + +/* Convenience wrappers for most common use case */ +#define i40e_aq_set_phy_register (hw, ps, da, pc, ra, rv, cd) \ + i40e_aq_set_phy_register_ext(hw, ps, da, pc, false, 0, ra, rv, cd) +#define i40e_aq_get_phy_register (hw, ps, da, pc, ra, rv, cd) \ + i40e_aq_get_phy_register_ext(hw, ps, da, pc, false, 0, ra, rv, cd)i40e_status i40e_read_phy_register_clause22 (struct i40e_hw *hw,u16 reg,u8 phy_addr,u16 *value);
drivers/net/ethernet/intel/i40e/i40e_type.h +1 -0
@@ -624,6 +624,7 @@ struct i40e_hw {#define I40E_HW_FLAG_NVM_READ_REQUIRES_LOCK BIT_ULL(3)#define I40E_HW_FLAG_FW_LLDP_STOPPABLE BIT_ULL(4)#define I40E_HW_FLAG_FW_LLDP_PERSISTENT BIT_ULL(5) +#define I40E_HW_FLAG_AQ_PHY_ACCESS_EXTENDED BIT_ULL(6)#define I40E_HW_FLAG_DROP_MODE BIT_ULL(7)u64 flags;
Signature · 1 line
2.21.0
Bowers
PATCH 5/10 i40e: Extend PHY access with page change flag
Quoted 19 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Friday, September 20, 2019 2:17 AM
To: Michael, Alice <[email protected]>; intel-wired- lan at lists.osuosl.org
Cc: Azarewicz, Piotr <[email protected]>
Subject: [Intel-wired-lan] [next PATCH S10 05/10] i40e: Extend PHY access with page change flagFrom: Piotr Azarewicz <[email protected]>
Currently FW use MDIO I/F number corresponded with current PF for PHY access. This code allow to specify used MDIO I/F number.
Add new field - command flags with only one flag for now. Added flag tells FW that it shouldn't change page while accessing QSFP module, as it was set manually.
Quoted 8 lines
Signed-off-by Piotr Azarewicz <[email protected]>--- .../net/ethernet/intel/i40e/i40e_adminq_cmd.h | 8 ++- drivers/net/ethernet/intel/i40e/i40e_common.c | 70 +++++++++++++++---- .../net/ethernet/intel/i40e/i40e_ethtool.c | 8 +-- .../net/ethernet/intel/i40e/i40e_prototype.h | 26 ++++--- drivers/net/ethernet/intel/i40e/i40e_type.h | 1 + 5 files changed, 87 insertions(+), 26 deletions(-)
PATCH 6/10 i40e: remove the macro with it's argument reuse
In reply to Alice MichaelFrom: Aleksandr Loktionov <[email protected]>
Remove macro and call i40e_update_vfid_in_stats() function directly to avoid checkpatch.pl complains about macro argument reuse and possible side effects.
--- .../net/ethernet/intel/i40e/i40e_ethtool.c | 28 ++++--------------- 1 file changed, 6 insertions(+), 22 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_ethtool.c +6 -22
@@ -2417,7 +2417,7 @@ static void i40e_get_ethtool_stats(struct net_device *netdev, }/** -* __i40e_update_vfid_in_stats_strings - print VF num to stats names +* i40e_update_vfid_in_stats - print VF num to stats names * @stats_extra: array of stats structs with stats name strings * @strings_num: number of stats name strings in array above (length) * @vf_id: VF number to update stats name strings with
@@ -2425,8 +2425,8 @@ static void i40e_get_ethtool_stats(struct net_device *netdev,* Helper function to i40e_get_stat_strings() in case of extra stats. **/ static inline void -__i40e_update_vfid_in_stats_strings (struct i40e_stats stats_extra[], -int strings_num,int vf_id) +i40e_update_vfid_in_stats (struct i40e_stats stats_extra[], +int strings_num,int vf_id) {int i;
@@ -2438,24 +2438,6 @@ __i40e_update_vfid_in_stats_strings(struct i40e_stats stats_extra[], } } -/** -* i40e_update_vfid_in_stats - print VF num to stat names -* @stats_extra: array of stats structs with stats name strings -* @vf_id: VF number to update stats name strings with -* -* Helper macro to i40e_get_stat_strings() to ease use of -* __i40e_update_vfid_in_stats_strings() function due to extra stats. -* -* Macro to ease the use of __i40e_update_vfid_in_stats_strings by taking -* a static constant stats array and passing the ARRAY_SIZE(). This avoids typos -* by ensuring that we pass the size associated with the given stats array. -* -* The parameter @stats_extra is evaluated twice, so parameters with side -* effects should be avoided. -**/ -#define i40e_update_vfid_in_stats (stats_extra, vf_id) \ -__i40e_update_vfid_in_stats_strings(stats_extra, ARRAY_SIZE(stats_extra), vf_id) -/** * i40e_get_stat_strings - copy stat strings into supplied buffer * @netdev: the netdev to collect strings for
@@ -2499,7 +2481,9 @@ static void i40e_get_stat_strings(struct net_device *netdev, u8 *data)i40e_add_stat_strings (&data, i40e_gstrings_pfc_stats, i);for (i =0 ; i <I40E_STATS_EXTRA_COUNT ; i++) { -i40e_update_vfid_in_stats (i40e_gstrings_eth_stats_extra, i); +i40e_update_vfid_in_stats + (i40e_gstrings_eth_stats_extra, +ARRAY_SIZE (i40e_gstrings_eth_stats_extra), i);i40e_add_stat_strings (&data, i40e_gstrings_eth_stats_extra); }
Signature · 1 line
2.21.0
Bowers
PATCH 6/10 i40e: remove the macro with it's argument reuse
Quoted 12 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Friday, September 20, 2019 2:17 AM
To: Michael, Alice <[email protected]>; intel-wired- lan at lists.osuosl.org
Cc: Loktionov, Aleksandr <[email protected]>
Subject: [Intel-wired-lan] [next PATCH S10 06/10] i40e: remove the macro with it's argument reuseFrom: Aleksandr Loktionov <[email protected]>
Quoted 8 lines
Remove macro and call
i40e_update_vfid_in_stats()function directly to avoid checkpatch.pl complains about macro argument reuse and possible side effects.Signed-off-by Aleksandr Loktionov <[email protected]>--- .../net/ethernet/intel/i40e/i40e_ethtool.c | 28 ++++--------------- 1 file changed, 6 insertions(+), 22 deletions(-)
PATCH 7/10 i40e: initialize ITRN registers with correct values
In reply to Alice MichaelFrom: Nicholas Nunley <[email protected]>
Since commit 92418fb14750 ("i40e/i40evf: Use usec value instead of reg value for ITR defines") the driver tracks the interrupt throttling intervals in single usec units, although the actual ITRN/ITR0 registers are programmed in 2 usec units. Most register programming flows in the driver correctly handle the conversion, although it is currently not applied when the registers are initialized to their default values. Most of the time this doesn't present a problem since the default values are usually immediately overwritten through the standard adaptive throttling mechanism, or updated manually by the user, but if adaptive throttling is disabled and the interval values are left alone then the incorrect value will persist.
Since the intended default interval of 50 usecs (vs. 100 usecs as programmed) performs better for most traffic workloads, this can lead to performance regressions.
This patch adds the correct conversion when writing the initial values to the ITRN registers.
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_main.c +5 -5
@@ -3534,14 +3534,14 @@ static void i40e_vsi_configure_msix(struct i40e_vsi *vsi) q_vector->rx.target_itr =ITR_TO_REG (vsi->rx_rings[i]->itr_setting);wr32 (hw,I40E_PFINT_ITRN (I40E_RX_ITR , vector -1 ), - q_vector->rx.target_itr); + q_vector->rx.target_itr >>1 ); q_vector->rx.current_itr = q_vector->rx.target_itr; q_vector->tx.next_update = jiffies +1 ; q_vector->tx.target_itr =ITR_TO_REG (vsi->tx_rings[i]->itr_setting);wr32 (hw,I40E_PFINT_ITRN (I40E_TX_ITR , vector -1 ), - q_vector->tx.target_itr); + q_vector->tx.target_itr >>1 ); q_vector->tx.current_itr = q_vector->tx.target_itr; wr32(hw, I40E_PFINT_RATEN(vector - 1),
@@ -3646,11 +3646,11 @@ static void i40e_configure_msi_and_legacy(struct i40e_vsi *vsi)/* set the ITR configuration */ q_vector->rx.next_update = jiffies +1 ; q_vector->rx.target_itr =ITR_TO_REG (vsi->rx_rings[0 ]->itr_setting); -wr32 (hw,I40E_PFINT_ITR0 (I40E_RX_ITR ), q_vector->rx.target_itr); +wr32 (hw,I40E_PFINT_ITR0 (I40E_RX_ITR ), q_vector->rx.target_itr >>1 ); q_vector->rx.current_itr = q_vector->rx.target_itr; q_vector->tx.next_update = jiffies +1 ; q_vector->tx.target_itr =ITR_TO_REG (vsi->tx_rings[0 ]->itr_setting); -wr32 (hw,I40E_PFINT_ITR0 (I40E_TX_ITR ), q_vector->tx.target_itr); +wr32 (hw,I40E_PFINT_ITR0 (I40E_TX_ITR ), q_vector->tx.target_itr >>1 ); q_vector->tx.current_itr = q_vector->tx.target_itr;i40e_enable_misc_int_causes (pf);
@@ -11396,7 +11396,7 @@ static int i40e_setup_misc_vector(struct i40e_pf *pf)/* associate no queues to the misc vector */ wr32 (hw,I40E_PFINT_LNKLST0 ,I40E_QUEUE_END_OF_LIST ); -wr32 (hw,I40E_PFINT_ITR0 (I40E_RX_ITR ),I40E_ITR_8K ); +wr32 (hw,I40E_PFINT_ITR0 (I40E_RX_ITR ),I40E_ITR_8K >>1 );i40e_flush (hw);
Signature · 1 line
2.21.0
Bowers
PATCH 7/10 i40e: initialize ITRN registers with correct values
Quoted 26 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Friday, September 20, 2019 2:17 AM
To: Michael, Alice <[email protected]>; intel-wired- lan at lists.osuosl.org
Subject: [Intel-wired-lan] [next PATCH S10 07/10] i40e: initialize ITRN registers with correct valuesFrom: Nicholas Nunley <[email protected]>
Since commit
92418fb14750("i40e/i40evf: Use usec value instead of reg value for ITR defines") the driver tracks the interrupt throttling intervals in single usec units, although the actual ITRN/ITR0 registers are programmed in 2 usec units. Most register programming flows in the driver correctly handle the conversion, although it is currently not applied when the registers are initialized to their default values. Most of the time this doesn't present a problem since the default values are usually immediately overwritten through the standard adaptive throttling mechanism, or updated manually by the user, but if adaptive throttling is disabled and the interval values are left alone then the incorrect value will persist.Since the intended default interval of 50 usecs (vs. 100 usecs as programmed) performs better for most traffic workloads, this can lead to performance regressions.
Quoted 7 lines
This patch adds the correct conversion when writing the initial values to the ITRN registers.
Signed-off-by Nicholas Nunley <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
PATCH 8/10 i40e: allow ethtool to report SW and FW versions in recovery mode
In reply to Alice MichaelFrom: Piotr Kwapulinski <[email protected]>
Let ethtool print driver and firmware versions when NIC is in recovery mode. Assign i40e_get_drvinfo() operation to ethtool recovery mode operations. Previously ethtool did not report driver and firmware versions when NIC was in recovery mode.
--- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/intel/i40e/i40e_ethtool.c +1 -0
@@ -5375,6 +5375,7 @@ static int i40e_set_eee(struct net_device *netdev, struct ethtool_eee *edata) }static const struct ethtool_ops i40e_ethtool_recovery_mode_ops = { + .get_drvinfo = i40e_get_drvinfo, .set_eeprom = i40e_set_eeprom, .get_eeprom_len = i40e_get_eeprom_len, .get_eeprom = i40e_get_eeprom,
Signature · 1 line
2.21.0
Kwapulinski
PATCH 8/10 i40e: allow ethtool to report SW and FW versions in recovery mode
ACK
-----Original Message-----
From: Michael, Alice
Sent: Friday, September 20, 2019 11:17 AM
To: Michael, Alice <[email protected]>; intel-wired-lan at lists.osuosl.org
Cc: Kwapulinski, Piotr <[email protected]>
Subject: [next PATCH S10 08/10] i40e: allow ethtool to report SW and FW versions in recovery mode
From: Piotr Kwapulinski <[email protected]>
Let ethtool print driver and firmware versions when NIC is in recovery mode. Assign i40e_get_drvinfo() operation to ethtool recovery mode operations. Previously ethtool did not report driver and firmware versions when NIC was in recovery mode.
--- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/intel/i40e/i40e_ethtool.c +1 -1
@@ -5375,6 +5375,7 @@ static int i40e_set_eee(struct net_device *netdev, struct ethtool_eee *edata) }static const struct ethtool_ops i40e_ethtool_recovery_mode_ops = { + .get_drvinfo = i40e_get_drvinfo, .set_eeprom = i40e_set_eeprom, .get_eeprom_len = i40e_get_eeprom_len, .get_eeprom = i40e_get_eeprom, --
2.21.0
--------------------------------------------------------------------
Intel Technology Poland sp. z o.o.
ul. Slowackiego 173 | 80-298 Gdansk | Sad Rejonowy Gdansk Polnoc | VII Wydzial Gospodarczy Krajowego Rejestru Sadowego - KRS 101882 | NIP 957-07-52-316 | Kapital zakladowy 200.000 PLN.
Ta wiadomosc wraz z zalacznikami jest przeznaczona dla okreslonego adresata i moze zawierac informacje poufne. W razie przypadkowego otrzymania tej wiadomosci, prosimy o powiadomienie nadawcy oraz trwale jej usuniecie; jakiekolwiek przegladanie lub rozpowszechnianie jest zabronione.
This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). If you are not the intended recipient, please contact the sender and delete all copies; any review or distribution by others is strictly prohibited.
Bowers
PATCH 8/10 i40e: allow ethtool to report SW and FW versions in recovery mode
In reply to Alice MichaelQuoted 17 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Friday, September 20, 2019 2:17 AM
To: Michael, Alice <[email protected]>; intel-wired- lan at lists.osuosl.org
Cc: Kwapulinski, Piotr <[email protected]>
Subject: [Intel-wired-lan] [next PATCH S10 08/10] i40e: allow ethtool to report SW and FW versions in recovery modeFrom: Piotr Kwapulinski <[email protected]>
Let ethtool print driver and firmware versions when NIC is in recovery mode. Assign
i40e_get_drvinfo()operation to ethtool recovery mode operations. Previously ethtool did not report driver and firmware versions when NIC was in recovery mode.
Quoted 4 lines
Signed-off-by Piotr Kwapulinski <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 1 + 1 file changed, 1 insertion(+)
PATCH 9/10 i40e: Fix LED blinking flow for X710T*L devices.
In reply to Alice MichaelFrom: Damian Milosek <[email protected]>
Add X710T*L device specific operations (in port LED detection and handling
of GLGEN_GPIO_CTL.PIN_FUNC field) to enable LED blinking.
--- drivers/net/ethernet/intel/i40e/i40e_common.c | 29 +++++++++++++++++-- drivers/net/ethernet/intel/i40e/i40e_devids.h | 2 ++ 2 files changed, 28 insertions(+), 3 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_common.c +26 -3
@@ -1437,9 +1437,9 @@ static u32 i40e_led_is_mine(struct i40e_hw *hw, int idx)u32 gpio_val =0 ;u32 port; -if (!hw->func_caps.led[idx]) +if (!I40E_IS_X710TL_DEVICE (hw->device_id) && + !hw->func_caps.led[idx])return 0 ; - gpio_val =rd32 (hw,I40E_GLGEN_GPIO_CTL (idx)); port = (gpio_val &I40E_GLGEN_GPIO_CTL_PRT_NUM_MASK ) >>I40E_GLGEN_GPIO_CTL_PRT_NUM_SHIFT ;
@@ -1458,8 +1458,15 @@ static u32 i40e_led_is_mine(struct i40e_hw *hw, int idx)#define I40E_FILTER_ACTIVITY 0xE#define I40E_LINK_ACTIVITY 0xC#define I40E_MAC_ACTIVITY 0xD +#define I40E_FW_LED BIT(4) +#define I40E_LED_MODE_VALID (I40E_GLGEN_GPIO_CTL_LED_MODE_MASK >> \ + I40E_GLGEN_GPIO_CTL_LED_MODE_SHIFT) +#define I40E_LED0 22 +#define I40E_PIN_FUNC_SDP 0x0 +#define I40E_PIN_FUNC_LED 0x1 +/** * i40e_led_get - return current on/off mode * @hw: pointer to the hw struct
@@ -1504,8 +1511,10 @@ void i40e_led_set(struct i40e_hw *hw, u32 mode, bool blink) {int i; -if (mode &0xfffffff0 ) +if (mode & ~I40E_LED_MODE_VALID ) {hw_dbg (hw,"invalid mode passed in %X\n" , mode); +return ; + }/* as per the documentation GPIO 22-29 are the LED * GPIO pins named LED0..LED7
@@ -1515,6 +1524,20 @@ void i40e_led_set(struct i40e_hw *hw, u32 mode, bool blink)if (!gpio_val)continue ; + +if (I40E_IS_X710TL_DEVICE (hw->device_id)) { +u32 pin_func =0 ; + +if (mode &I40E_FW_LED ) + pin_func =I40E_PIN_FUNC_SDP ; +else + pin_func =I40E_PIN_FUNC_LED ; + + gpio_val &= ~I40E_GLGEN_GPIO_CTL_PIN_FUNC_MASK ; + gpio_val |= ((pin_func << +I40E_GLGEN_GPIO_CTL_PIN_FUNC_SHIFT ) & +I40E_GLGEN_GPIO_CTL_PIN_FUNC_MASK ); + } gpio_val &= ~I40E_GLGEN_GPIO_CTL_LED_MODE_MASK ;/* this & is a bit of paranoia, but serves as a range check */ gpio_val |= ((mode << I40E_GLGEN_GPIO_CTL_LED_MODE_SHIFT) &
drivers/net/ethernet/intel/i40e/i40e_devids.h +2 -0
@@ -23,6 +23,8 @@#define I40E_DEV_ID_10G_BASE_T_BC 0x15FF#define I40E_DEV_ID_10G_B 0x104F#define I40E_DEV_ID_10G_SFP 0x104E +#define I40E_IS_X710TL_DEVICE (d) \ + ((d) == I40E_DEV_ID_10G_BASE_T_BC)#define I40E_DEV_ID_KX_X722 0x37CE#define I40E_DEV_ID_QSFP_X722 0x37CF#define I40E_DEV_ID_SFP_X722 0x37D0
Signature · 1 line
2.21.0
Bowers
PATCH 9/10 i40e: Fix LED blinking flow for X710T*L devices.
Quoted 15 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Friday, September 20, 2019 2:17 AM
To: Michael, Alice <[email protected]>; intel-wired-
lan at lists.osuosl.org
Cc: Milosek, Damian <[email protected]>
Subject: [Intel-wired-lan] [next PATCH S10 09/10] i40e: Fix LED blinking flow for X710T*L devices.From: Damian Milosek <[email protected]>
Add X710T*L device specific operations (in port LED detection and handling of GLGEN_GPIO_CTL.PIN_FUNC field) to enable LED blinking.
Quoted 6 lines
Signed-off-by Damian Milosek <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_common.c | 29 +++++++++++++++++-- drivers/net/ethernet/intel/i40e/i40e_devids.h | 2 ++ 2 files changed, 28 insertions(+), 3 deletions(-)
PATCH 10/10 i40e: Refactoring VF MAC filters counting to make more reliable
In reply to Alice MichaelFrom: Aleksandr Loktionov <[email protected]>
This patch prepares ground for the next VF MAC address change fix. It lets untrusted VF to delete any VF mac filter, but it still doesn't let untrusted VF to add mac filter not setup by PF. It removes information duplication in num_mac mac filters counter. And improves exact h/w mac filters usage checking in the i40e_check_vf_permission() function by counting mac2add_cnt. It also improves logging because now all mac addresses will be validated first and corresponding messages will be logged.
--- drivers/net/ethernet/intel/i40e/i40e.h | 1 + drivers/net/ethernet/intel/i40e/i40e_main.c | 19 ++++++++ .../ethernet/intel/i40e/i40e_virtchnl_pf.c | 45 ++++++++----------- .../ethernet/intel/i40e/i40e_virtchnl_pf.h | 1 - 4 files changed, 39 insertions(+), 27 deletions(-)
drivers/net/ethernet/intel/i40e/i40e.h +1 -0
@@ -1118,6 +1118,7 @@ struct i40e_mac_filter *i40e_add_mac_filter(struct i40e_vsi *vsi, const u8 *macaddr);int i40e_del_mac_filter (struct i40e_vsi *vsi,const u8 *macaddr);bool i40e_is_vsi_in_vlan (struct i40e_vsi *vsi); +int i40e_count_filters (struct i40e_vsi *vsi);struct i40e_mac_filter *i40e_find_mac (struct i40e_vsi *vsi,const u8 *macaddr);void i40e_vlan_stripping_enable (struct i40e_vsi *vsi);#ifdef CONFIG_I40E_DCB
drivers/net/ethernet/intel/i40e/i40e_main.c +19 -0
@@ -1109,6 +1109,25 @@ void i40e_update_stats(struct i40e_vsi *vsi)i40e_update_vsi_stats (vsi); } +/** +* i40e_count_filters - counts VSI mac filters +* @vsi: the VSI to be searched +* +* Returns count of mac filters +**/ +int i40e_count_filters (struct i40e_vsi *vsi) +{ +struct i40e_mac_filter *f; +struct hlist_node *h; +int bkt; +int cnt =0 ; + +hash_for_each_safe (vsi->mac_filter_hash, bkt, h, f, hlist) + ++cnt; + +return cnt; +} +/** * i40e_find_filter - Search VSI filter list for specific mac/vlan filter * @vsi: the VSI to be searched
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +19 -26
86 lines not on this page · raw message
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h +0 -1
@@ -101,7 +101,6 @@ struct i40e_vf {bool link_up;/* only valid if VF link is forced */ bool queues_enabled;/* true if the VF queues are enabled */ bool spoofchk; -u16 num_mac;u16 num_vlan;/* ADq related variables */
Signature · 1 line
2.21.0
Bowers
PATCH 10/10 i40e: Refactoring VF MAC filters counting to make more reliable
Quoted 21 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Friday, September 20, 2019 2:17 AM
To: Michael, Alice <[email protected]>; intel-wired-
lan at lists.osuosl.org
Cc: Loktionov, Aleksandr <[email protected]>
Subject: [Intel-wired-lan] [next PATCH S10 10/10] i40e: Refactoring VF MAC filters counting to make more reliableFrom: Aleksandr Loktionov <[email protected]>
This patch prepares ground for the next VF MAC address change fix. It lets untrusted VF to delete any VF mac filter, but it still doesn't let untrusted VF to add mac filter not setup by PF.
It removes information duplication innum_macmac filters counter. And improves exact h/w mac filters usage checking in thei40e_check_vf_permission()function by countingmac2add_cnt.
It also improves logging because now all mac addresses will be validated first and corresponding messages will be logged.
Quoted 7 lines
Signed-off-by Aleksandr Loktionov <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e.h | 1 + drivers/net/ethernet/intel/i40e/i40e_main.c | 19 ++++++++ .../ethernet/intel/i40e/i40e_virtchnl_pf.c | 45 ++++++++----------- .../ethernet/intel/i40e/i40e_virtchnl_pf.h | 1 - 4 files changed, 39 insertions(+), 27 deletions(-)
Bowers
PATCH 1/10 i40e: Fix for persistent lldp support
In reply to Alice MichaelQuoted 15 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Friday, September 20, 2019 2:17 AM
To: Michael, Alice <[email protected]>; intel-wired-
lan at lists.osuosl.org
Cc: Wnuczko, Sylwia <[email protected]>
Subject: [Intel-wired-lan] [next PATCH S10 01/10] i40e: Fix for persistent lldp supportFrom: Sylwia Wnuczko <[email protected]>
This patch fixes function to read nvm module data and uses it to read current lldp agent configuration from nvm api version 1.8.
Quoted 7 lines
Signed-off-by Sylwia Wnuczko <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_dcb.c | 4 +- drivers/net/ethernet/intel/i40e/i40e_dcb.h | 3 + drivers/net/ethernet/intel/i40e/i40e_nvm.c | 61 ++++++++++--------- .../net/ethernet/intel/i40e/i40e_prototype.h | 10 +-- 4 files changed, 44 insertions(+), 34 deletions(-)