i40evf: use netdev variable in reset task
Subsystems (2)
PATCH 1/12 i40evf: use netdev variable in reset task
From: Alan Brady <[email protected]>
If we're going to bother initializing a variable to reference it we might as well use it.
--- drivers/net/ethernet/intel/i40evf/i40evf_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/i40evf/i40evf_main.c +2 -2
@@ -1879,7 +1879,7 @@ static void i40evf_reset_task(struct work_struct *work) } continue_reset: -if (netif_running (adapter->netdev)) { +if (netif_running (netdev)) {netif_carrier_off (netdev);netif_tx_stop_all_queues (netdev); adapter->link_up = false;
@@ -1947,7 +1947,7 @@ static void i40evf_reset_task(struct work_struct *work)return ; reset_err:dev_err (&adapter->pdev->dev,"failed to allocate resources during reinit\n" ); -i40evf_close (adapter->netdev); +i40evf_close (netdev); }/**
Signature · 1 line
2.9.3
PATCH 2/12 i40e: use cpumask_copy instead of direct assignment
From: Jacob Keller <[email protected]>
According to the header file cpumask.h, we shouldn't be directly copying a cpumask_t, since its a bitmap and might not be copied correctly. Lets use the provided cpumask_copy() function instead.
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +- drivers/net/ethernet/intel/i40evf/i40evf_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_main.c +1 -1
@@ -3450,7 +3450,7 @@ static void i40e_irq_affinity_notify(struct irq_affinity_notify *notify,struct i40e_q_vector *q_vector = container_of(notify, struct i40e_q_vector, affinity_notify); - q_vector->affinity_mask = *mask; +cpumask_copy (&q_vector->affinity_mask, mask); }/**
drivers/net/ethernet/intel/i40evf/i40evf_main.c +1 -1
@@ -520,7 +520,7 @@ static void i40evf_irq_affinity_notify(struct irq_affinity_notify *notify,struct i40e_q_vector *q_vector = container_of(notify, struct i40e_q_vector, affinity_notify); - q_vector->affinity_mask = *mask; +cpumask_copy (&q_vector->affinity_mask, mask); }/**
Signature · 1 line
2.9.3
Keller
PATCH 2/12 i40e: use cpumask_copy instead of direct assignment
ACK
Quoted 52 lines
-----Original Message-----
From: Michael, Alice
Sent: Thursday, June 29, 2017 1:37 AM
To: Michael, Alice <[email protected]>; intel-wired-lan at lists.osuosl.org
Cc: Keller, Jacob E <[email protected]>
Subject: [next PATCH S75-V2 02/12] i40e: usecpumask_copyinstead of direct assignmentFrom: Jacob Keller <[email protected]>
According to the header file
cpumask.h, we shouldn't be directly copying acpumask_t, since its a bitmap and might not be copied correctly. Lets use the providedcpumask_copy()function instead.Signed-off-by Jacob Keller <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +- drivers/net/ethernet/intel/i40evf/i40evf_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)drivers/net/ethernet/intel/i40e/i40e_main.c +1
-1@@ -3450,7 +3450,7 @@ static void i40e_irq_affinity_notify(structirq_affinity_notify *notify, struct i40e_q_vector *q_vector = container_of(notify, struct i40e_q_vector, affinity_notify); - q_vector->affinity_mask = *mask; +cpumask_copy (&q_vector->affinity_mask, mask); }/**
drivers/net/ethernet/intel/i40evf/i40evf_main.c +1
-1@@ -520,7 +520,7 @@ static void i40evf_irq_affinity_notify(structirq_affinity_notify *notify, struct i40e_q_vector *q_vector = container_of(notify, struct i40e_q_vector, affinity_notify); - q_vector->affinity_mask = *mask; +cpumask_copy (&q_vector->affinity_mask, mask); }/**
--
2.9.3
PATCH 3/12 i40e: prevent changing ITR if adaptive-rx/tx enabled
In reply to Alice MichaelFrom: Alan Brady <[email protected]>
Currently the driver allows the user to change (or even disable) interrupt moderation if adaptive-rx/tx is enabled when this should not be the case.
Adaptive RX/TX will not respect the user's ITR settings so allowing the user to change it is weird. This bug would also allow the user to disable interrupt moderation with adaptive-rx/tx enabled which doesn't make much sense either.
This patch makes it such that if adaptive-rx/tx is enabled, the user cannot make any manual adjustments to interrupt moderation. It also makes it so that if ITR is disabled but adaptive-rx/tx is then enabled, ITR will be re-enabled.
--- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 61 +++++++++++++++++--------- 1 file changed, 41 insertions(+), 20 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_ethtool.c +41 -20
@@ -2194,14 +2194,29 @@ static int __i40e_set_coalesce(struct net_device *netdev, int queue) {struct i40e_netdev_priv *np =netdev_priv (netdev); +u16 intrl_reg, cur_rx_itr, cur_tx_itr;struct i40e_vsi *vsi = np->vsi;struct i40e_pf *pf = vsi->back; -u16 intrl_reg;int i;if (ec->tx_max_coalesced_frames_irq || ec->rx_max_coalesced_frames_irq) vsi->work_limit = ec->tx_max_coalesced_frames_irq; +if (queue <0 ) { + cur_rx_itr = vsi->rx_rings[0 ]->rx_itr_setting; + cur_tx_itr = vsi->tx_rings[0 ]->tx_itr_setting; + }else if (queue < vsi->num_queue_pairs) { + cur_rx_itr = vsi->rx_rings[queue]->rx_itr_setting; + cur_tx_itr = vsi->tx_rings[queue]->tx_itr_setting; + }else { +netif_info (pf, drv, netdev,"Invalid queue value, queue range is 0 - %d\n" , + vsi->num_queue_pairs -1 ); +return -EINVAL ; + } + + cur_tx_itr &= ~I40E_ITR_DYNAMIC ; + cur_rx_itr &= ~I40E_ITR_DYNAMIC ; +/* tx_coalesce_usecs_high is ignored, use rx-usecs-high instead */ if (ec->tx_coalesce_usecs_high != vsi->int_rate_limit) {netif_info (pf, drv, netdev,"tx-usecs-high is not used, please program rx-usecs-high\n" );
@@ -2214,15 +2229,34 @@ static int __i40e_set_coalesce(struct net_device *netdev,return -EINVAL ; } -if (ec->rx_coalesce_usecs ==0 ) { -if (ec->use_adaptive_rx_coalesce) -netif_info (pf, drv, netdev,"rx-usecs=0, need to disable adaptive-rx for a complete disable\n" ); - }else if ((ec->rx_coalesce_usecs < (I40E_MIN_ITR <<1 )) || - (ec->rx_coalesce_usecs > (I40E_MAX_ITR <<1 ))) { +if (ec->rx_coalesce_usecs != cur_rx_itr && + ec->use_adaptive_rx_coalesce) { +netif_info (pf, drv, netdev,"RX interrupt moderation cannot be changed if adaptive-rx is enabled.\n" ); +return -EINVAL ; + } + +if (ec->rx_coalesce_usecs > (I40E_MAX_ITR <<1 )) {netif_info (pf, drv, netdev,"Invalid value, rx-usecs range is 0-8160\n" );return -EINVAL ; } +if (ec->tx_coalesce_usecs != cur_tx_itr && + ec->use_adaptive_tx_coalesce) { +netif_info (pf, drv, netdev,"TX interrupt moderation cannot be changed if adaptive-tx is enabled.\n" ); +return -EINVAL ; + } + +if (ec->tx_coalesce_usecs > (I40E_MAX_ITR <<1 )) { +netif_info (pf, drv, netdev,"Invalid value, tx-usecs range is 0-8160\n" ); +return -EINVAL ; + } + +if (ec->use_adaptive_rx_coalesce && !cur_rx_itr) + ec->rx_coalesce_usecs =I40E_MIN_ITR <<1 ; + +if (ec->use_adaptive_tx_coalesce && !cur_tx_itr) + ec->tx_coalesce_usecs =I40E_MIN_ITR <<1 ; + intrl_reg =i40e_intrl_usec_to_reg (ec->rx_coalesce_usecs_high); vsi->int_rate_limit =INTRL_REG_TO_USEC (intrl_reg);if (vsi->int_rate_limit != ec->rx_coalesce_usecs_high) {
@@ -2230,27 +2264,14 @@ static int __i40e_set_coalesce(struct net_device *netdev, vsi->int_rate_limit); } -if (ec->tx_coalesce_usecs ==0 ) { -if (ec->use_adaptive_tx_coalesce) -netif_info (pf, drv, netdev,"tx-usecs=0, need to disable adaptive-tx for a complete disable\n" ); - }else if ((ec->tx_coalesce_usecs < (I40E_MIN_ITR <<1 )) || - (ec->tx_coalesce_usecs > (I40E_MAX_ITR <<1 ))) { -netif_info (pf, drv, netdev,"Invalid value, tx-usecs range is 0-8160\n" ); -return -EINVAL ; - } -/* rx and tx usecs has per queue value. If user doesn't specify the queue, * apply to all queues. */ if (queue <0 ) {for (i =0 ; i < vsi->num_queue_pairs; i++)i40e_set_itr_per_queue (vsi, ec, i); - }else if (queue < vsi->num_queue_pairs) { -i40e_set_itr_per_queue (vsi, ec, queue); }else { -netif_info (pf, drv, netdev,"Invalid queue value, queue range is 0 - %d\n" , - vsi->num_queue_pairs -1 ); -return -EINVAL ; +i40e_set_itr_per_queue (vsi, ec, queue); }return 0 ;
Signature · 1 line
2.9.3
PATCH 4/12 i40e: synchronize nvmupdate command and adminq subtask
In reply to Alice MichaelFrom: Sudheer Mogilappagari <[email protected]>
During NVM update, state machine gets into unrecoverable state because i40e_clean_adminq_subtask can get scheduled after the admin queue command but before other state variables are updated. This causes incorrect input to i40e_nvmupd_check_wait_event and state transitions don't happen.
This issue existed before but surfaced after commit 373149fc99a0 ("i40e: Decrease the scope of rtnl lock")
This fix adds locking around admin queue command and update of state variables so that adminq_subtask will have accurate information whenever it gets scheduled.
--- drivers/net/ethernet/intel/i40e/i40e_nvm.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/ethernet/intel/i40e/i40e_nvm.c +6 -0
@@ -753,6 +753,11 @@ i40e_status i40e_nvmupd_command(struct i40e_hw *hw, hw->nvmupd_state =I40E_NVMUPD_STATE_INIT ; } +/* Acquire lock to prevent race condition where adminq_task +* can execute after i40e_nvmupd_nvm_read/write but before state +* variables (nvm_wait_opcode, nvm_release_on_done) are updated +*/ +mutex_lock (&hw->aq.arq_mutex);switch (hw->nvmupd_state) {case I40E_NVMUPD_STATE_INIT : status =i40e_nvmupd_state_init (hw, cmd, bytes, perrno);
@@ -788,6 +793,7 @@ i40e_status i40e_nvmupd_command(struct i40e_hw *hw, *perrno = -ESRCH ;break ; } +mutex_unlock (&hw->aq.arq_mutex);return status; }
Signature · 1 line
2.9.3
PATCH 5/12 i40e: Store the requested FEC information
In reply to Alice MichaelFrom: Mariusz Stachura <[email protected]>
Store information about FEC modes, that were requested. It will be used in printing link status information function and this way there is no need to call admin queue there.
--- drivers/net/ethernet/intel/i40e/i40e_common.c | 4 ++++ drivers/net/ethernet/intel/i40e/i40e_type.h | 1 + drivers/net/ethernet/intel/i40evf/i40e_type.h | 1 + 3 files changed, 6 insertions(+)
drivers/net/ethernet/intel/i40e/i40e_common.c +4 -0
@@ -2529,6 +2529,10 @@ 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 ); +memcpy (hw->phy.link_info.module_type, &abilities.module_type,sizeof (hw->phy.link_info.module_type)); }
drivers/net/ethernet/intel/i40e/i40e_type.h +1 -0
@@ -185,6 +185,7 @@ struct i40e_link_status {enum i40e_aq_link_speed link_speed;u8 link_info;u8 an_info; +u8 req_fec_info;u8 fec_info;u8 ext_info;u8 loopback;
drivers/net/ethernet/intel/i40evf/i40e_type.h +1 -0
@@ -159,6 +159,7 @@ struct i40e_link_status {enum i40e_aq_link_speed link_speed;u8 link_info;u8 an_info; +u8 req_fec_info;u8 fec_info;u8 ext_info;u8 loopback;
Signature · 1 line
2.9.3
PATCH 6/12 i40e: prevent snprintf format specifier truncation
In reply to Alice MichaelFrom: Jacob Keller <[email protected]>
Increase the size of the prefix buffer so that it can hold enough characters for every possible input. Although 20 is enough for all expected inputs, it is possible for the values to be larger than expected, resulting in a possibly truncated string.
New versions of GCC starting at 7 now include warnings to prevent truncation unless you handle the return code. At most 27 bytes can be written here, so lets just increase the buffer size even if for all expected hw->bus.* values we only needed 20.
--- drivers/net/ethernet/intel/i40e/i40e_common.c | 4 ++-- drivers/net/ethernet/intel/i40evf/i40e_common.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_common.c +2 -2
@@ -328,9 +328,9 @@ void i40e_debug_aq(struct i40e_hw *hw, enum i40e_debug_mask mask, void *desc, len = buf_len;/* write the full 16-byte chunks */ if (hw->debug_mask & mask) { -char prefix[20 ]; +char prefix[27 ]; - snprintf(prefix, 20, + snprintf(prefix, 27, "i40e %02x:%02x.%x: \t0x", hw->bus.bus_id, hw->bus.device,
drivers/net/ethernet/intel/i40evf/i40e_common.c +2 -2
@@ -333,9 +333,9 @@ void i40evf_debug_aq(struct i40e_hw *hw, enum i40e_debug_mask mask, void *desc, len = buf_len;/* write the full 16-byte chunks */ if (hw->debug_mask & mask) { -char prefix[20 ]; +char prefix[27 ]; - snprintf(prefix, 20, + snprintf(prefix, 27, "i40evf %02x:%02x.%x: \t0x", hw->bus.bus_id, hw->bus.device,
Signature · 1 line
2.9.3
PATCH 6/12 i40e: prevent snprintf format specifier truncation
Quoted 23 lines · Alice Michael
From: Jacob Keller <[email protected]>
Increase the size of the prefix buffer so that it can hold enough characters for every possible input. Although 20 is enough for all expected inputs, it is possible for the values to be larger than expected, resulting in a possibly truncated string.
New versions of GCC starting at 7 now include warnings to prevent truncation unless you handle the return code. At most 27 bytes can be written here, so lets just increase the buffer size even if for all expected hw->bus.* values we only needed 20.
Signed-off-by Jacob Keller <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_common.c | 4 ++-- drivers/net/ethernet/intel/i40evf/i40e_common.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)drivers/net/ethernet/intel/i40e/i40e_common.c +0
-0
drivers/net/ethernet/intel/i40e/i40e_common.c void i40e_debug_aq(struct i40e_hw *hw, enum i40e_debug_mask mask, void *desc, · line 333
Quoted 8 lines
drivers/net/ethernet/intel/i40e/i40e_common.c +2
-2@@ -328,9 +328,9 @@ void i40e_debug_aq(struct i40e_hw *hw, enum i40e_debug_mask mask, void *desc, len = buf_len;/* write the full 16-byte chunks */ if (hw->debug_mask & mask) { -char prefix[20 ]; +char prefix[27 ]; - snprintf(prefix, 20, + snprintf(prefix, 27,
You might use sizeof(prefix) here rather than hoping that the number stays in sync with the actual declaration.
Quoted 8 lines
drivers/net/ethernet/intel/i40e/i40e_common.c +0
-0"i40e %02x:%02x.%x: \t0x" , hw->bus.bus_id, hw->bus.device,drivers/net/ethernet/intel/i40evf/i40e_common.c +0
-0
drivers/net/ethernet/intel/i40evf/i40e_common.c void i40evf_debug_aq(struct i40e_hw *hw, enum i40e_debug_mask mask, void *desc, · line 338
Quoted 8 lines
drivers/net/ethernet/intel/i40evf/i40e_common.c +2
-2@@ -333,9 +333,9 @@ void i40evf_debug_aq(struct i40e_hw *hw, enum i40e_debug_mask mask, void *desc, len = buf_len;/* write the full 16-byte chunks */ if (hw->debug_mask & mask) { -char prefix[20 ]; +char prefix[27 ]; - snprintf(prefix, 20, + snprintf(prefix, 27,
Same comment.
sln
Quoted 4 lines
drivers/net/ethernet/intel/i40evf/i40e_common.c +0
-0"i40evf %02x:%02x.%x: \t0x" , hw->bus.bus_id, hw->bus.device,
PATCH 7/12 i40e: Use correct flag to enable egress traffic for unicast promisc
In reply to Alice MichaelFrom: Akeem G Abodunrin <[email protected]>
Albeit, we usually set true promiscuous mode for both multicast and unicast at the same time - however, it is possible to set it individually, so using allmulti flag which is only for allmulticast might caused unwanted behavior in mirroring egress traffic promiscuous for unicast in VF.
--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +1 -1
@@ -1758,7 +1758,7 @@ static int i40e_vc_config_promiscuous_mode_msg(struct i40e_vf *vf, } }else { aq_ret =i40e_aq_set_vsi_unicast_promiscuous (hw, vsi->seid, - allmulti,NULL , + alluni,NULL , true); aq_err = pf->hw.aq.asq_last_status;if (aq_ret) {
Signature · 1 line
2.9.3
PATCH 8/12 i40evf: fix possible snprintf truncation of q_vector->name
In reply to Alice MichaelFrom: Jacob Keller <[email protected]>
The q_vector names are based on the interface name with a driver prefix, the type of q_vector setup, and the queue number. We previously set the size of this variable to IFNAMSIZ + 9, which is incorrect, because we actually include a minimum of 14 characters extra beyond the interface name size.
New versions of GCC since 7 include a new warning that detects this possible truncation and complains. We can fix this by increasing the size incase our interface name is too large to avoid truncation. We don't need to go beyond 14 because the compiler is smart enough to realize our values can never exceed size of 1. We do go up to 15 here because possible future changes may increase the number of queues beyond one digit.
While we are here, also change some variables to be unsigned (since they are never negative) and stop using an extra unnecessary %s format specifier.
--- drivers/net/ethernet/intel/i40evf/i40evf.h | 2 +- drivers/net/ethernet/intel/i40evf/i40evf_main.c | 21 +++++++++------------ 2 files changed, 10 insertions(+), 13 deletions(-)
drivers/net/ethernet/intel/i40evf/i40evf.h +1 -1
@@ -121,7 +121,7 @@ struct i40e_q_vector {#define ITR_COUNTDOWN_START 100u8 itr_countdown;/* when 0 or 1 update ITR */ int v_idx;/* vector index in list */ -char name[IFNAMSIZ +9 ]; +char name[IFNAMSIZ +15 ];bool arm_wb_state;cpumask_t affinity_mask;struct irq_affinity_notify affinity_notify;
drivers/net/ethernet/intel/i40evf/i40evf_main.c +9 -12
@@ -543,9 +543,9 @@ static void i40evf_irq_affinity_release(struct kref *ref) {}static int i40evf_request_traffic_irqs (struct i40evf_adapter *adapter,char *basename) { -int vector, err, q_vectors; -int rx_int_idx =0 , tx_int_idx =0 ; -int irq_num; +unsigned int vector, q_vectors; +unsigned int rx_int_idx =0 , tx_int_idx =0 ; +int irq_num, err;i40evf_irq_disable (adapter);/* Decrement for Other and TCP Timer vectors */
@@ -556,18 +556,15 @@ i40evf_request_traffic_irqs(struct i40evf_adapter *adapter, char *basename) irq_num = adapter->msix_entries[vector +NONQ_VECS ].vector;if (q_vector->tx.ring && q_vector->rx.ring) { -snprintf (q_vector->name,sizeof (q_vector->name) -1 , -"i40evf-%s-%s-%d" , basename, -"TxRx" , rx_int_idx++); +snprintf (q_vector->name,sizeof (q_vector->name), +"i40evf-%s-TxRx-%d" , basename, rx_int_idx++); tx_int_idx++; }else if (q_vector->rx.ring) { -snprintf (q_vector->name,sizeof (q_vector->name) -1 , -"i40evf-%s-%s-%d" , basename, -"rx" , rx_int_idx++); +snprintf (q_vector->name,sizeof (q_vector->name), +"i40evf-%s-rx-%d" , basename, rx_int_idx++); }else if (q_vector->tx.ring) { -snprintf (q_vector->name,sizeof (q_vector->name) -1 , -"i40evf-%s-%s-%d" , basename, -"tx" , tx_int_idx++); +snprintf (q_vector->name,sizeof (q_vector->name), +"i40evf-%s-tx-%d" , basename, tx_int_idx++); }else {/* skip this unused q_vector */ continue ;
Signature · 1 line
2.9.3
PATCH 9/12 i40e: force VMDQ device name truncation
In reply to Alice MichaelFrom: Jacob Keller <[email protected]>
In new versions of GCC since 7.x a new warning exists which warns when a string is truncated before all of the format can be completed.
When we setup VMDQ netdev names we are copying a pre-existing interface name which could be up to 15 characters in length. Since we also add 4 bytes, v, the literal %, the d and a \0 null, we would overrun the available size unless snprintf truncated for us.
The snprintf call will ofcourse truncate on the end, so lets instead modify the code to force truncation of the copied netdev name by 4 characters, to create enough space for the 4 bytes we're adding.
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_main.c +7 -2
@@ -9690,8 +9690,13 @@ static int i40e_config_netdev(struct i40e_vsi *vsi)i40e_add_mac_filter (vsi, mac_addr);spin_unlock_bh (&vsi->mac_filter_hash_lock); }else { -/* relate the VSI_VMDQ name to the VSI_MAIN name */ -snprintf (netdev->name,IFNAMSIZ ,"%sv%%d" , +/* Relate the VSI_VMDQ name to the VSI_MAIN name. Note that we +* are still limited by IFNAMSIZ, but we're adding 'v%d\0' to +* the end, which is 4 bytes long, so force truncation of the +* original name by IFNAMSIZ - 4 +*/ +snprintf (netdev->name,IFNAMSIZ ,"%.*sv%%d" , +IFNAMSIZ -4 , pf->vsi[pf->lan_vsi]->netdev->name);random_ether_addr (mac_addr);
Signature · 1 line
2.9.3
PATCH 10/12 i40e/i40evf: support for VF VLAN tag stripping control
In reply to Alice MichaelFrom: Mariusz Stachura <[email protected]>
This patch gives VF capability to control VLAN tag stripping via ethtool. As rx-vlan-offload was fixed before, now the VF is able to change it using "ethtool --offload <IF> rxvlan on/off" settings.
--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 60 ++++++++++++++++++++++ drivers/net/ethernet/intel/i40evf/i40evf.h | 4 ++ drivers/net/ethernet/intel/i40evf/i40evf_main.c | 33 ++++++++++++ .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 40 +++++++++++++++ 4 files changed, 137 insertions(+)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +60 -0
@@ -2530,6 +2530,60 @@ static int i40e_vc_set_rss_hena(struct i40e_vf *vf, u8 *msg, u16 msglen) }/** +* i40e_vc_enable_vlan_stripping +* @vf: pointer to the VF info +* @msg: pointer to the msg buffer +* @msglen: msg length +* +* Enable vlan header stripping for the VF +**/ +static int i40e_vc_enable_vlan_stripping (struct i40e_vf *vf,u8 *msg, +u16 msglen) +{ +struct i40e_vsi *vsi = vf->pf->vsi[vf->lan_vsi_idx]; +i40e_status aq_ret =0 ; + +if (!test_bit (I40E_VF_STATE_ACTIVE , &vf->vf_states)) { + aq_ret =I40E_ERR_PARAM ; + goto err; + } + +i40e_vlan_stripping_enable (vsi); + +/* send the response to the VF */ +err: +return i40e_vc_send_resp_to_vf (vf,VIRTCHNL_OP_ENABLE_VLAN_STRIPPING , + aq_ret); +} + +/** +* i40e_vc_disable_vlan_stripping +* @vf: pointer to the VF info +* @msg: pointer to the msg buffer +* @msglen: msg length +* +* Disable vlan header stripping for the VF +**/ +static int i40e_vc_disable_vlan_stripping (struct i40e_vf *vf,u8 *msg, +u16 msglen) +{ +struct i40e_vsi *vsi = vf->pf->vsi[vf->lan_vsi_idx]; +i40e_status aq_ret =0 ; + +if (!test_bit (I40E_VF_STATE_ACTIVE , &vf->vf_states)) { + aq_ret =I40E_ERR_PARAM ; + goto err; + } + +i40e_vlan_stripping_disable (vsi); + +/* send the response to the VF */ +err: +return i40e_vc_send_resp_to_vf (vf,VIRTCHNL_OP_DISABLE_VLAN_STRIPPING , + aq_ret); +} + +/** * i40e_vc_process_vf_msg * @pf: pointer to the PF structure * @vf_id: source VF id
@@ -2648,6 +2702,12 @@ int i40e_vc_process_vf_msg(struct i40e_pf *pf, s16 vf_id, u32 v_opcode,case VIRTCHNL_OP_SET_RSS_HENA : ret =i40e_vc_set_rss_hena (vf, msg, msglen);break ; +case VIRTCHNL_OP_ENABLE_VLAN_STRIPPING : + ret =i40e_vc_enable_vlan_stripping (vf, msg, msglen); +break ; +case VIRTCHNL_OP_DISABLE_VLAN_STRIPPING : + ret =i40e_vc_disable_vlan_stripping (vf, msg, msglen); +break ;case VIRTCHNL_OP_UNKNOWN :default :
drivers/net/ethernet/intel/i40evf/i40evf.h +4 -0
@@ -261,6 +261,8 @@ struct i40evf_adapter {#define I40EVF_FLAG_AQ_RELEASE_PROMISC BIT(16)#define I40EVF_FLAG_AQ_REQUEST_ALLMULTI BIT(17)#define I40EVF_FLAG_AQ_RELEASE_ALLMULTI BIT(18) +#define I40EVF_FLAG_AQ_ENABLE_VLAN_STRIPPING BIT(19) +#define I40EVF_FLAG_AQ_DISABLE_VLAN_STRIPPING BIT(20)/* OS defined structs */ struct net_device *netdev;
@@ -358,6 +360,8 @@ void i40evf_get_hena(struct i40evf_adapter *adapter);void i40evf_set_hena (struct i40evf_adapter *adapter);void i40evf_set_rss_key (struct i40evf_adapter *adapter);void i40evf_set_rss_lut (struct i40evf_adapter *adapter); +void i40evf_enable_vlan_stripping (struct i40evf_adapter *adapter); +void i40evf_disable_vlan_stripping (struct i40evf_adapter *adapter);void i40evf_virtchnl_completion (struct i40evf_adapter *adapter,enum virtchnl_ops v_opcode,i40e_status v_retval,u8 *msg,u16 msglen);
drivers/net/ethernet/intel/i40evf/i40evf_main.c +33 -0
@@ -1676,6 +1676,16 @@ static void i40evf_watchdog_task(struct work_struct *work) goto watchdog_done; } +if (adapter->aq_required &I40EVF_FLAG_AQ_ENABLE_VLAN_STRIPPING ) { +i40evf_enable_vlan_stripping (adapter); + goto watchdog_done; + } + +if (adapter->aq_required &I40EVF_FLAG_AQ_DISABLE_VLAN_STRIPPING ) { +i40evf_disable_vlan_stripping (adapter); + goto watchdog_done; + } +if (adapter->aq_required &I40EVF_FLAG_AQ_CONFIGURE_QUEUES ) {i40evf_configure_queues (adapter); goto watchdog_done;
@@ -2295,6 +2305,28 @@ static int i40evf_change_mtu(struct net_device *netdev, int new_mtu) }/** +* i40e_set_features - set the netdev feature flags +* @netdev: ptr to the netdev being adjusted +* @features: the feature set that the stack is suggesting +* Note: expects to be called while under rtnl_lock() +**/ +static int i40evf_set_features (struct net_device *netdev, +netdev_features_t features) +{ +struct i40evf_adapter *adapter =netdev_priv (netdev); + +if (!VLAN_ALLOWED (adapter)) +return -EINVAL ; + +if (features &NETIF_F_HW_VLAN_CTAG_RX ) + adapter->aq_required |=I40EVF_FLAG_AQ_ENABLE_VLAN_STRIPPING ; +else + adapter->aq_required |=I40EVF_FLAG_AQ_DISABLE_VLAN_STRIPPING ; + +return 0 ; +} + +/** * i40evf_features_check - Validate encapsulated packet conforms to limits * @skb: skb buff * @netdev: This physical port's netdev
@@ -2387,6 +2419,7 @@ static const struct net_device_ops i40evf_netdev_ops = { .ndo_vlan_rx_kill_vid = i40evf_vlan_rx_kill_vid, .ndo_features_check = i40evf_features_check, .ndo_fix_features = i40evf_fix_features, + .ndo_set_features = i40evf_set_features,#ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = i40evf_netpoll,#endif
drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c +40 -0
@@ -821,6 +821,46 @@ void i40evf_set_rss_lut(struct i40evf_adapter *adapter) }/** +* i40evf_enable_vlan_stripping +* @adapter: adapter structure +* +* Request VLAN header stripping to be enabled +**/ +void i40evf_enable_vlan_stripping (struct i40evf_adapter *adapter) +{ +if (adapter->current_op !=VIRTCHNL_OP_UNKNOWN ) { +/* bail because we already have a command pending */ +dev_err (&adapter->pdev->dev,"Cannot enable stripping, command %d pending\n" , + adapter->current_op); +return ; + } + adapter->current_op =VIRTCHNL_OP_ENABLE_VLAN_STRIPPING ; + adapter->aq_required &= ~I40EVF_FLAG_AQ_ENABLE_VLAN_STRIPPING ; +i40evf_send_pf_msg (adapter,VIRTCHNL_OP_ENABLE_VLAN_STRIPPING , +NULL ,0 ); +} + +/** +* i40evf_disable_vlan_stripping +* @adapter: adapter structure +* +* Request VLAN header stripping to be disabled +**/ +void i40evf_disable_vlan_stripping (struct i40evf_adapter *adapter) +{ +if (adapter->current_op !=VIRTCHNL_OP_UNKNOWN ) { +/* bail because we already have a command pending */ +dev_err (&adapter->pdev->dev,"Cannot disable stripping, command %d pending\n" , + adapter->current_op); +return ; + } + adapter->current_op =VIRTCHNL_OP_DISABLE_VLAN_STRIPPING ; + adapter->aq_required &= ~I40EVF_FLAG_AQ_DISABLE_VLAN_STRIPPING ; +i40evf_send_pf_msg (adapter,VIRTCHNL_OP_DISABLE_VLAN_STRIPPING , +NULL ,0 ); +} + +/** * i40evf_print_link_message - print link up or down * @adapter: adapter structure *
Signature · 1 line
2.9.3
PATCH 11/12 i40e: 25G FEC status improvements
In reply to Alice MichaelFrom: Mariusz Stachura <[email protected]>
This patch improves the system log message. The log message will be expanded to include the FEC mode the FW requested before link was established.
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_main.c +16 -2
@@ -5355,6 +5355,7 @@ void i40e_print_link_message(struct i40e_vsi *vsi, bool isup)char *speed ="Unknown" ;char *fc ="Unknown" ;char *fec ="" ; +char *req_fec ="" ;char *an ="" ; new_speed = vsi->back->hw.phy.link_info.link_speed;
@@ -5416,6 +5417,7 @@ void i40e_print_link_message(struct i40e_vsi *vsi, bool isup) }if (vsi->back->hw.phy.link_info.link_speed ==I40E_LINK_SPEED_25GB ) { + req_fec =", Requested FEC: None" ; fec =", FEC: None" ; an =", Autoneg: False" ;
@@ -5428,10 +5430,22 @@ void i40e_print_link_message(struct i40e_vsi *vsi, bool isup)else if (vsi->back->hw.phy.link_info.fec_info &I40E_AQ_CONFIG_FEC_RS_ENA ) fec =", FEC: CL108 RS-FEC" ; + +/* 'CL108 RS-FEC' should be displayed when RS is requested, or +* both RS and FC are requested +*/ +if (vsi->back->hw.phy.link_info.req_fec_info & + (I40E_AQ_REQUEST_FEC_KR |I40E_AQ_REQUEST_FEC_RS )) { +if (vsi->back->hw.phy.link_info.req_fec_info & +I40E_AQ_REQUEST_FEC_RS ) + req_fec =", Requested FEC: CL108 RS-FEC" ; +else + req_fec =", Requested FEC: CL74 FC-FEC/BASE-R" ; + } } -netdev_info (vsi->netdev,"NIC Link is Up, %sbps Full Duplex%s%s, Flow Control: %s\n" , - speed, fec, an, fc); +netdev_info (vsi->netdev,"NIC Link is Up, %sbps Full Duplex%s%s%s, Flow Control: %s\n" , + speed, req_fec, fec, an, fc); }/**
Signature · 1 line
2.9.3
PATCH 12/12 i40e: Add support for 'ethtool -m'
In reply to Alice MichaelFrom: Filip Sadowski <[email protected]>
This patch adds support for 'ethtool -m' command which displays information about (Q)SFP+ module plugged into NIC's cage.
--- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 149 +++++++++++++++++++++++++ 1 file changed, 149 insertions(+)
drivers/net/ethernet/intel/i40e/i40e_ethtool.c +149 -0
@@ -4196,6 +4196,153 @@ static int i40e_set_priv_flags(struct net_device *dev, u32 flags)return 0 ; } +#define I40E_I2C_EEPROM_DEV_ADDR 0xA0 +#define I40E_I2C_EEPROM_DEV_ADDR2 0xA2 +#define I40E_MODULE_TYPE_ADDR 0x00 +#define I40E_MODULE_REVISION_ADDR 0x01 +#define I40E_MODULE_SFF_8472_COMP 0x5E +#define I40E_MODULE_SFF_8472_SWAP 0x5C +#define I40E_MODULE_SFF_ADDR_MODE 0x04 +#define I40E_MODULE_TYPE_SFP 0x03 +#define I40E_MODULE_TYPE_QSFP_PLUS 0x0D +#define I40E_MODULE_TYPE_QSFP28 0x11 + +/** +* i40e_get_module_info - get (Q)SFP+ module type info +* @netdev: network interface device structure +* @modinfo: module EEPROM size and layout information structure +**/ +static int i40e_get_module_info (struct net_device *netdev, +struct ethtool_modinfo *modinfo) +{ +i40e_status status; +struct i40e_netdev_priv *np =netdev_priv (netdev); +struct i40e_vsi *vsi = np->vsi; +struct i40e_pf *pf = vsi->back; +struct i40e_hw *hw = &pf->hw; +u32 sff8472_comp =0 ; +u32 sff8472_swap =0 ; +u32 sff8636_rev =0 ; +u32 type =0 ; + +/* Check if firmware supports reading module EEPROM. */ +if (!(hw->aq.api_maj_ver ==I40E_FW_API_VERSION_MAJOR && + hw->aq.api_min_ver >=7 )) { +netdev_err (vsi->netdev,"Module EEPROM memory read not supported. Please update the NVM image.\n" ); +return -EINVAL ; + } + + status =i40e_aq_get_phy_register (hw, +I40E_AQ_PHY_REG_ACCESS_EXTERNAL_MODULE , +I40E_I2C_EEPROM_DEV_ADDR ,I40E_MODULE_TYPE_ADDR , + &type,NULL ); +if (status) +return -EIO ; + +switch (type) { +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_MODULE_SFF_8472_COMP , + &sff8472_comp,NULL ); +if (status) +return -EIO ; + + status =i40e_aq_get_phy_register (hw, +I40E_AQ_PHY_REG_ACCESS_EXTERNAL_MODULE , +I40E_I2C_EEPROM_DEV_ADDR , +I40E_MODULE_SFF_8472_SWAP , + &sff8472_swap,NULL ); +if (status) +return -EIO ; + +/* Check if the module requires address swap to access +* the other EEPROM memory page. +*/ +if (sff8472_swap &I40E_MODULE_SFF_ADDR_MODE ) { +netdev_warn (vsi->netdev,"Module address swap to access page 0xA2 is not supported.\n" ); + modinfo->type =ETH_MODULE_SFF_8079 ; + modinfo->eeprom_len =ETH_MODULE_SFF_8079_LEN ; + }else if (sff8472_comp ==0x00 ) { +/* Module is not SFF-8472 compliant */ + modinfo->type =ETH_MODULE_SFF_8079 ; + modinfo->eeprom_len =ETH_MODULE_SFF_8079_LEN ; + }else { + modinfo->type =ETH_MODULE_SFF_8472 ; + modinfo->eeprom_len =ETH_MODULE_SFF_8472_LEN ; + } +break ; +case I40E_MODULE_TYPE_QSFP_PLUS : + status =i40e_aq_get_phy_register (hw, +I40E_AQ_PHY_REG_ACCESS_EXTERNAL_MODULE , +I40E_I2C_EEPROM_DEV_ADDR , +I40E_MODULE_REVISION_ADDR , + &sff8636_rev,NULL ); +if (status) +return -EIO ; +/* Determine revision compliance byte */ +if (sff8636_rev >0x02 ) { +/* Module is SFF-8636 compliant */ + modinfo->type =ETH_MODULE_SFF_8636 ; + modinfo->eeprom_len =ETH_MODULE_SFF_8636_LEN ; + }else { + modinfo->type =ETH_MODULE_SFF_8436 ; + modinfo->eeprom_len =ETH_MODULE_SFF_8436_LEN ; + } +break ; +case I40E_MODULE_TYPE_QSFP28 : + modinfo->type =ETH_MODULE_SFF_8636 ; + modinfo->eeprom_len =ETH_MODULE_SFF_8636_LEN ; +break ; +default : +netdev_err (vsi->netdev,"Module type unrecognized\n" ); +return -EINVAL ; + } +return 0 ; +} + +/** +* i40e_get_module_eeprom - fills buffer with (Q)SFP+ module memory contents +* @netdev: network interface device structure +* @ee: EEPROM dump request structure +* @data: buffer to be filled with EEPROM contents +**/ +static int i40e_get_module_eeprom (struct net_device *netdev, +struct ethtool_eeprom *ee, +u8 *data) +{ +i40e_status status; +struct i40e_netdev_priv *np =netdev_priv (netdev); +struct i40e_vsi *vsi = np->vsi; +struct i40e_pf *pf = vsi->back; +struct i40e_hw *hw = &pf->hw; +u32 value =0 ; +int i; + +if (!ee || !ee->len || !data) +return -EINVAL ; + +for (i =0 ; i < ee->len; i++) { +u32 offset = i + ee->offset; +u32 addr =I40E_I2C_EEPROM_DEV_ADDR ; + +/* Check if we need to access the other memory page */ +if (offset >=ETH_MODULE_SFF_8079_LEN ) { + offset -=ETH_MODULE_SFF_8079_LEN ; + addr =I40E_I2C_EEPROM_DEV_ADDR2 ; + } + + status =i40e_aq_get_phy_register (hw, +I40E_AQ_PHY_REG_ACCESS_EXTERNAL_MODULE , + addr, offset, &value,NULL ); +if (status) +return -EIO ; + data[i] = value; + } +return 0 ; +} +static const struct ethtool_ops i40e_ethtool_ops = { .get_drvinfo = i40e_get_drvinfo, .get_regs_len = i40e_get_regs_len,
@@ -4228,6 +4375,8 @@ static const struct ethtool_ops i40e_ethtool_ops = { .set_rxfh = i40e_set_rxfh, .get_channels = i40e_get_channels, .set_channels = i40e_set_channels, + .get_module_info = i40e_get_module_info, + .get_module_eeprom = i40e_get_module_eeprom, .get_ts_info = i40e_get_ts_info, .get_priv_flags = i40e_get_priv_flags, .set_priv_flags = i40e_set_priv_flags,
Signature · 1 line
2.9.3
PATCH 12/12 i40e: Add support for 'ethtool -m'
Quoted 18 lines · Alice Michael
From: Filip Sadowski <[email protected]>
This patch adds support for 'ethtool -m' command which displays information about (Q)SFP+ module plugged into NIC's cage.
Signed-off-by Filip Sadowski <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 149 +++++++++++++++++++++++++ 1 file changed, 149 insertions(+)drivers/net/ethernet/intel/i40e/i40e_ethtool.c +0
-0@@ -4196,6 +4196,153 @@ static int i40e_set_priv_flags(struct net_device *dev, u32 flags)return 0 ; }
drivers/net/ethernet/intel/i40e/i40e_ethtool.c static int i40e_set_priv_flags(struct net_device *dev, u32 flags) · line 4208
Quoted 10 lines
drivers/net/ethernet/intel/i40e/i40e_ethtool.c +10
-0+#define I40E_I2C_EEPROM_DEV_ADDR 0xA0 +#define I40E_I2C_EEPROM_DEV_ADDR2 0xA2 +#define I40E_MODULE_TYPE_ADDR 0x00 +#define I40E_MODULE_REVISION_ADDR 0x01 +#define I40E_MODULE_SFF_8472_COMP 0x5E +#define I40E_MODULE_SFF_8472_SWAP 0x5C +#define I40E_MODULE_SFF_ADDR_MODE 0x04 +#define I40E_MODULE_TYPE_SFP 0x03 +#define I40E_MODULE_TYPE_QSFP_PLUS 0x0D +#define I40E_MODULE_TYPE_QSFP28 0x11
Why aren't these defines in i40e_type.h?
sln
Quoted 150 lines
drivers/net/ethernet/intel/i40e/i40e_ethtool.c +139
-0+ +/** +* i40e_get_module_info - get (Q)SFP+ module type info +* @netdev: network interface device structure +* @modinfo: module EEPROM size and layout information structure +**/ +static int i40e_get_module_info (struct net_device *netdev, +struct ethtool_modinfo *modinfo) +{ +i40e_status status; +struct i40e_netdev_priv *np =netdev_priv (netdev); +struct i40e_vsi *vsi = np->vsi; +struct i40e_pf *pf = vsi->back; +struct i40e_hw *hw = &pf->hw; +u32 sff8472_comp =0 ; +u32 sff8472_swap =0 ; +u32 sff8636_rev =0 ; +u32 type =0 ; + +/* Check if firmware supports reading module EEPROM. */ +if (!(hw->aq.api_maj_ver ==I40E_FW_API_VERSION_MAJOR && + hw->aq.api_min_ver >=7 )) { +netdev_err (vsi->netdev,"Module EEPROM memory read not supported. Please update the NVM image.\n" ); +return -EINVAL ; + } + + status =i40e_aq_get_phy_register (hw, +I40E_AQ_PHY_REG_ACCESS_EXTERNAL_MODULE , +I40E_I2C_EEPROM_DEV_ADDR ,I40E_MODULE_TYPE_ADDR , + &type,NULL ); +if (status) +return -EIO ; + +switch (type) { +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_MODULE_SFF_8472_COMP , + &sff8472_comp,NULL ); +if (status) +return -EIO ; + + status =i40e_aq_get_phy_register (hw, +I40E_AQ_PHY_REG_ACCESS_EXTERNAL_MODULE , +I40E_I2C_EEPROM_DEV_ADDR , +I40E_MODULE_SFF_8472_SWAP , + &sff8472_swap,NULL ); +if (status) +return -EIO ; + +/* Check if the module requires address swap to access +* the other EEPROM memory page. +*/ +if (sff8472_swap &I40E_MODULE_SFF_ADDR_MODE ) { +netdev_warn (vsi->netdev,"Module address swap to access page 0xA2 is not supported.\n" ); + modinfo->type =ETH_MODULE_SFF_8079 ; + modinfo->eeprom_len =ETH_MODULE_SFF_8079_LEN ; + }else if (sff8472_comp ==0x00 ) { +/* Module is not SFF-8472 compliant */ + modinfo->type =ETH_MODULE_SFF_8079 ; + modinfo->eeprom_len =ETH_MODULE_SFF_8079_LEN ; + }else { + modinfo->type =ETH_MODULE_SFF_8472 ; + modinfo->eeprom_len =ETH_MODULE_SFF_8472_LEN ; + } +break ; +case I40E_MODULE_TYPE_QSFP_PLUS : + status =i40e_aq_get_phy_register (hw, +I40E_AQ_PHY_REG_ACCESS_EXTERNAL_MODULE , +I40E_I2C_EEPROM_DEV_ADDR , +I40E_MODULE_REVISION_ADDR , + &sff8636_rev,NULL ); +if (status) +return -EIO ; +/* Determine revision compliance byte */ +if (sff8636_rev >0x02 ) { +/* Module is SFF-8636 compliant */ + modinfo->type =ETH_MODULE_SFF_8636 ; + modinfo->eeprom_len =ETH_MODULE_SFF_8636_LEN ; + }else { + modinfo->type =ETH_MODULE_SFF_8436 ; + modinfo->eeprom_len =ETH_MODULE_SFF_8436_LEN ; + } +break ; +case I40E_MODULE_TYPE_QSFP28 : + modinfo->type =ETH_MODULE_SFF_8636 ; + modinfo->eeprom_len =ETH_MODULE_SFF_8636_LEN ; +break ; +default : +netdev_err (vsi->netdev,"Module type unrecognized\n" ); +return -EINVAL ; + } +return 0 ; +} + +/** +* i40e_get_module_eeprom - fills buffer with (Q)SFP+ module memory contents +* @netdev: network interface device structure +* @ee: EEPROM dump request structure +* @data: buffer to be filled with EEPROM contents +**/ +static int i40e_get_module_eeprom (struct net_device *netdev, +struct ethtool_eeprom *ee, +u8 *data) +{ +i40e_status status; +struct i40e_netdev_priv *np =netdev_priv (netdev); +struct i40e_vsi *vsi = np->vsi; +struct i40e_pf *pf = vsi->back; +struct i40e_hw *hw = &pf->hw; +u32 value =0 ; +int i; + +if (!ee || !ee->len || !data) +return -EINVAL ; + +for (i =0 ; i < ee->len; i++) { +u32 offset = i + ee->offset; +u32 addr =I40E_I2C_EEPROM_DEV_ADDR ; + +/* Check if we need to access the other memory page */ +if (offset >=ETH_MODULE_SFF_8079_LEN ) { + offset -=ETH_MODULE_SFF_8079_LEN ; + addr =I40E_I2C_EEPROM_DEV_ADDR2 ; + } + + status =i40e_aq_get_phy_register (hw, +I40E_AQ_PHY_REG_ACCESS_EXTERNAL_MODULE , + addr, offset, &value,NULL ); +if (status) +return -EIO ; + data[i] = value; + } +return 0 ; +} +static const struct ethtool_ops i40e_ethtool_ops = { .get_drvinfo = i40e_get_drvinfo, .get_regs_len = i40e_get_regs_len,@@ -4228,6 +4375,8 @@ static const struct ethtool_ops i40e_ethtool_ops = { .set_rxfh = i40e_set_rxfh, .get_channels = i40e_get_channels, .set_channels = i40e_set_channels, + .get_module_info = i40e_get_module_info, + .get_module_eeprom = i40e_get_module_eeprom, .get_ts_info = i40e_get_ts_info, .get_priv_flags = i40e_get_priv_flags, .set_priv_flags = i40e_set_priv_flags,