i40e: Fix for allowing too many MDD events on VF
Subsystems (2)
PATCH 1/9 i40e: Fix for allowing too many MDD events on VF
From: Carolyn Wyborny <[email protected]>
This patch changes the driver behavior when detecting a VF MDD event. It now disables the VF after one event, which indicates a hw detected problem in the VF. Before this change, the PF would allow a couple of events before doing the reset.
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_main.c +3 -5
@@ -9767,6 +9767,9 @@ static void i40e_handle_mdd_event(struct i40e_pf *pf) vf->num_mdd_events++;dev_info (&pf->pdev->dev,"TX driver issue detected on VF %d\n" , i); +dev_info (&pf->pdev->dev, +"Use PF Control I/F to re-enable the VF\n" ); +set_bit (I40E_VF_STATE_DISABLED , &vf->vf_states); } reg =rd32 (hw,I40E_VP_MDET_RX (i));
@@ -9775,11 +9778,6 @@ static void i40e_handle_mdd_event(struct i40e_pf *pf) vf->num_mdd_events++;dev_info (&pf->pdev->dev,"RX driver issue detected on VF %d\n" , i); - } - -if (vf->num_mdd_events >I40E_DEFAULT_NUM_MDD_EVENTS_ALLOWED ) { -dev_info (&pf->pdev->dev, -"Too many MDD events on VF %d, disabled\n" , i);dev_info (&pf->pdev->dev,"Use PF Control I/F to re-enable the VF\n" );set_bit (I40E_VF_STATE_DISABLED , &vf->vf_states);
Signature · 1 line
2.19.2
PATCH 2/9 i40e: change behavior on PF in response to MDD event
From: Carolyn Wyborny <[email protected]>
TX MDD events reported on the PF are the result of the PF misconfiguring a descriptor and not because of "bad actions" by anything else. No need to reset now because if it results in a tx hang, the tx hang check will take care of it.
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_main.c +2 -10
@@ -9696,7 +9696,6 @@ static void i40e_handle_mdd_event(struct i40e_pf *pf) {struct i40e_hw *hw = &pf->hw;bool mdd_detected = false; -bool pf_mdd_detected = false;struct i40e_vf *vf;u32 reg;int i;
@@ -9742,19 +9741,12 @@ static void i40e_handle_mdd_event(struct i40e_pf *pf) reg =rd32 (hw,I40E_PF_MDET_TX );if (reg &I40E_PF_MDET_TX_VALID_MASK ) {wr32 (hw,I40E_PF_MDET_TX ,0xFFFF ); -dev_info (&pf->pdev->dev,"TX driver issue detected, PF reset issued\n" ); - pf_mdd_detected = true; +dev_dbg (&pf->pdev->dev,"TX driver issue detected on PF\n" ); } reg =rd32 (hw,I40E_PF_MDET_RX );if (reg &I40E_PF_MDET_RX_VALID_MASK ) {wr32 (hw,I40E_PF_MDET_RX ,0xFFFF ); -dev_info (&pf->pdev->dev,"RX driver issue detected, PF reset issued\n" ); - pf_mdd_detected = true; - } -/* Queue belongs to the PF, initiate a reset */ -if (pf_mdd_detected) { -set_bit (__I40E_PF_RESET_REQUESTED, pf->state); -i40e_service_event_schedule (pf); +dev_dbg (&pf->pdev->dev,"RX driver issue detected on PF\n" ); } }
Signature · 1 line
2.19.2
PATCH 3/9 i40e: remove error msg when vf with port vlan tries to remove vlan 0
In reply to Alice MichaelFrom: Aleksandr Loktionov <[email protected]>
VF's attempt to delete vlan 0 when a port vlan is configured is harmless in this case pf driver just does nothing. If vf will try to remove other vlans when a port vlan is configured it will still produce error as before.
--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +2 -1
@@ -2766,7 +2766,8 @@ static int i40e_vc_remove_vlan_msg(struct i40e_vf *vf, u8 *msg) vsi = pf->vsi[vf->lan_vsi_idx];if (vsi->info.pvid) { - aq_ret =I40E_ERR_PARAM ; +if (vfl->num_elements >1 || vfl->vlan_id[0 ]) + aq_ret =I40E_ERR_PARAM ; goto error_param; }
Signature · 1 line
2.19.2
PATCH 4/9 i40e: ShadowRAM checksum calculation change
In reply to Alice MichaelFrom: Maciej Paczkowski <[email protected]>
Due to changes in FW the SW is required to perform double SR dump in some cases.
Implementation adds two new steps to update nvm checksum function:
* recalculate checksum and check if checksum in NVM is correct
* if checksum in NVM is not correct then update it again
--- drivers/net/ethernet/intel/i40e/i40e_nvm.c | 29 +++++++++++++++++++--- 1 file changed, 25 insertions(+), 4 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_nvm.c +25 -4
@@ -574,13 +574,34 @@ static i40e_status i40e_calc_nvm_checksum(struct i40e_hw *hw,i40e_status i40e_update_nvm_checksum (struct i40e_hw *hw) {i40e_status ret_code; -u16 checksum; +u16 checksum, checksum_sr;__le16 le_sum; ret_code =i40e_calc_nvm_checksum (hw, &checksum); -if (!ret_code) { - le_sum =cpu_to_le16 (checksum); - ret_code =i40e_write_nvm_aq (hw,0x00 ,I40E_SR_SW_CHECKSUM_WORD , +if (ret_code) +return ret_code; + + le_sum =cpu_to_le16 (checksum); + ret_code =i40e_write_nvm_aq (hw,0x00 ,I40E_SR_SW_CHECKSUM_WORD , +1 , &le_sum, true); +if (ret_code) +return ret_code; + +/* Due to changes in FW the SW is required to perform double SR-dump +* in some cases. SR-dump is the process when internal shadow RAM is +* dumped into flash bank. It is triggered by setting "last_command" +* argument in i40e_write_nvm_aq function call. +* Since FW 1.8 we need to calculate SR checksum again and update it +* in flash if it is not equal to previously computed checksum. +* This situation would occur only in FW >= 1.8 +*/ + ret_code =i40e_calc_nvm_checksum (hw, &checksum_sr); +if (ret_code) +return ret_code; +if (checksum_sr != checksum) { + le_sum =cpu_to_le16 (checksum_sr); + ret_code =i40e_write_nvm_aq (hw,0x00 , +I40E_SR_SW_CHECKSUM_WORD ,1 , &le_sum, true); }
Signature · 1 line
2.19.2
PATCH 5/9 i40e: Report advertised link modes on 40GBase_LR4, CR4 and fibre
In reply to Alice MichaelFrom: Adam Ludkiewicz <[email protected]>
Add assignments for advertising 40GBase_LR4, 40GBase_CR4 and fibre
--- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/i40e/i40e_ethtool.c +9 -1
@@ -541,9 +541,12 @@ static void i40e_phy_type_to_ethtool(struct i40e_pf *pf,ethtool_link_ksettings_add_link_mode (ks, advertising, 40000baseSR4_Full); } -if (phy_types &I40E_CAP_PHY_TYPE_40GBASE_LR4 ) +if (phy_types &I40E_CAP_PHY_TYPE_40GBASE_LR4 ) {ethtool_link_ksettings_add_link_mode (ks, supported, 40000baseLR4_Full); +ethtool_link_ksettings_add_link_mode (ks, advertising, + 40000baseLR4_Full); + }if (phy_types &I40E_CAP_PHY_TYPE_40GBASE_KR4 ) {ethtool_link_ksettings_add_link_mode (ks, supported, 40000baseLR4_Full);
@@ -723,6 +726,8 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw,case I40E_PHY_TYPE_40GBASE_AOC :ethtool_link_ksettings_add_link_mode (ks, supported, 40000baseCR4_Full); +ethtool_link_ksettings_add_link_mode (ks, advertising, + 40000baseCR4_Full);break ;case I40E_PHY_TYPE_40GBASE_SR4 : ethtool_link_ksettings_add_link_mode(ks, supported,
@@ -733,6 +738,8 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw,case I40E_PHY_TYPE_40GBASE_LR4 :ethtool_link_ksettings_add_link_mode (ks, supported, 40000baseLR4_Full); +ethtool_link_ksettings_add_link_mode (ks, advertising, + 40000baseLR4_Full);break ;case I40E_PHY_TYPE_25GBASE_SR :case I40E_PHY_TYPE_25GBASE_LR :
@@ -1038,6 +1045,7 @@ static int i40e_get_link_ksettings(struct net_device *netdev,break ;case I40E_MEDIA_TYPE_FIBER :ethtool_link_ksettings_add_link_mode (ks, supported,FIBRE ); +ethtool_link_ksettings_add_link_mode (ks, advertising,FIBRE ); ks->base.port =PORT_FIBRE ;break ;case I40E_MEDIA_TYPE_UNKNOWN :
Signature · 1 line
2.19.2
PATCH 6/9 i40e: Further implementation of LLDP
In reply to Alice MichaelFrom: Aleksandr Loktionov <[email protected]>
This code implements driver code changes necessary for LLDP Agent support. Modified i40e_aq_start_lldp() and i40e_aq_stop_lldp() adding false parameter whether LLDP state should be persistent across power cycles.
--- drivers/net/ethernet/intel/i40e/i40e_adminq.c | 5 ++ .../net/ethernet/intel/i40e/i40e_adminq_cmd.h | 20 ++++-- drivers/net/ethernet/intel/i40e/i40e_common.c | 62 ++++++++++++++++++- .../net/ethernet/intel/i40e/i40e_debugfs.c | 4 +- .../net/ethernet/intel/i40e/i40e_ethtool.c | 4 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +- .../net/ethernet/intel/i40e/i40e_prototype.h | 8 ++- drivers/net/ethernet/intel/i40e/i40e_type.h | 1 + 8 files changed, 93 insertions(+), 13 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_adminq.c +5 -0
@@ -608,6 +608,11 @@ i40e_status i40e_init_adminq(struct i40e_hw *hw) 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 ; +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_adminq_cmd.h +16 -4
@@ -261,6 +261,7 @@ enum i40e_admin_queue_opc { i40e_aqc_opc_get_cee_dcb_cfg =0x0A07 , i40e_aqc_opc_lldp_set_local_mib =0x0A08 , i40e_aqc_opc_lldp_stop_start_spec_agent =0x0A09 , + i40e_aqc_opc_lldp_restore =0x0A0A ,/* Tunnel commands */ i40e_aqc_opc_add_udp_tunnel = 0x0B00,
@@ -2498,18 +2499,19 @@ I40E_CHECK_CMD_LENGTH(i40e_aqc_lldp_update_tlv);/* Stop LLDP (direct 0x0A05) */ struct i40e_aqc_lldp_stop {u8 command; -#define I40E_AQ_LLDP_AGENT_STOP 0x0 -#define I40E_AQ_LLDP_AGENT_SHUTDOWN 0x1 +#define I40E_AQ_LLDP_AGENT_STOP 0x0 +#define I40E_AQ_LLDP_AGENT_SHUTDOWN 0x1 +#define I40E_AQ_LLDP_AGENT_STOP_PERSIST 0x2u8 reserved[15 ]; };I40E_CHECK_CMD_LENGTH (i40e_aqc_lldp_stop);/* Start LLDP (direct 0x0A06) */ -struct i40e_aqc_lldp_start {u8 command; -#define I40E_AQ_LLDP_AGENT_START 0x1 +#define I40E_AQ_LLDP_AGENT_START 0x1 +#define I40E_AQ_LLDP_AGENT_START_PERSIST 0x2u8 reserved[15 ]; };
@@ -2633,6 +2635,16 @@ struct i40e_aqc_lldp_stop_start_specific_agent {I40E_CHECK_CMD_LENGTH (i40e_aqc_lldp_stop_start_specific_agent); +/* Restore LLDP Agent factory settings (direct 0x0A0A) */ +struct i40e_aqc_lldp_restore { +u8 command; +#define I40E_AQ_LLDP_AGENT_RESTORE_NOT 0x0 +#define I40E_AQ_LLDP_AGENT_RESTORE 0x1 +u8 reserved[15 ]; +}; + +I40E_CHECK_CMD_LENGTH (i40e_aqc_lldp_restore); +/* Add Udp Tunnel command and completion (direct 0x0B00) */ struct i40e_aqc_add_udp_tunnel {__le16 udp_port;
drivers/net/ethernet/intel/i40e/i40e_common.c +60 -2
100 lines not on this page · raw message
drivers/net/ethernet/intel/i40e/i40e_debugfs.c +2 -2
@@ -1321,7 +1321,7 @@ static ssize_t i40e_dbg_command_write(struct file *filp,if (strncmp (&cmd_buf[5 ],"stop" ,4 ) ==0 ) {int ret; - ret =i40e_aq_stop_lldp (&pf->hw, false,NULL ); + ret =i40e_aq_stop_lldp (&pf->hw, false, false,NULL );if (ret) { dev_info(&pf->pdev->dev, "Stop LLDP AQ command failed =0x%x\n",
@@ -1358,7 +1358,7 @@ static ssize_t i40e_dbg_command_write(struct file *filp,/* Continue and start FW LLDP anyways */ } - ret =i40e_aq_start_lldp (&pf->hw,NULL ); + ret =i40e_aq_start_lldp (&pf->hw, false,NULL );if (ret) { dev_info(&pf->pdev->dev, "Start LLDP AQ command failed =0x%x\n",
drivers/net/ethernet/intel/i40e/i40e_ethtool.c +2 -2
@@ -4959,7 +4959,7 @@ static int i40e_set_priv_flags(struct net_device *dev, u32 flags)if (pf->flags &I40E_FLAG_DISABLE_FW_LLDP ) {struct i40e_dcbx_config *dcbcfg; -i40e_aq_stop_lldp (&pf->hw, true,NULL ); +i40e_aq_stop_lldp (&pf->hw, true, false,NULL );i40e_aq_set_dcb_parameters (&pf->hw, true,NULL );/* reset local_dcbx_config to default */ dcbcfg = &pf->hw.local_dcbx_config;
@@ -4974,7 +4974,7 @@ static int i40e_set_priv_flags(struct net_device *dev, u32 flags) dcbcfg->pfc.willing =1 ; dcbcfg->pfc.pfccap =I40E_MAX_TRAFFIC_CLASS ; }else { -i40e_aq_start_lldp (&pf->hw,NULL ); +i40e_aq_start_lldp (&pf->hw, false,NULL ); } }
drivers/net/ethernet/intel/i40e/i40e_main.c +1 -1
@@ -14132,7 +14132,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)*/ if (pf->hw_features &I40E_HW_STOP_FW_LLDP ) {dev_info (&pdev->dev,"Stopping firmware LLDP agent.\n" ); -i40e_aq_stop_lldp (hw, true,NULL ); +i40e_aq_stop_lldp (hw, true, false,NULL ); }/* allow a platform config to override the HW addr */
drivers/net/ethernet/intel/i40e/i40e_prototype.h +6 -2
@@ -203,14 +203,18 @@ i40e_status i40e_aq_get_lldp_mib(struct i40e_hw *hw, u8 bridge_type,i40e_status i40e_aq_cfg_lldp_mib_change_event (struct i40e_hw *hw,bool enable_update,struct i40e_asq_cmd_details *cmd_details); +enum i40e_status_code +i40e_aq_restore_lldp (struct i40e_hw *hw,u8 *setting,bool restore, +struct i40e_asq_cmd_details *cmd_details);i40e_status i40e_aq_stop_lldp (struct i40e_hw *hw,bool shutdown_agent, +bool persist,struct i40e_asq_cmd_details *cmd_details);i40e_status i40e_aq_set_dcb_parameters (struct i40e_hw *hw,bool dcb_enable,struct i40e_asq_cmd_details *cmd_details); -i40e_status i40e_aq_start_lldp (struct i40e_hw *hw, -struct i40e_asq_cmd_details *cmd_details); +i40e_status i40e_aq_start_lldp (struct i40e_hw *hw,bool persist, +struct i40e_asq_cmd_details *cmd_details);i40e_status i40e_aq_get_cee_dcb_config (struct i40e_hw *hw,void *buff,u16 buff_size,struct i40e_asq_cmd_details *cmd_details);
drivers/net/ethernet/intel/i40e/i40e_type.h +1 -0
@@ -616,6 +616,7 @@ struct i40e_hw {#define I40E_HW_FLAG_AQ_PHY_ACCESS_CAPABLE BIT_ULL(2)#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)u64 flags;/* Used in set switch config AQ command */
Signature · 1 line
2.19.2
PATCH 7/9 i40e: remove out-of-range comparisions in i40e_validate_cloud_filter
In reply to Alice MichaelFrom: Jacob Keller <[email protected]>
The function i40e_validate_cloud_filter checks that the destination and source port numbers are valid by attempting to ensure that the number is non-zero and no larger than 0xFFFF. However, the types for the dst_port and src_port variable are __be16 which by definition cannot be larger than 0xFFFF
Since these values cannot be larger than 2 bytes, the check to see if they exceed 0xFFFF is meaningless.
One might consider these checks as some sort of defensive coding, in case the type was later changed. However, these checks also byte-swap the value before comparision using be16_to_cpu, which will truncate the values to 16bits anyways. Additionally, changing the type would require updating the opcodes to support new data layout of these virtchnl commands.
Remove the check to silence the -Wtype-limits warning that was added to GCC 8.
--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +2 -2
@@ -3129,7 +3129,7 @@ static int i40e_validate_cloud_filter(struct i40e_vf *vf, }if (mask.dst_port & data.dst_port) { -if (!data.dst_port ||be16_to_cpu (data.dst_port) >0xFFFF ) { +if (!data.dst_port) {dev_info (&pf->pdev->dev,"VF %d: Invalid Dest port\n" , vf->vf_id); goto err;
@@ -3137,7 +3137,7 @@ static int i40e_validate_cloud_filter(struct i40e_vf *vf, }if (mask.src_port & data.src_port) { -if (!data.src_port ||be16_to_cpu (data.src_port) >0xFFFF ) { +if (!data.src_port) {dev_info (&pf->pdev->dev,"VF %d: Invalid Source port\n" , vf->vf_id); goto err;
Signature · 1 line
2.19.2
PATCH 8/9 i40e: update version number
In reply to Alice MichaelJust bumping the version number appropriately.
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/intel/i40e/i40e_main.c +1 -1
@@ -27,7 +27,7 @@ static const char i40e_driver_string[] =#define DRV_VERSION_MAJOR 2#define DRV_VERSION_MINOR 8 -#define DRV_VERSION_BUILD 10 +#define DRV_VERSION_BUILD 20#define DRV_VERSION __stringify(DRV_VERSION_MAJOR) "." \ __stringify(DRV_VERSION_MINOR) "." \ __stringify(DRV_VERSION_BUILD) DRV_KERN
Signature · 1 line
2.19.2
PATCH 9/9 i40e: fix misleading message about promisc setting on un-trusted VF
In reply to Alice MichaelFrom: Harshitha Ramamurthy <[email protected]>
A refactor of the i40e_vc_config_promiscuous_mode_msg function moved the check for un-trusted VF into another function. We have to lie to an un-trusted VF that its request to set promiscuous mode is successful even when it is not because we don't want the VF to find out its trust status this way. With the refactor, we were running into a case where even though we were not setting promiscuous mode for an un-trusted VF, we still printed a misleading message that it was successful.
This patch fixes that by ensuring that a success message is printed on the host side only when the promiscuous mode change has been successful.
--- .../ethernet/intel/i40e/i40e_virtchnl_pf.c | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +16 -12
@@ -1112,15 +1112,6 @@ static i40e_status i40e_config_vf_promiscuous_mode(struct i40e_vf *vf,if (!i40e_vc_isvalid_vsi_id (vf, vsi_id) || !vsi)return I40E_ERR_PARAM ; -if (!test_bit (I40E_VIRTCHNL_VF_CAP_PRIVILEGE , &vf->vf_caps) && - (allmulti || alluni)) { -dev_err (&pf->pdev->dev, -"Unprivileged VF %d is attempting to configure promiscuous mode\n" , - vf->vf_id); -/* Lie to the VF on purpose. */ -return 0 ; - } -if (vf->port_vlan_id) { aq_ret = i40e_aq_set_vsi_mc_promisc_on_vlan(hw, vsi->seid, allmulti,
@@ -1997,8 +1988,21 @@ static int i40e_vc_config_promiscuous_mode_msg(struct i40e_vf *vf, u8 *msg)bool allmulti = false;bool alluni = false; -if (!test_bit (I40E_VF_STATE_ACTIVE , &vf->vf_states)) -return I40E_ERR_PARAM ; +if (!test_bit (I40E_VF_STATE_ACTIVE , &vf->vf_states)) { + aq_ret =I40E_ERR_PARAM ; + goto err_out; + } +if (!test_bit (I40E_VIRTCHNL_VF_CAP_PRIVILEGE , &vf->vf_caps)) { +dev_err (&pf->pdev->dev, +"Unprivileged VF %d is attempting to configure promiscuous mode\n" , + vf->vf_id); + +/* Lie to the VF on purpose, because this is an error we can +* ignore. Unprivileged VF is not a virtual channel error. +*/ + aq_ret =0 ; + goto err_out; + }/* Multicast promiscuous handling*/ if (info->flags &FLAG_VF_MULTICAST_PROMISC )
@@ -2032,7 +2036,7 @@ static int i40e_vc_config_promiscuous_mode_msg(struct i40e_vf *vf, u8 *msg)clear_bit (I40E_VF_STATE_UC_PROMISC , &vf->vf_states); } } - +err_out:/* send the response to the VF */ return i40e_vc_send_resp_to_vf(vf, VIRTCHNL_OP_CONFIG_PROMISCUOUS_MODE,
Signature · 1 line
2.19.2
Loktionov
PATCH 6/9 i40e: Further implementation of LLDP
In reply to Alice MichaelACK
-----Original Message-----
From: Michael, Alice
Sent: Thursday, February 28, 2019 6:53 PM
To: Michael, Alice <[email protected]>; intel-wired-lan at lists.osuosl.org
Cc: Loktionov, Aleksandr <[email protected]>
Subject: [next PATCH S3 6/9] i40e: Further implementation of LLDP
From: Aleksandr Loktionov <[email protected]>
This code implements driver code changes necessary for LLDP Agent support. Modified i40e_aq_start_lldp() and i40e_aq_stop_lldp() adding false parameter whether LLDP state should be persistent across power cycles.
--- drivers/net/ethernet/intel/i40e/i40e_adminq.c | 5 ++ .../net/ethernet/intel/i40e/i40e_adminq_cmd.h | 20 ++++-- drivers/net/ethernet/intel/i40e/i40e_common.c | 62 ++++++++++++++++++- .../net/ethernet/intel/i40e/i40e_debugfs.c | 4 +- .../net/ethernet/intel/i40e/i40e_ethtool.c | 4 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +- .../net/ethernet/intel/i40e/i40e_prototype.h | 8 ++- drivers/net/ethernet/intel/i40e/i40e_type.h | 1 + 8 files changed, 93 insertions(+), 13 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_adminq.c +5 -0
@@ -608,6 +608,11 @@ i40e_status i40e_init_adminq(struct i40e_hw *hw) 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 ; +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_adminq_cmd.h +16 -4
@@ -261,6 +261,7 @@ enum i40e_admin_queue_opc { i40e_aqc_opc_get_cee_dcb_cfg =0x0A07 , i40e_aqc_opc_lldp_set_local_mib =0x0A08 , i40e_aqc_opc_lldp_stop_start_spec_agent =0x0A09 , + i40e_aqc_opc_lldp_restore =0x0A0A ,/* Tunnel commands */ i40e_aqc_opc_add_udp_tunnel = 0x0B00,
@@ -2498,18 +2499,19 @@ I40E_CHECK_CMD_LENGTH(i40e_aqc_lldp_update_tlv);/* Stop LLDP (direct 0x0A05) */ struct i40e_aqc_lldp_stop {u8 command; -#define I40E_AQ_LLDP_AGENT_STOP 0x0 -#define I40E_AQ_LLDP_AGENT_SHUTDOWN 0x1 +#define I40E_AQ_LLDP_AGENT_STOP 0x0 +#define I40E_AQ_LLDP_AGENT_SHUTDOWN 0x1 +#define I40E_AQ_LLDP_AGENT_STOP_PERSIST 0x2u8 reserved[15 ]; };I40E_CHECK_CMD_LENGTH (i40e_aqc_lldp_stop);/* Start LLDP (direct 0x0A06) */ -struct i40e_aqc_lldp_start {u8 command; -#define I40E_AQ_LLDP_AGENT_START 0x1 +#define I40E_AQ_LLDP_AGENT_START 0x1 +#define I40E_AQ_LLDP_AGENT_START_PERSIST 0x2u8 reserved[15 ]; };
@@ -2633,6 +2635,16 @@ struct i40e_aqc_lldp_stop_start_specific_agent {I40E_CHECK_CMD_LENGTH (i40e_aqc_lldp_stop_start_specific_agent); +/* Restore LLDP Agent factory settings (direct 0x0A0A) */ struct +i40e_aqc_lldp_restore { +u8 command; +#define I40E_AQ_LLDP_AGENT_RESTORE_NOT 0x0 +#define I40E_AQ_LLDP_AGENT_RESTORE 0x1 +u8 reserved[15 ]; +}; + +I40E_CHECK_CMD_LENGTH (i40e_aqc_lldp_restore); +/* Add Udp Tunnel command and completion (direct 0x0B00) */ struct i40e_aqc_add_udp_tunnel {__le16 udp_port;
drivers/net/ethernet/intel/i40e/i40e_common.c +53 -2
85 lines not on this page · raw message
struct i40e_aqc_lldp_start *cmd =
@@ -3669,6 +3718,15 @@ i40e_status i40e_aq_start_lldp(struct i40e_hw *hw,
i40e_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_lldp_start);
cmd->command = I40E_AQ_LLDP_AGENT_START;
+
+ if (persist) {
+ if (hw->flags & I40E_HW_FLAG_FW_LLDP_PERSISTENT)
+ cmd->command |= I40E_AQ_LLDP_AGENT_START_PERSIST;
+ else
+ i40e_debug(hw, I40E_DEBUG_ALL,
+ "Persistent Start LLDP not supported by current FW version.\n");
+ }
+
status = i40e_asq_send_command(hw, &desc, NULL, 0, cmd_details);
return status;
drivers/net/ethernet/intel/i40e/i40e_debugfs.c +1 -1
@@ -1321,7 +1321,7 @@ static ssize_t i40e_dbg_command_write(struct file *filp,if (strncmp (&cmd_buf[5 ],"stop" ,4 ) ==0 ) {int ret; - ret =i40e_aq_stop_lldp (&pf->hw, false,NULL ); + ret =i40e_aq_stop_lldp (&pf->hw, false, false,NULL );if (ret) { dev_info(&pf->pdev->dev, "Stop LLDP AQ command failed =0x%x\n", @@ -1358,7 +1358,7 @@ static ssize_t i40e_dbg_command_write(struct file *filp,
/* Continue and start FW LLDP anyways */
}
- ret = i40e_aq_start_lldp(&pf->hw, NULL);
+ ret = i40e_aq_start_lldp(&pf->hw, false, NULL);
if (ret) {
dev_info(&pf->pdev->dev,
"Start LLDP AQ command failed =0x%x\n", diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
index 304ae6799de3..c0bfefa3980e 100644
drivers/net/ethernet/intel/i40e/i40e_ethtool.c +2 -2
@@ -4959,7 +4959,7 @@ static int i40e_set_priv_flags(struct net_device *dev, u32 flags)if (pf->flags &I40E_FLAG_DISABLE_FW_LLDP ) {struct i40e_dcbx_config *dcbcfg; -i40e_aq_stop_lldp (&pf->hw, true,NULL ); +i40e_aq_stop_lldp (&pf->hw, true, false,NULL );i40e_aq_set_dcb_parameters (&pf->hw, true,NULL );/* reset local_dcbx_config to default */ dcbcfg = &pf->hw.local_dcbx_config;
@@ -4974,7 +4974,7 @@ static int i40e_set_priv_flags(struct net_device *dev, u32 flags) dcbcfg->pfc.willing =1 ; dcbcfg->pfc.pfccap =I40E_MAX_TRAFFIC_CLASS ; }else { -i40e_aq_start_lldp (&pf->hw,NULL ); +i40e_aq_start_lldp (&pf->hw, false,NULL ); } }
drivers/net/ethernet/intel/i40e/i40e_main.c +1 -1
@@ -14132,7 +14132,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)*/ if (pf->hw_features &I40E_HW_STOP_FW_LLDP ) {dev_info (&pdev->dev,"Stopping firmware LLDP agent.\n" ); -i40e_aq_stop_lldp (hw, true,NULL ); +i40e_aq_stop_lldp (hw, true, false,NULL ); } /* allow a platform config to override the HW addr */ diff --git a/drivers/net/ethernet/intel/i40e/i40e_prototype.h b/drivers/net/ethernet/intel/i40e/i40e_prototype.h
index 663c8bf4d3d8..882627073dce 100644
drivers/net/ethernet/intel/i40e/i40e_prototype.h +6 -2
@@ -203,14 +203,18 @@ i40e_status i40e_aq_get_lldp_mib(struct i40e_hw *hw, u8 bridge_type, i40e_status i40e_aq_cfg_lldp_mib_change_event(struct i40e_hw *hw,bool enable_update, struct i40e_asq_cmd_details *cmd_details); +enum i40e_status_code +i40e_aq_restore_lldp (struct i40e_hw *hw,u8 *setting,bool restore, +struct i40e_asq_cmd_details *cmd_details);i40e_status i40e_aq_stop_lldp (struct i40e_hw *hw,bool shutdown_agent, +bool persist,struct i40e_asq_cmd_details *cmd_details);i40e_status i40e_aq_set_dcb_parameters (struct i40e_hw *hw,bool dcb_enable,struct i40e_asq_cmd_details *cmd_details); -i40e_status i40e_aq_start_lldp (struct i40e_hw *hw, -struct i40e_asq_cmd_details *cmd_details); +i40e_status i40e_aq_start_lldp (struct i40e_hw *hw,bool persist, +struct i40e_asq_cmd_details *cmd_details);i40e_status i40e_aq_get_cee_dcb_config (struct i40e_hw *hw,void *buff,u16 buff_size, struct i40e_asq_cmd_details *cmd_details); diff --git a/drivers/net/ethernet/intel/i40e/i40e_type.h b/drivers/net/ethernet/intel/i40e/i40e_type.h
index 79420bcc7414..820af0043cc8 100644
drivers/net/ethernet/intel/i40e/i40e_type.h +1 -1
@@ -616,6 +616,7 @@ struct i40e_hw {#define I40E_HW_FLAG_AQ_PHY_ACCESS_CAPABLE BIT_ULL(2) #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)u64 flags;/* Used in set switch config AQ command */ --
2.19.2
--------------------------------------------------------------------
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.
Loktionov
PATCH 3/9 i40e: remove error msg when vf with port vlan tries to remove vlan 0
In reply to Alice MichaelACK
-----Original Message-----
From: Michael, Alice
Sent: Thursday, February 28, 2019 6:53 PM
To: Michael, Alice <[email protected]>; intel-wired-lan at lists.osuosl.org
Cc: Loktionov, Aleksandr <[email protected]>
Subject: [next PATCH S3 3/9] i40e: remove error msg when vf with port vlan tries to remove vlan 0
From: Aleksandr Loktionov <[email protected]>
VF's attempt to delete vlan 0 when a port vlan is configured is harmless in this case pf driver just does nothing. If vf will try to remove other vlans when a port vlan is configured it will still produce error as before.
--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +2 -1
@@ -2766,7 +2766,8 @@ static int i40e_vc_remove_vlan_msg(struct i40e_vf *vf, u8 *msg) vsi = pf->vsi[vf->lan_vsi_idx];if (vsi->info.pvid) { - aq_ret =I40E_ERR_PARAM ; +if (vfl->num_elements >1 || vfl->vlan_id[0 ]) + aq_ret =I40E_ERR_PARAM ; goto error_param; }
--
2.19.2
--------------------------------------------------------------------
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 1/9 i40e: Fix for allowing too many MDD events on VF
In reply to Alice MichaelQuoted 16 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Thursday, February 28, 2019 9:53 AM
To: Michael, Alice <[email protected]>; intel-wired-
lan at lists.osuosl.org
Subject: [Intel-wired-lan] [next PATCH S3 1/9] i40e: Fix for allowing too many MDD events on VFFrom: Carolyn Wyborny <[email protected]>
This patch changes the driver behavior when detecting a VF MDD event. It now disables the VF after one event, which indicates a hw detected problem in the VF. Before this change, the PF would allow a couple of events before doing the reset.
Quoted 4 lines
Signed-off-by Carolyn Wyborny <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_main.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
Bowers
PATCH 2/9 i40e: change behavior on PF in response to MDD event
In reply to Alice MichaelQuoted 16 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Thursday, February 28, 2019 9:53 AM
To: Michael, Alice <[email protected]>; intel-wired-
lan at lists.osuosl.org
Subject: [Intel-wired-lan] [next PATCH S3 2/9] i40e: change behavior on PF in response to MDD eventFrom: Carolyn Wyborny <[email protected]>
TX MDD events reported on the PF are the result of the PF misconfiguring a descriptor and not because of "bad actions"
by anything else. No need to reset now because if it results in a tx hang, the tx hang check will take care of it.
Quoted 4 lines
Signed-off-by Carolyn Wyborny <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_main.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)
Bowers
PATCH 3/9 i40e: remove error msg when vf with port vlan tries to remove vlan 0
In reply to Alice MichaelQuoted 12 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Thursday, February 28, 2019 9:53 AM
To: Michael, Alice <[email protected]>; intel-wired-
lan at lists.osuosl.org
Cc: Loktionov, Aleksandr <[email protected]>
Subject: [Intel-wired-lan] [next PATCH S3 3/9] i40e: remove error msg when vf with port vlan tries to remove vlan 0From: Aleksandr Loktionov <[email protected]>
Quoted 8 lines
VF's attempt to delete vlan 0 when a port vlan is configured is harmless in this case pf driver just does nothing. If vf will try to remove other vlans when a port vlan is configured it will still produce error as before.
Signed-off-by Aleksandr Loktionov <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Bowers
PATCH 4/9 i40e: ShadowRAM checksum calculation change
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: Thursday, February 28, 2019 9:53 AM
To: Michael, Alice <[email protected]>; intel-wired- lan at lists.osuosl.org
Cc: Paczkowski, Maciej <[email protected]>
Subject: [Intel-wired-lan] [next PATCH S3 4/9] i40e: ShadowRAM checksum calculation changeFrom: Maciej Paczkowski <[email protected]>
Due to changes in FW the SW is required to perform double SR dump in some cases.
Quoted 8 lines
Implementation adds two new steps to update nvm checksum function:
* recalculate checksum and check if checksum in NVM is correct
* if checksum in NVM is not correct then update it againSigned-off-by Maciej Paczkowski <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_nvm.c | 29 +++++++++++++++++++--- 1 file changed, 25 insertions(+), 4 deletions(-)
Bowers
PATCH 5/9 i40e: Report advertised link modes on 40GBase_LR4, CR4 and fibre
In reply to Alice MichaelQuoted 10 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Thursday, February 28, 2019 9:53 AM
To: Michael, Alice <[email protected]>; intel-wired-
lan at lists.osuosl.org
Cc: Ludkiewicz, Adam <[email protected]>
Subject: [Intel-wired-lan] [next PATCH S3 5/9] i40e: Report advertised link modes on 40GBase_LR4, CR4 and fibre
Quoted 8 lines
From: Adam Ludkiewicz <[email protected]>
Add assignments for advertising 40GBase_LR4, 40GBase_CR4 and fibre
Signed-off-by Adam Ludkiewicz <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
Bowers
PATCH 6/9 i40e: Further implementation of LLDP
In reply to Alice MichaelQuoted 18 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Thursday, February 28, 2019 9:53 AM
To: Michael, Alice <[email protected]>; intel-wired-
lan at lists.osuosl.org
Cc: Loktionov, Aleksandr <[email protected]>
Subject: [Intel-wired-lan] [next PATCH S3 6/9] i40e: Further implementation of LLDPFrom: Aleksandr Loktionov <[email protected]>
This code implements driver code changes necessary for LLDP Agent support. Modified
i40e_aq_start_lldp()andi40e_aq_stop_lldp()adding false parameter whether LLDP state should be persistent across power cycles.Signed-off-by Aleksandr Loktionov <[email protected]>
Quoted 11 lines
--- drivers/net/ethernet/intel/i40e/i40e_adminq.c | 5 ++ .../net/ethernet/intel/i40e/i40e_adminq_cmd.h | 20 ++++-- drivers/net/ethernet/intel/i40e/i40e_common.c | 62 ++++++++++++++++++- .../net/ethernet/intel/i40e/i40e_debugfs.c | 4 +- .../net/ethernet/intel/i40e/i40e_ethtool.c | 4 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +- .../net/ethernet/intel/i40e/i40e_prototype.h | 8 ++- drivers/net/ethernet/intel/i40e/i40e_type.h | 1 + 8 files changed, 93 insertions(+), 13 deletions(-)
Bowers
PATCH 7/9 i40e: remove out-of-range comparisions in i40e_validate_cloud_filter
In reply to Alice MichaelQuoted 26 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Thursday, February 28, 2019 9:53 AM
To: Michael, Alice <[email protected]>; intel-wired- lan at lists.osuosl.org
Subject: [Intel-wired-lan] [next PATCH S3 7/9] i40e: remove out-of-range comparisions ini40e_validate_cloud_filterFrom: Jacob Keller <[email protected]>
The function
i40e_validate_cloud_filterchecks that the destination and source port numbers are valid by attempting to ensure that the number is non-zero and no larger than0xFFFF. However, the types for thedst_portandsrc_portvariable are__be16which by definition cannot be larger than0xFFFFSince these values cannot be larger than 2 bytes, the check to see if they exceed
0xFFFFis meaningless.One might consider these checks as some sort of defensive coding, in case the type was later changed. However, these checks also byte-swap the value before comparision using
be16_to_cpu, which will truncate the values to 16bits anyways. Additionally, changing the type would require updating the opcodes to support new data layout of these virtchnl commands.
Quoted 7 lines
Remove the check to silence the -Wtype-limits warning that was added to GCC 8.
Signed-off-by Jacob Keller <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Bowers
PATCH 8/9 i40e: update version number
In reply to Alice MichaelQuoted 8 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Thursday, February 28, 2019 9:53 AM
To: Michael, Alice <[email protected]>; intel-wired-
lan at lists.osuosl.org
Subject: [Intel-wired-lan] [next PATCH S3 8/9] i40e: update version number
Quoted 6 lines
Just bumping the version number appropriately.
Signed-off-by Alice Michael <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Bowers
PATCH 9/9 i40e: fix misleading message about promisc setting on un-trusted VF
In reply to Alice MichaelQuoted 19 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Thursday, February 28, 2019 9:53 AM
To: Michael, Alice <[email protected]>; intel-wired-
lan at lists.osuosl.org
Subject: [Intel-wired-lan] [next PATCH S3 9/9] i40e: fix misleading message about promisc setting on un-trusted VFFrom: Harshitha Ramamurthy <[email protected]>
A refactor of the
i40e_vc_config_promiscuous_mode_msgfunction moved the check for un-trusted VF into another function. We have to lie to an un- trusted VF that its request to set promiscuous mode is successful even when it is not because we don't want the VF to find out its trust status this way. With the refactor, we were running into a case where even though we were not setting promiscuous mode for an un-trusted VF, we still printed a misleading message that it was successful.
Quoted 7 lines
This patch fixes that by ensuring that a success message is printed on the host side only when the promiscuous mode change has been successful.
Signed-off-by Harshitha Ramamurthy <[email protected]>--- .../ethernet/intel/i40e/i40e_virtchnl_pf.c | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-)
Ludkiewicz
PATCH 5/9 i40e: Report advertised link modes on 40GBase_LR4, CR4 and fibre
In reply to Alice MichaelACK
-----Original Message-----
From: Michael, Alice
Sent: Thursday, February 28, 2019 6:53 PM
To: Michael, Alice <[email protected]>; intel-wired-lan at lists.osuosl.org
Cc: Ludkiewicz, Adam <[email protected]>
Subject: [next PATCH S3 5/9] i40e: Report advertised link modes on 40GBase_LR4, CR4 and fibre
From: Adam Ludkiewicz <[email protected]>
Add assignments for advertising 40GBase_LR4, 40GBase_CR4 and fibre
--- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/i40e/i40e_ethtool.c +6 -1
@@ -541,9 +541,12 @@ static void i40e_phy_type_to_ethtool(struct i40e_pf *pf,ethtool_link_ksettings_add_link_mode (ks, advertising, 40000baseSR4_Full); } -if (phy_types &I40E_CAP_PHY_TYPE_40GBASE_LR4 ) +if (phy_types &I40E_CAP_PHY_TYPE_40GBASE_LR4 ) {ethtool_link_ksettings_add_link_mode (ks, supported, 40000baseLR4_Full); +ethtool_link_ksettings_add_link_mode (ks, advertising, + 40000baseLR4_Full); + }if (phy_types &I40E_CAP_PHY_TYPE_40GBASE_KR4 ) {ethtool_link_ksettings_add_link_mode (ks, supported, 40000baseLR4_Full);
@@ -723,6 +726,8 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw,case I40E_PHY_TYPE_40GBASE_AOC :ethtool_link_ksettings_add_link_mode (ks, supported, 40000baseCR4_Full); +ethtool_link_ksettings_add_link_mode (ks, advertising, + 40000baseCR4_Full);break ;case I40E_PHY_TYPE_40GBASE_SR4 : ethtool_link_ksettings_add_link_mode(ks, supported, @@ -733,6 +738,8 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw,
case I40E_PHY_TYPE_40GBASE_LR4:
ethtool_link_ksettings_add_link_mode(ks, supported,
40000baseLR4_Full);
+ ethtool_link_ksettings_add_link_mode(ks, advertising,
+ 40000baseLR4_Full);
break;
case I40E_PHY_TYPE_25GBASE_SR:
case I40E_PHY_TYPE_25GBASE_LR:
@@ -1038,6 +1045,7 @@ static int i40e_get_link_ksettings(struct net_device *netdev,
break;
case I40E_MEDIA_TYPE_FIBER:
ethtool_link_ksettings_add_link_mode(ks, supported, FIBRE);
+ ethtool_link_ksettings_add_link_mode(ks, advertising, FIBRE);
ks->base.port = PORT_FIBRE;
break;
case I40E_MEDIA_TYPE_UNKNOWN:
--
2.19.2
--------------------------------------------------------------------
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.