i40e: Queues are reserved despite "Invalid argument" error.
Subsystems (2)
PATCH 1/12 i40e: Queues are reserved despite "Invalid argument" error.
From: Adam Ludkiewicz <[email protected]>
Added a new local variable in the i40e_setup_tc function named old_queue_pairs so num_queue_pairs can be restored to the correct value in case configuring queue channels fails. Additionally, moved the exit label in the i40e_setup_tc function so the if (need_reset) block can be executed.
Also, fixed data packing in the i40e_setup_tc function.
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/intel/i40e/i40e_main.c +3 -0
@@ -7290,10 +7290,12 @@ static int i40e_setup_tc(struct net_device *netdev, void *type_data)struct i40e_pf *pf = vsi->back;u8 enabled_tc =0 , num_tc, hw;bool need_reset = false; +int old_queue_pairs;int ret = -EINVAL ;u16 mode;int i; + old_queue_pairs = vsi->num_queue_pairs; num_tc = mqprio_qopt->qopt.num_tc; hw = mqprio_qopt->qopt.hw; mode = mqprio_qopt->mode;
@@ -7394,6 +7396,7 @@ static int i40e_setup_tc(struct net_device *netdev, void *type_data) } ret =i40e_configure_queue_channels (vsi);if (ret) { + vsi->num_queue_pairs = old_queue_pairs;netdev_info (netdev,"Failed configuring queue channels\n" ); need_reset = true;
Signature · 1 line
2.19.2
PATCH 2/12 i40e: Implement DDP support in i40e driver
From: Aleksandr Loktionov <[email protected]>
This patch introduces DDP (Dynamic Device Personalization) which allows loading profiles that change the way internal parser interprets processed frames. To load DDP profiles it utilizes ethtool flash feature. The files with recipes must be located in /var/lib/firmware directory. Afterwards the recipe can be loaded by invoking:
ethtool -f <if_name> <file_name> 100
ethtool -f <if_name> - 100See further usage details of this feature in the i40e documentation, or visit
https://software.intel.com/en-us/articles/dynamic-device-personalization-for-intel-ethernet-700-series
The driver shall verify DDP profile can be loaded in accordance with the rules:
* Package with Group ID 0 are exclusive and can only be loaded the first.
* Packages with Group ID 0x01-0xFE can only be loaded simultaneously with the packages from the same group.
* Packages with Group ID 0xFF are compatible with all other packages.
--- drivers/net/ethernet/intel/i40e/Makefile | 1 + drivers/net/ethernet/intel/i40e/i40e.h | 25 + drivers/net/ethernet/intel/i40e/i40e_common.c | 253 ++++++++- drivers/net/ethernet/intel/i40e/i40e_ddp.c | 481 ++++++++++++++++++ .../net/ethernet/intel/i40e/i40e_ethtool.c | 1 + drivers/net/ethernet/intel/i40e/i40e_main.c | 1 + .../net/ethernet/intel/i40e/i40e_prototype.h | 6 + drivers/net/ethernet/intel/i40e/i40e_type.h | 23 + 8 files changed, 769 insertions(+), 22 deletions(-) create mode 100644 drivers/net/ethernet/intel/i40e/i40e_ddp.c
drivers/net/ethernet/intel/i40e/Makefile +1 -0
@@ -21,6 +21,7 @@ i40e-objs := i40e_main.o \ i40e_diag.o \ i40e_txrx.o \ i40e_ptp.o \ + i40e_ddp.o \ i40e_client.o \ i40e_virtchnl_pf.o \ i40e_xsk.o
drivers/net/ethernet/intel/i40e/i40e.h +25 -0
@@ -322,6 +322,29 @@ struct i40e_udp_port_config {u8 filter_index; }; +#define I40_DDP_FLASH_REGION 100 +#define I40E_PROFILE_INFO_SIZE 48 +#define I40E_MAX_PROFILE_NUM 16 +#define I40E_PROFILE_LIST_SIZE \ + (I40E_PROFILE_INFO_SIZE * I40E_MAX_PROFILE_NUM + 4) +#define I40E_DDP_PROFILE_PATH "intel/i40e/ddp/" +#define I40E_DDP_PROFILE_NAME_MAX 64 + +int i40e_ddp_load (struct net_device *netdev,const u8 *data,size_t size, +bool is_add); +int i40e_ddp_flash (struct net_device *netdev,struct ethtool_flash *flash); + +struct i40e_ddp_profile_list { +u32 p_count; +struct i40e_profile_info p_info[0 ]; +}; + +struct i40e_ddp_old_profile_list { +struct list_head list; +size_t old_ddp_size; +u8 old_ddp_buf[0 ]; +}; +/* macros related to FLX_PIT */ #define I40E_FLEX_SET_FSIZE (fsize) (((fsize) << \ I40E_PRTQF_FLX_PIT_FSIZE_SHIFT) & \
@@ -630,6 +653,8 @@ struct i40e_pf {u16 override_q_count;u16 last_sw_conf_flags;u16 last_sw_conf_valid_flags; +/* List to keep previous DDP profiles to be rolled back in the future */ +struct list_head ddp_old_prof; };/**
drivers/net/ethernet/intel/i40e/i40e_common.c +231 -22
284 lines not on this page · raw message
drivers/net/ethernet/intel/i40e/i40e_ddp.c new file +481 -0
481 lines not on this page · raw message
drivers/net/ethernet/intel/i40e/i40e_ethtool.c +1 -0
@@ -5172,6 +5172,7 @@ static const struct ethtool_ops i40e_ethtool_ops = { .set_link_ksettings = i40e_set_link_ksettings, .get_fecparam = i40e_get_fec_param, .set_fecparam = i40e_set_fec_param, + .flash_device = i40e_ddp_flash, };void i40e_set_ethtool_ops (struct net_device *netdev)
drivers/net/ethernet/intel/i40e/i40e_main.c +1 -0
@@ -14429,6 +14429,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)INIT_LIST_HEAD (&pf->l3_flex_pit_list);INIT_LIST_HEAD (&pf->l4_flex_pit_list); +INIT_LIST_HEAD (&pf->ddp_old_prof);/* set up the locks for the AQ, do this only once in probe * and destroy them only once in remove
drivers/net/ethernet/intel/i40e/i40e_prototype.h +6 -0
@@ -429,10 +429,16 @@ i40e_status i40e_aq_get_ddp_list(struct i40e_hw *hw, void *buff,struct i40e_generic_seg_header *i40e_find_segment_in_package (u32 segment_type,struct i40e_package_header *pkg_header); +struct i40e_profile_section_header * +i40e_find_section_in_profile (u32 section_type, +struct i40e_profile_segment *profile);enum i40e_status_code i40e_write_profile (struct i40e_hw *hw,struct i40e_profile_segment *i40e_seg,u32 track_id);enum i40e_status_code +i40e_rollback_profile (struct i40e_hw *hw,struct i40e_profile_segment *i40e_seg, +u32 track_id); +enum i40e_status_code i40e_add_pinfo_to_list (struct i40e_hw *hw,struct i40e_profile_segment *profile,u8 *profile_info_sec,u32 track_id);
drivers/net/ethernet/intel/i40e/i40e_type.h +23 -0
@@ -1527,6 +1527,8 @@ struct i40e_generic_seg_header {struct i40e_metadata_segment {struct i40e_generic_seg_header header;struct i40e_ddp_version version; +#define I40E_DDP_TRACKID_RDONLY 0 +#define I40E_DDP_TRACKID_INVALID 0xFFFFFFFFu32 track_id;char name[I40E_DDP_NAME_SIZE ]; };
@@ -1555,15 +1557,36 @@ struct i40e_profile_section_header {struct {#define SECTION_TYPE_INFO 0x00000010#define SECTION_TYPE_MMIO 0x00000800 +#define SECTION_TYPE_RB_MMIO 0x00001800#define SECTION_TYPE_AQ 0x00000801 +#define SECTION_TYPE_RB_AQ 0x00001801#define SECTION_TYPE_NOTE 0x80000000#define SECTION_TYPE_NAME 0x80000001 +#define SECTION_TYPE_PROTO 0x80000002 +#define SECTION_TYPE_PCTYPE 0x80000003 +#define SECTION_TYPE_PTYPE 0x80000004u32 type;u32 offset;u32 size; } section; }; +struct i40e_profile_tlv_section_record { +u8 rtype; +u8 type; +u16 len; +u8 data[12 ]; +}; + +/* Generic AQ section in proflie */ +struct i40e_profile_aq_section { +u16 opcode; +u16 flags; +u8 param[16 ]; +u16 datalen; +u8 data[1 ]; +}; +struct i40e_profile_info {u32 track_id;struct i40e_ddp_version version;
Signature · 1 line
2.19.2
Bowers
PATCH 2/12 i40e: Implement DDP support in i40e driver
Quoted 42 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Wednesday, February 6, 2019 3:08 PM
To: Michael, Alice <[email protected]>; intel-wired- lan at lists.osuosl.org
Cc: Loktionov, Aleksandr <[email protected]>
Subject: [Intel-wired-lan] [next PATCH S2-V2 02/12] i40e: Implement DDP support in i40e driverFrom: Aleksandr Loktionov <[email protected]>
This patch introduces DDP (Dynamic Device Personalization) which allows loading profiles that change the way internal parser interprets processed frames. To load DDP profiles it utilizes ethtool flash feature. The files with recipes must be located in
/var/lib/firmwaredirectory. Afterwards the recipe can be loaded by invoking:ethtool -f <if_name> <file_name> 100 ethtool -f <if_name> - 100See further usage details of this feature in the i40e documentation, or visit
https://software.intel.com/en-us/articles/dynamic-device-personalization-
for-intel-ethernet-700-seriesThe driver shall verify DDP profile can be loaded in accordance with the rules:
* Package with Group ID 0 are exclusive and can only be loaded the first.
* Packages with Group ID 0x01-0xFE can only be loaded simultaneously with the packages from the same group.
* Packages with Group ID0xFFare compatible with all other packages.Signed-off-by Aleksandr Loktionov <[email protected]>--- drivers/net/ethernet/intel/i40e/Makefile | 1 + drivers/net/ethernet/intel/i40e/i40e.h | 25 + drivers/net/ethernet/intel/i40e/i40e_common.c | 253 ++++++++- drivers/net/ethernet/intel/i40e/i40e_ddp.c | 481 ++++++++++++++++++ .../net/ethernet/intel/i40e/i40e_ethtool.c | 1 + drivers/net/ethernet/intel/i40e/i40e_main.c | 1 + .../net/ethernet/intel/i40e/i40e_prototype.h | 6 + drivers/net/ethernet/intel/i40e/i40e_type.h | 23 + 8 files changed, 769 insertions(+), 22 deletions(-) create mode 100644
Quoted 1 line
drivers/net/ethernet/intel/i40e/i40e_ddp.c
PATCH 3/12 i40e: don't allow changes to HW vlan stripping on active port vlans
In reply to Alice MichaelFrom: Nicholas Nunley <[email protected]>
Modifying the vlan stripping options when a port vlan is configured will break traffic for the VSI, and conceptually doesn't make sense, so don't allow this.
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/net/ethernet/intel/i40e/i40e_main.c +8 -0
@@ -2654,6 +2654,10 @@ void i40e_vlan_stripping_enable(struct i40e_vsi *vsi)struct i40e_vsi_context ctxt;i40e_status ret; +/* Don't modify stripping options if a port vlan is active */ +if (vsi->info.pvid) +return ; +if ((vsi->info.valid_sections &cpu_to_le16 (I40E_AQ_VSI_PROP_VLAN_VALID )) && ((vsi->info.port_vlan_flags &I40E_AQ_VSI_PVLAN_MODE_MASK ) ==0 ))
@@ -2684,6 +2688,10 @@ void i40e_vlan_stripping_disable(struct i40e_vsi *vsi)struct i40e_vsi_context ctxt;i40e_status ret; +/* Don't modify stripping options if a port vlan is active */ +if (vsi->info.pvid) +return ; + if ((vsi->info.valid_sections & cpu_to_le16(I40E_AQ_VSI_PROP_VLAN_VALID)) && ((vsi->info.port_vlan_flags & I40E_AQ_VSI_PVLAN_EMOD_MASK) ==
Signature · 1 line
2.19.2
Bowers
PATCH 3/12 i40e: don't allow changes to HW vlan stripping on active port vlans
Quoted 11 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Wednesday, February 6, 2019 3:08 PM
To: Michael, Alice <[email protected]>; intel-wired-
lan at lists.osuosl.org
Subject: [Intel-wired-lan] [next PATCH S2-V2 03/12] i40e: don't allow changes to HW vlan stripping on active port vlansFrom: Nicholas Nunley <[email protected]>
Quoted 7 lines
Modifying the vlan stripping options when a port vlan is configured will break traffic for the VSI, and conceptually doesn't make sense, so don't allow this.
Signed-off-by Nicholas Nunley <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_main.c | 8 ++++++++ 1 file changed, 8 insertions(+)
PATCH 4/12 i40e: save PTP time before a device reset
In reply to Alice MichaelFrom: Jacob Keller <[email protected]>
In the case where PTP is running on the hardware clock, but the kernel system time is not being synced, a device reset can mess up the clock time.
This occurs because we reset the clock time based on the kernel time every reset. This causes us to potentially completely reset the PTP time, and can cause unexpected behavior in programs like ptp4l.
Avoid this by saving the PTP time prior to device reset, and then restoring using that time after the reset.
Directly restoring the PTP time we saved isn't perfect, because time should have continued running, but the clock will essentially be stopped during the reset. This is still better than the current solution of assuming that the PTP hw clock is synced to the CLOCK_REALTIME.
We can do even better, by saving the ktime and calculating
a differential, using ktime_get(). This is based on CLOCK_MONOTONIC, and allows us to get a fairly precise measure of the time difference between saving and restoring the time.
Using this, we can update the saved PTP time, and use that as the value to write to the hardware clock registers. This, ofcourse is not perfect. However, it does help ensure that the PTP time is restored as close as feasible to the time it should have been if the reset had not occurred.
During device initialization, continue using the system time as the source for the creation of the PTP clock, since this is the best known current time source at driver load.
--- drivers/net/ethernet/intel/i40e/i40e.h | 4 ++ drivers/net/ethernet/intel/i40e/i40e_main.c | 5 ++ drivers/net/ethernet/intel/i40e/i40e_ptp.c | 54 +++++++++++++++++++-- 3 files changed, 59 insertions(+), 4 deletions(-)
drivers/net/ethernet/intel/i40e/i40e.h +4 -0
@@ -632,6 +632,8 @@ struct i40e_pf {struct sk_buff *ptp_tx_skb;unsigned long ptp_tx_start;struct hwtstamp_config tstamp_config; +struct timespec64 ptp_prev_hw_time; +ktime_t ptp_reset_start;struct mutex tmreg_lock;/* Used to protect the SYSTIME registers. */ u32 ptp_adj_mult;u32 tx_hwtstamp_timeouts;
@@ -1132,6 +1134,8 @@ void i40e_ptp_rx_hwtstamp(struct i40e_pf *pf, struct sk_buff *skb, u8 index);void i40e_ptp_set_increment (struct i40e_pf *pf);int i40e_ptp_set_ts_config (struct i40e_pf *pf,struct ifreq *ifr);int i40e_ptp_get_ts_config (struct i40e_pf *pf,struct ifreq *ifr); +void i40e_ptp_save_hw_time (struct i40e_pf *pf); +void i40e_ptp_restore_hw_time (struct i40e_pf *pf);void i40e_ptp_init (struct i40e_pf *pf);void i40e_ptp_stop (struct i40e_pf *pf);int i40e_is_vsi_uplink_mode_veb (struct i40e_vsi *vsi);
drivers/net/ethernet/intel/i40e/i40e_main.c +5 -0
@@ -9745,6 +9745,11 @@ static void i40e_prep_for_reset(struct i40e_pf *pf, bool lock_acquired)dev_warn (&pf->pdev->dev,"shutdown_lan_hmc failed: %d\n" , ret); } + +/* Save the current PTP time so that we can restore the time after the +* reset completes. +*/ +i40e_ptp_save_hw_time (pf); }/**
drivers/net/ethernet/intel/i40e/i40e_ptp.c +50 -4
81 lines not on this page · raw message
Signature · 1 line
2.19.2
Keller
PATCH 4/12 i40e: save PTP time before a device reset
Quoted 105 lines
-----Original Message-----
From: Michael, Alice
Sent: Wednesday, February 06, 2019 3:08 PM
To: Michael, Alice <[email protected]>; intel-wired-lan at lists.osuosl.org
Cc: Keller, Jacob E <[email protected]>
Subject: [next PATCH S2-V2 04/12] i40e: save PTP time before a device resetFrom: Jacob Keller <[email protected]>
In the case where PTP is running on the hardware clock, but the kernel system time is not being synced, a device reset can mess up the clock time.
This occurs because we reset the clock time based on the kernel time every reset. This causes us to potentially completely reset the PTP time, and can cause unexpected behavior in programs like ptp4l.
Avoid this by saving the PTP time prior to device reset, and then restoring using that time after the reset.
Directly restoring the PTP time we saved isn't perfect, because time should have continued running, but the clock will essentially be stopped during the reset. This is still better than the current solution of assuming that the PTP hw clock is synced to the
CLOCK_REALTIME.We can do even better, by saving the ktime and calculating
a differential, usingktime_get(). This is based onCLOCK_MONOTONIC, and allows us to get a fairly precise measure of the time difference between saving and restoring the time.Using this, we can update the saved PTP time, and use that as the value to write to the hardware clock registers. This, ofcourse is not perfect. However, it does help ensure that the PTP time is restored as close as feasible to the time it should have been if the reset had not occurred.
During device initialization, continue using the system time as the source for the creation of the PTP clock, since this is the best known current time source at driver load.
Signed-off-by Jacob Keller <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e.h | 4 ++ drivers/net/ethernet/intel/i40e/i40e_main.c | 5 ++ drivers/net/ethernet/intel/i40e/i40e_ptp.c | 54 +++++++++++++++++++-- 3 files changed, 59 insertions(+), 4 deletions(-)drivers/net/ethernet/intel/i40e/i40e.h +4
-0@@ -632,6 +632,8 @@ struct i40e_pf {struct sk_buff *ptp_tx_skb;unsigned long ptp_tx_start;struct hwtstamp_config tstamp_config; +struct timespec64 ptp_prev_hw_time; +ktime_t ptp_reset_start;struct mutex tmreg_lock;/* Used to protect the SYSTIME registers. */ u32 ptp_adj_mult;u32 tx_hwtstamp_timeouts;@@ -1132,6 +1134,8 @@ void i40e_ptp_rx_hwtstamp(struct i40e_pf *pf, struct sk_buff *skb, u8 index);void i40e_ptp_set_increment (struct i40e_pf *pf);int i40e_ptp_set_ts_config (struct i40e_pf *pf,struct ifreq *ifr);int i40e_ptp_get_ts_config (struct i40e_pf *pf,struct ifreq *ifr); +void i40e_ptp_save_hw_time (struct i40e_pf *pf); +void i40e_ptp_restore_hw_time (struct i40e_pf *pf);void i40e_ptp_init (struct i40e_pf *pf);void i40e_ptp_stop (struct i40e_pf *pf);int
i40e_is_vsi_uplink_mode_veb(struct i40e_vsi *vsi);drivers/net/ethernet/intel/i40e/i40e_main.c +5
-0@@ -9745,6 +9745,11 @@ static void i40e_prep_for_reset(struct i40e_pf *pf, bool lock_acquired) dev_warn(&pf->pdev->dev, "shutdown_lan_hmc failed: %d\n", ret); } + +/* Save the current PTP time so that we can restore the time after the +* reset completes. +*/ +i40e_ptp_save_hw_time (pf); }/**
drivers/net/ethernet/intel/i40e/i40e_ptp.c +5
-0@@ -724,9 +724,52 @@ static long i40e_ptp_create_clock(struct i40e_pf *pf) pf->tstamp_config.rx_filter =HWTSTAMP_FILTER_NONE ; pf->tstamp_config.tx_type =HWTSTAMP_TX_OFF ; +/* Set the previous "reset" time to the current Kernel clock time */ + pf->ptp_prev_hw_time =ktime_to_timespec64 (ktime_get_real ()); + pf->ptp_reset_start =ktime_get (); +return 0 ; } +/**
drivers/net/ethernet/intel/i40e/i40e_ptp.c static long i40e_ptp_create_clock(struct i40e_pf *pf) · line 744
Quoted 10 lines
drivers/net/ethernet/intel/i40e/i40e_ptp.c +10
-0+* i40e_ptp_save_hw_time - Save the current PTP time as ptp_prev_hw_time +* @pf: Board private structure +* +* Read the current PTP time and save it into pf->ptp_prev_hw_time. This should +* be called at the end of preparing to reset, just before hardware reset +* occurs, in order to preserve the PTP time as close as possible across +* resets. +*/ +void i40e_ptp_save_hw_time (struct i40e_pf *pf) +{
This function needs to check that PTP is enabled, as it's called by i40e_prep_for_reset, and could attempt to access an invalid mutex if PTP was already disabled, or not yet re-enabled.
We should hold off on submitting this version until it can be fixed up.
Thanks,
Jake
Quoted 65 lines
drivers/net/ethernet/intel/i40e/i40e_ptp.c +35
-5+i40e_ptp_gettimex (&pf->ptp_caps, &pf->ptp_prev_hw_time,NULL ); +/* Get a monotonic starting time for this reset */ + pf->ptp_reset_start =ktime_get (); +} + +/** +* i40e_ptp_restore_hw_time - Restore the ptp_prev_hw_time + delta to PTP regs +* @pf: Board private structure +* +* Restore the PTP hardware clock registers. We previously cached the PTP +* hardware time as pf->ptp_prev_hw_time. To be as accurate as possible, +* update this value based on the time delta since the time was saved, using +* CLOCK_MONOTONIC (via ktime_get()) to calculate the time difference. +* +* This ensures that the hardware clock is restored to nearly what it should +* have been if a reset had not occurred. +*/ +void i40e_ptp_restore_hw_time (struct i40e_pf *pf) +{ +ktime_t delta =ktime_sub (ktime_get (), pf->ptp_reset_start); + +/* Update the previous HW time with the ktime delta */ +timespec64_add_ns (&pf->ptp_prev_hw_time,ktime_to_ns (delta)); + +/* Restore the hardware clock registers */ +i40e_ptp_settime (&pf->ptp_caps, &pf->ptp_prev_hw_time); +} +/** * i40e_ptp_init - Initialize the 1588 support after device probe or reset * @pf: Board private structure @@ -734,6 +777,11 @@ static long i40e_ptp_create_clock(struct i40e_pf *pf)* This function sets device up for 1588 support. The first time it is run, it * will create a PHC clock device. It does not create a clock device if one * already exists. It also reconfigures the device after a reset. +* +* The first time a clock is created, i40e_ptp_create_clock will set +* pf->ptp_prev_hw_time to the current system time. During resets, it is +* expected that this timespec will be set to the last known PTP clock time, +* in order to preserve the clock time as close as possible across a reset. **/ void i40e_ptp_init (struct i40e_pf *pf) {@@ -765,7 +813,6 @@ void i40e_ptp_init(struct i40e_pf *pf)dev_err (&pf->pdev->dev,"%s: ptp_clock_register failed\n" , __func__); }else if (pf->ptp_clock) { -struct timespec64 ts;u32 regval;if (pf->hw.debug_mask &I40E_DEBUG_LAN )@@ -786,9 +833,8 @@ void i40e_ptp_init(struct i40e_pf *pf)/* reset timestamping mode */ i40e_ptp_set_timestamp_mode (pf, &pf->tstamp_config); -/* Set the clock value. */ - ts =ktime_to_timespec64 (ktime_get_real ()); -i40e_ptp_settime (&pf->ptp_caps, &ts); +/* Restore the clock time based on last known value */ +i40e_ptp_restore_hw_time (pf); } } --2.19.2
PATCH 5/12 i40e: Fix for 10G ports LED not blinking
In reply to Alice MichaelFrom: Piotr Marczak <[email protected]>
On some hardware LEDs would not blink after command 'ethtool -p {eth-port}' in certain circumstances. Now, function does not care about the activity of the LED (though still preserves its state) but forcibly executes identification blinking and then restores the LED state.
--- drivers/net/ethernet/intel/i40e/i40e_common.c | 33 ------------------- 1 file changed, 33 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_common.c +0 -33
@@ -1466,7 +1466,6 @@ static u32 i40e_led_is_mine(struct i40e_hw *hw, int idx)**/ u32 i40e_led_get (struct i40e_hw *hw) { -u32 current_mode =0 ;u32 mode =0 ;int i;
@@ -1479,21 +1478,6 @@ u32 i40e_led_get(struct i40e_hw *hw)if (!gpio_val)continue ; -/* ignore gpio LED src mode entries related to the activity -* LEDs -*/ - current_mode = ((gpio_val &I40E_GLGEN_GPIO_CTL_LED_MODE_MASK ) - >>I40E_GLGEN_GPIO_CTL_LED_MODE_SHIFT ); -switch (current_mode) { -case I40E_COMBINED_ACTIVITY : -case I40E_FILTER_ACTIVITY : -case I40E_MAC_ACTIVITY : -case I40E_LINK_ACTIVITY : -continue ; -default : -break ; - } - mode = (gpio_val &I40E_GLGEN_GPIO_CTL_LED_MODE_MASK ) >>I40E_GLGEN_GPIO_CTL_LED_MODE_SHIFT ;break ;
@@ -1513,7 +1497,6 @@ u32 i40e_led_get(struct i40e_hw *hw)**/ void i40e_led_set (struct i40e_hw *hw,u32 mode,bool blink) { -u32 current_mode =0 ;int i;if (mode &0xfffffff0 )
@@ -1527,22 +1510,6 @@ void i40e_led_set(struct i40e_hw *hw, u32 mode, bool blink)if (!gpio_val)continue ; - -/* ignore gpio LED src mode entries related to the activity -* LEDs -*/ - current_mode = ((gpio_val &I40E_GLGEN_GPIO_CTL_LED_MODE_MASK ) - >>I40E_GLGEN_GPIO_CTL_LED_MODE_SHIFT ); -switch (current_mode) { -case I40E_COMBINED_ACTIVITY : -case I40E_FILTER_ACTIVITY : -case I40E_MAC_ACTIVITY : -case I40E_LINK_ACTIVITY : -continue ; -default : -break ; - } - 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) &
Signature · 1 line
2.19.2
Bowers
PATCH 5/12 i40e: Fix for 10G ports LED not blinking
Quoted 18 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Wednesday, February 6, 2019 3:08 PM
To: Michael, Alice <[email protected]>; intel-wired-
lan at lists.osuosl.org
Cc: Marczak, Piotr <[email protected]>
Subject: [Intel-wired-lan] [next PATCH S2-V2 05/12] i40e: Fix for 10G ports LED not blinkingFrom: Piotr Marczak <[email protected]>
On some hardware LEDs would not blink after command 'ethtool -p {eth- port}'
in certain circumstances. Now, function does not care about the activity of the LED (though still preserves its state) but forcibly executes identification blinking and then restores the LED state.
Quoted 4 lines
Signed-off-by Piotr Marczak <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_common.c | 33 ------------------- 1 file changed, 33 deletions(-)
PATCH 6/12 i40e: Update i40e_init_dcb to return correct error
In reply to Alice MichaelFrom: Chinh T Cao <[email protected]>
Modify the i40e_init_dcb to return the correct error when LLDP or DCBX is not in operational state.
--- drivers/net/ethernet/intel/i40e/i40e_dcb.c | 28 ++++++++------------- drivers/net/ethernet/intel/i40e/i40e_dcb.h | 2 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +- 3 files changed, 13 insertions(+), 19 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_dcb.c +11 -17
@@ -863,22 +863,23 @@ i40e_status i40e_get_dcb_config(struct i40e_hw *hw)/** * i40e_init_dcb * @hw: pointer to the hw struct +* @enable_mib_change: enable mib change event * * Update DCB configuration from the Firmware **/ -i40e_status i40e_init_dcb (struct i40e_hw *hw) +i40e_status i40e_init_dcb (struct i40e_hw *hw,bool enable_mib_change) {i40e_status ret =0 ;struct i40e_lldp_variables lldp_cfg;u8 adminstatus =0 ;if (!hw->func_caps.dcb) -return ret; +return I40E_NOT_SUPPORTED ;/* Read LLDP NVM area */ ret =i40e_read_lldp_cfg (hw, &lldp_cfg);if (ret) -return ret; +return I40E_ERR_NOT_READY ;/* Get the LLDP AdminStatus for the current port */ adminstatus = lldp_cfg.adminstatus >> (hw->port *4 );
@@ -887,7 +888,7 @@ i40e_status i40e_init_dcb(struct i40e_hw *hw)/* LLDP agent disabled */ if (!adminstatus) { hw->dcbx_status =I40E_DCBX_STATUS_DISABLED ; -return ret; +return I40E_ERR_NOT_READY ; }/* Get DCBX status */
@@ -896,26 +897,19 @@ i40e_status i40e_init_dcb(struct i40e_hw *hw)return ret;/* Check the DCBX Status */ -switch (hw->dcbx_status) { -case I40E_DCBX_STATUS_DONE : -case I40E_DCBX_STATUS_IN_PROGRESS : +if (hw->dcbx_status ==I40E_DCBX_STATUS_DONE || + hw->dcbx_status ==I40E_DCBX_STATUS_IN_PROGRESS ) {/* Get current DCBX configuration */ ret =i40e_get_dcb_config (hw);if (ret)return ret; -break ; -case I40E_DCBX_STATUS_DISABLED : -return ret; -case I40E_DCBX_STATUS_NOT_STARTED : -case I40E_DCBX_STATUS_MULTIPLE_PEERS : -default : -break ; + }else if (hw->dcbx_status ==I40E_DCBX_STATUS_DISABLED ) { +return I40E_ERR_NOT_READY ; }/* Configure the LLDP MIB change event */ - ret =i40e_aq_cfg_lldp_mib_change_event (hw, true,NULL ); -if (ret) -return ret; +if (enable_mib_change) + ret =i40e_aq_cfg_lldp_mib_change_event (hw, true,NULL );return ret; }
drivers/net/ethernet/intel/i40e/i40e_dcb.h +1 -1
@@ -124,5 +124,5 @@ i40e_status i40e_aq_get_dcb_config(struct i40e_hw *hw, u8 mib_type,u8 bridgetype, struct i40e_dcbx_config *dcbcfg);i40e_status i40e_get_dcb_config (struct i40e_hw *hw); -i40e_status i40e_init_dcb (struct i40e_hw *hw); +i40e_status i40e_init_dcb (struct i40e_hw *hw,bool enable_mib_change);#endif /* _I40E_DCB_H_ */
drivers/net/ethernet/intel/i40e/i40e_main.c +1 -1
@@ -6393,7 +6393,7 @@ static int i40e_init_pf_dcb(struct i40e_pf *pf) goto out;/* Get the initial DCB configuration */ - err =i40e_init_dcb (hw); + err =i40e_init_dcb (hw, true);if (!err) {/* Device/Function is not DCBX capable */ if ((!hw->func_caps.dcb) ||
Signature · 1 line
2.19.2
Bowers
PATCH 6/12 i40e: Update i40e_init_dcb to return correct error
Quoted 15 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Wednesday, February 6, 2019 3:08 PM
To: Michael, Alice <[email protected]>; intel-wired- lan at lists.osuosl.org
Cc: Cao, Chinh T <[email protected]>
Subject: [Intel-wired-lan] [next PATCH S2-V2 06/12] i40e: Updatei40e_init_dcbto return correct errorFrom: Chinh T Cao <[email protected]>
Modify the
i40e_init_dcbto return the correct error when LLDP or DCBX is not in operational state.
Quoted 6 lines
Signed-off-by Chinh T Cao <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_dcb.c | 28 ++++++++------------- drivers/net/ethernet/intel/i40e/i40e_dcb.h | 2 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +- 3 files changed, 13 insertions(+), 19 deletions(-)
PATCH 7/12 i40e: Remove misleading messages for untrusted VF
In reply to Alice MichaelFrom: Grzegorz Siwik <[email protected]>
Removed misleading messages when untrusted VF tries to add more addresses than NIC limit
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_main.c +16 -5
@@ -2107,11 +2107,22 @@ void i40e_aqc_add_filters(struct i40e_vsi *vsi, const char *vsi_name, fcnt =i40e_update_filter_state (num_add, list, add_head);if (fcnt != num_add) { -set_bit (__I40E_VSI_OVERFLOW_PROMISC, vsi->state); -dev_warn (&vsi->back->pdev->dev, -"Error %s adding RX filters on %s, promiscuous mode forced on\n" , -i40e_aq_str (hw, aq_err), - vsi_name); +if (vsi->type ==I40E_VSI_MAIN ) { +set_bit (__I40E_VSI_OVERFLOW_PROMISC, vsi->state); +dev_warn (&vsi->back->pdev->dev, +"Error %s adding RX filters on %s, promiscuous mode forced on\n" , +i40e_aq_str (hw, aq_err), vsi_name); + }else if (vsi->type ==I40E_VSI_SRIOV || + vsi->type ==I40E_VSI_VMDQ1 || + vsi->type ==I40E_VSI_VMDQ2 ) { +dev_warn (&vsi->back->pdev->dev, +"Error %s adding RX filters on %s, please set promiscuous on manually for %s\n" , +i40e_aq_str (hw, aq_err), vsi_name, vsi_name); + }else { +dev_warn (&vsi->back->pdev->dev, +"Error %s adding RX filters on %s, incorrect VSI type: %i.\n" , +i40e_aq_str (hw, aq_err), vsi_name, vsi->type); + } } }
Signature · 1 line
2.19.2
Bowers
PATCH 7/12 i40e: Remove misleading messages for untrusted VF
Quoted 12 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Wednesday, February 6, 2019 3:08 PM
To: Michael, Alice <[email protected]>; intel-wired-
lan at lists.osuosl.org
Cc: Siwik, Grzegorz <[email protected]>
Subject: [Intel-wired-lan] [next PATCH S2-V2 07/12] i40e: Remove misleading messages for untrusted VFFrom: Grzegorz Siwik <[email protected]>
Quoted 7 lines
Removed misleading messages when untrusted VF tries to add more addresses than NIC limit
Signed-off-by Grzegorz Siwik <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_main.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-)
PATCH 8/12 i40e: Changed maximum supported FW API version to 1.8
In reply to Alice MichaelFrom: Adam Ludkiewicz <[email protected]>
A new FW has been released, which uses API version 1.8.
--- drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 4 ++-- drivers/net/ethernet/intel/iavf/i40e_adminq_cmd.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h +2 -2
@@ -11,8 +11,8 @@*/ #define I40E_FW_API_VERSION_MAJOR 0x0001 -#define I40E_FW_API_VERSION_MINOR_X722 0x0006 -#define I40E_FW_API_VERSION_MINOR_X710 0x0007 +#define I40E_FW_API_VERSION_MINOR_X722 0x0008 +#define I40E_FW_API_VERSION_MINOR_X710 0x0008#define I40E_FW_MINOR_VERSION (_h) ((_h)->mac.type == I40E_MAC_XL710 ? \ I40E_FW_API_VERSION_MINOR_X710 : \
drivers/net/ethernet/intel/iavf/i40e_adminq_cmd.h +1 -1
@@ -14,7 +14,7 @@#define I40E_FW_API_VERSION_MAJOR 0x0001#define I40E_FW_API_VERSION_MINOR_X722 0x0005 -#define I40E_FW_API_VERSION_MINOR_X710 0x0007 +#define I40E_FW_API_VERSION_MINOR_X710 0x0008#define I40E_FW_MINOR_VERSION (_h) ((_h)->mac.type == I40E_MAC_XL710 ? \ I40E_FW_API_VERSION_MINOR_X710 : \
Signature · 1 line
2.19.2
Bowers
PATCH 8/12 i40e: Changed maximum supported FW API version to 1.8
Quoted 12 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Wednesday, February 6, 2019 3:08 PM
To: Michael, Alice <[email protected]>; intel-wired- lan at lists.osuosl.org
Cc: Ludkiewicz, Adam <[email protected]>
Subject: [Intel-wired-lan] [next PATCH S2-V2 08/12] i40e: Changed maximum supported FW API version to 1.8From: Adam Ludkiewicz <[email protected]>
Quoted 7 lines
A new FW has been released, which uses API version 1.8.
Signed-off-by Adam Ludkiewicz <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 4 ++-- drivers/net/ethernet/intel/iavf/i40e_adminq_cmd.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
PATCH 9/12 i40e: The driver now prints the API version in error message
In reply to Alice MichaelFrom: Adam Ludkiewicz <[email protected]>
Added the API version in the error message for clarity.
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_main.c +15 -3
@@ -14512,7 +14512,11 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)if (err) {if (err ==I40E_ERR_FIRMWARE_API_VERSION )dev_info (&pdev->dev, -"The driver for the device stopped because the NVM image is newer than expected. You must install the most recent version of the network driver.\n" ); +"The driver for the device stopped because the NVM image v%u.%u is newer than expected v%u.%u. You must install the most recent version of the network driver.\n" , + hw->aq.api_maj_ver, + hw->aq.api_min_ver, +I40E_FW_API_VERSION_MAJOR , +I40E_FW_MINOR_VERSION (hw));else dev_info (&pdev->dev,"The driver for the device stopped because the device firmware failed to init. Try updating your NVM image.\n" );
@@ -14530,10 +14534,18 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)if (hw->aq.api_maj_ver ==I40E_FW_API_VERSION_MAJOR && hw->aq.api_min_ver >I40E_FW_MINOR_VERSION (hw))dev_info (&pdev->dev, -"The driver for the device detected a newer version of the NVM image than expected. Please install the most recent version of the network driver.\n" ); +"The driver for the device detected a newer version of the NVM image v%u.%u than expected v%u.%u. Please install the most recent version of the network driver.\n" , + hw->aq.api_maj_ver, + hw->aq.api_min_ver, +I40E_FW_API_VERSION_MAJOR , +I40E_FW_MINOR_VERSION (hw));else if (hw->aq.api_maj_ver ==1 && hw->aq.api_min_ver <4 )dev_info (&pdev->dev, -"The driver for the device detected an older version of the NVM image than expected. Please update the NVM image.\n" ); +"The driver for the device detected an older version of the NVM image v%u.%u than expected v%u.%u. Please update the NVM image.\n" , + hw->aq.api_maj_ver, + hw->aq.api_min_ver, +I40E_FW_API_VERSION_MAJOR , +I40E_FW_MINOR_VERSION (hw));i40e_verify_eeprom (pf);
Signature · 1 line
2.19.2
Ludkiewicz
PATCH 9/12 i40e: The driver now prints the API version in error message
ACK
-----Original Message-----
From: Michael, Alice
Sent: Thursday, February 7, 2019 12:08 AM
To: Michael, Alice <[email protected]>; intel-wired-lan at lists.osuosl.org
Cc: Ludkiewicz, Adam <[email protected]>
Subject: [next PATCH S2-V2 09/12] i40e: The driver now prints the API version in error message
From: Adam Ludkiewicz <[email protected]>
Added the API version in the error message for clarity.
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_main.c +5 -1
@@ -14512,7 +14512,11 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)if (err) {if (err ==I40E_ERR_FIRMWARE_API_VERSION )dev_info (&pdev->dev, -"The driver for the device stopped because the NVM image is newer than expected. You must install the most recent version of the network driver.\n" ); +"The driver for the device stopped because the NVM image v%u.%u is newer than expected v%u.%u. You must install the most recent version of the network driver.\n" , + hw->aq.api_maj_ver, + hw->aq.api_min_ver, +I40E_FW_API_VERSION_MAJOR , +I40E_FW_MINOR_VERSION (hw));else dev_info (&pdev->dev, "The driver for the device stopped because the device firmware failed to init. Try updating your NVM image.\n"); @@ -14530,10 +14534,18 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
if (hw->aq.api_maj_ver == I40E_FW_API_VERSION_MAJOR &&
hw->aq.api_min_ver > I40E_FW_MINOR_VERSION(hw))
dev_info(&pdev->dev,
- "The driver for the device detected a newer version of the NVM image than expected. Please install the most recent version of the network driver.\n");
+ "The driver for the device detected a newer version of the NVM image v%u.%u than expected v%u.%u. Please install the most recent version of the network driver.\n",
+ hw->aq.api_maj_ver,
+ hw->aq.api_min_ver,
+ I40E_FW_API_VERSION_MAJOR,
+ I40E_FW_MINOR_VERSION(hw));
else if (hw->aq.api_maj_ver == 1 && hw->aq.api_min_ver < 4)
dev_info(&pdev->dev,
- "The driver for the device detected an older version of the NVM image than expected. Please update the NVM image.\n");
+ "The driver for the device detected an older version of the NVM image v%u.%u than expected v%u.%u. Please update the NVM image.\n",
+ hw->aq.api_maj_ver,
+ hw->aq.api_min_ver,
+ I40E_FW_API_VERSION_MAJOR,
+ I40E_FW_MINOR_VERSION(hw));
i40e_verify_eeprom(pf);
--
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 9/12 i40e: The driver now prints the API version in error message
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: Wednesday, February 6, 2019 3:08 PM
To: Michael, Alice <[email protected]>; intel-wired- lan at lists.osuosl.org
Cc: Ludkiewicz, Adam <[email protected]>
Subject: [Intel-wired-lan] [next PATCH S2-V2 09/12] i40e: The driver now prints the API version in error message
Quoted 8 lines
From: Adam Ludkiewicz <[email protected]>
Added the API version in the error message for clarity.
Signed-off-by Adam Ludkiewicz <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_main.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
PATCH 10/12 i40e: Report advertised link modes on 40GBASE_SR4
In reply to Alice MichaelFrom: Adam Ludkiewicz <[email protected]>
Defined the advertised link mode field for 40000baseSR4_Full for use with ethtool.
--- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/i40e/i40e_ethtool.c +6 -1
@@ -535,9 +535,12 @@ static void i40e_phy_type_to_ethtool(struct i40e_pf *pf,ethtool_link_ksettings_add_link_mode (ks, advertising, 1000baseT_Full); } -if (phy_types &I40E_CAP_PHY_TYPE_40GBASE_SR4 ) +if (phy_types &I40E_CAP_PHY_TYPE_40GBASE_SR4 ) {ethtool_link_ksettings_add_link_mode (ks, supported, 40000baseSR4_Full); +ethtool_link_ksettings_add_link_mode (ks, advertising, + 40000baseSR4_Full); + }if (phy_types &I40E_CAP_PHY_TYPE_40GBASE_LR4 )ethtool_link_ksettings_add_link_mode (ks, supported, 40000baseLR4_Full);
@@ -724,6 +727,8 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw,case I40E_PHY_TYPE_40GBASE_SR4 :ethtool_link_ksettings_add_link_mode (ks, supported, 40000baseSR4_Full); +ethtool_link_ksettings_add_link_mode (ks, advertising, + 40000baseSR4_Full);break ;case I40E_PHY_TYPE_40GBASE_LR4 : ethtool_link_ksettings_add_link_mode(ks, supported,
Signature · 1 line
2.19.2
Ludkiewicz
PATCH 10/12 i40e: Report advertised link modes on 40GBASE_SR4
ACK
-----Original Message-----
From: Michael, Alice
Sent: Thursday, February 7, 2019 12:08 AM
To: Michael, Alice <[email protected]>; intel-wired-lan at lists.osuosl.org
Cc: Ludkiewicz, Adam <[email protected]>
Subject: [next PATCH S2-V2 10/12] i40e: Report advertised link modes on 40GBASE_SR4
From: Adam Ludkiewicz <[email protected]>
Defined the advertised link mode field for 40000baseSR4_Full for use with ethtool.
--- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/i40e/i40e_ethtool.c +6 -1
@@ -535,9 +535,12 @@ static void i40e_phy_type_to_ethtool(struct i40e_pf *pf,ethtool_link_ksettings_add_link_mode (ks, advertising, 1000baseT_Full); } -if (phy_types &I40E_CAP_PHY_TYPE_40GBASE_SR4 ) +if (phy_types &I40E_CAP_PHY_TYPE_40GBASE_SR4 ) {ethtool_link_ksettings_add_link_mode (ks, supported, 40000baseSR4_Full); +ethtool_link_ksettings_add_link_mode (ks, advertising, + 40000baseSR4_Full); + }if (phy_types &I40E_CAP_PHY_TYPE_40GBASE_LR4 )ethtool_link_ksettings_add_link_mode (ks, supported, 40000baseLR4_Full);
@@ -724,6 +727,8 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw,case I40E_PHY_TYPE_40GBASE_SR4 :ethtool_link_ksettings_add_link_mode (ks, supported, 40000baseSR4_Full); +ethtool_link_ksettings_add_link_mode (ks, advertising, + 40000baseSR4_Full);break ;case I40E_PHY_TYPE_40GBASE_LR4 : ethtool_link_ksettings_add_link_mode(ks, supported,
--
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 10/12 i40e: Report advertised link modes on 40GBASE_SR4
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: Wednesday, February 6, 2019 3:08 PM
To: Michael, Alice <[email protected]>; intel-wired-
lan at lists.osuosl.org
Cc: Ludkiewicz, Adam <[email protected]>
Subject: [Intel-wired-lan] [next PATCH S2-V2 10/12] i40e: Report advertised link modes on 40GBASE_SR4From: Adam Ludkiewicz <[email protected]>
Quoted 7 lines
Defined the advertised link mode field for 40000baseSR4_Full for use with ethtool.
Signed-off-by Adam Ludkiewicz <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
PATCH 11/12 i40e: Able to add up to 16 MAC filters on an untrusted VF
In reply to Alice MichaelFrom: Adam Ludkiewicz <[email protected]>
This patch fixes the problem with the driver being able to add only 7 multicast MAC address filters instead of 16. The problem is fixed by changing the maximum number of MAC address filters to 16+1+1 (two extra are needed because the driver uses 1 for unicast MAC address and 1 for broadcast).
--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +5 -2
@@ -2454,8 +2454,11 @@ static int i40e_vc_get_stats_msg(struct i40e_vf *vf, u8 *msg) (u8 *)&stats, sizeof(stats)); } -/* If the VF is not trusted restrict the number of MAC/VLAN it can program */ -#define I40E_VC_MAX_MAC_ADDR_PER_VF 12 +/** +* If the VF is not trusted restrict the number of MAC/VLAN it can program +* MAC filters: 16 for multicast, 1 for MAC, 1 for broadcast +**/ +#define I40E_VC_MAX_MAC_ADDR_PER_VF (16 + 1 + 1)#define I40E_VC_MAX_VLAN_PER_VF 8/**
Signature · 1 line
2.19.2
Bowers
PATCH 11/12 i40e: Able to add up to 16 MAC filters on an untrusted VF
Quoted 17 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Wednesday, February 6, 2019 3:08 PM
To: Michael, Alice <[email protected]>; intel-wired-
lan at lists.osuosl.org
Cc: Ludkiewicz, Adam <[email protected]>
Subject: [Intel-wired-lan] [next PATCH S2-V2 11/12] i40e: Able to add up to 16 MAC filters on an untrusted VFFrom: Adam Ludkiewicz <[email protected]>
This patch fixes the problem with the driver being able to add only 7 multicast MAC address filters instead of 16. The problem is fixed by changing the maximum number of MAC address filters to 16+1+1 (two extra are needed because the driver uses 1 for unicast MAC address and 1 for broadcast).
Quoted 4 lines
Signed-off-by Adam Ludkiewicz <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
PATCH 12/12 i40e: Fix misleading error message
In reply to Alice MichaelFrom: Carolyn Wyborny <[email protected]>
This patch changes an error code for an admin queue head overrun to use I40E_ERR_ADMIN_QUEUE_FULL instead of I40E_ERR_QUEUE_EMPTY.
--- drivers/net/ethernet/intel/i40e/i40e_adminq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/intel/i40e/i40e_adminq.c +1 -1
@@ -749,7 +749,7 @@ i40e_status i40e_asq_send_command(struct i40e_hw *hw,if (val >= hw->aq.num_asq_entries) {i40e_debug (hw,I40E_DEBUG_AQ_MESSAGE ,"AQTX: head overrun at %d\n" , val); - status =I40E_ERR_QUEUE_EMPTY ; + status =I40E_ERR_ADMIN_QUEUE_FULL ; goto asq_send_command_error; }
Signature · 1 line
2.19.2
Bowers
PATCH 12/12 i40e: Fix misleading error message
Quoted 11 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Wednesday, February 6, 2019 3:08 PM
To: Michael, Alice <[email protected]>; intel-wired-
lan at lists.osuosl.org
Subject: [Intel-wired-lan] [next PATCH S2-V2 12/12] i40e: Fix misleading error messageFrom: Carolyn Wyborny <[email protected]>
Quoted 7 lines
This patch changes an error code for an admin queue head overrun to use
I40E_ERR_ADMIN_QUEUE_FULLinstead ofI40E_ERR_QUEUE_EMPTY.Signed-off-by Carolyn Wyborny <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_adminq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Bowers
PATCH 1/12 i40e: Queues are reserved despite "Invalid argument" error.
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: Wednesday, February 6, 2019 3:08 PM
To: Michael, Alice <[email protected]>; intel-wired- lan at lists.osuosl.org
Cc: Ludkiewicz, Adam <[email protected]>
Subject: [Intel-wired-lan] [next PATCH S2-V2 01/12] i40e: Queues are reserved despite "Invalid argument" error.From: Adam Ludkiewicz <[email protected]>
Added a new local variable in the
i40e_setup_tcfunction namedold_queue_pairssonum_queue_pairscan be restored to the correct value in case configuring queue channels fails. Additionally, moved the exit label in thei40e_setup_tcfunction so the if (need_reset) block can be executed. Also, fixed data packing in thei40e_setup_tcfunction.
Quoted 4 lines
Signed-off-by Adam Ludkiewicz <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_main.c | 3 +++ 1 file changed, 3 insertions(+)