fm10k-shared: use mac-> instead of hw->mac.
Subsystems (2)
PATCH 1/4 fm10k-shared: use mac-> instead of hw->mac.
From: Ngai-Mint Kwan <[email protected]>
Since a pointer "mac" to fm10k_mac_info structure exists, use it to access the contents of its members.
--- drivers/net/ethernet/intel/fm10k/fm10k_common.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/intel/fm10k/fm10k_common.c +3 -3
@@ -506,7 +506,7 @@ s32 fm10k_get_host_state_generic(struct fm10k_hw *hw, bool *host_ready) goto out;/* if we somehow dropped the Tx enable we should reset */ -if (hw->mac.tx_ready && !(txdctl &FM10K_TXDCTL_ENABLE )) { +if (mac->tx_ready && !(txdctl &FM10K_TXDCTL_ENABLE )) { ret_val =FM10K_ERR_RESET_REQUESTED ; goto out; }
@@ -523,8 +523,8 @@ s32 fm10k_get_host_state_generic(struct fm10k_hw *hw, bool *host_ready)/* interface cannot receive traffic without logical ports */ if (mac->dglort_map ==FM10K_DGLORTMAP_NONE ) { -if (hw->mac.ops.request_lport_map) - ret_val = hw->mac.ops.request_lport_map (hw); +if (mac->ops.request_lport_map) + ret_val = mac->ops.request_lport_map (hw); goto out; }
Signature · 1 line
2.10.1.777.gd068e6b
PATCH 2/4 fm10k: remove extraneous variable definition in fm10k_ethtool.c
We don't need to typecast a u8 * into a char *, so just remove the extra variable.
--- drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-)
drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c +9 -12
@@ -148,7 +148,7 @@ enum {static const char fm10k_prv_flags[FM10K_PRV_FLAG_LEN ][ETH_GSTRING_LEN ] = { }; -static void fm10k_add_stat_strings (char **p,const char *prefix, +static void fm10k_add_stat_strings (u8 **p,const char *prefix,const struct fm10k_stats stats[],const unsigned int size) {
@@ -164,32 +164,31 @@ static void fm10k_add_stat_strings(char **p, const char *prefix,static void fm10k_get_stat_strings (struct net_device *dev,u8 *data) {struct fm10k_intfc *interface =netdev_priv (dev); -char *p = (char *)data;unsigned int i; -fm10k_add_stat_strings (&p,"" , fm10k_gstrings_net_stats, +fm10k_add_stat_strings (&data,"" , fm10k_gstrings_net_stats,FM10K_NETDEV_STATS_LEN ); -fm10k_add_stat_strings (&p,"" , fm10k_gstrings_global_stats, +fm10k_add_stat_strings (&data,"" , fm10k_gstrings_global_stats,FM10K_GLOBAL_STATS_LEN ); -fm10k_add_stat_strings (&p,"" , fm10k_gstrings_mbx_stats, +fm10k_add_stat_strings (&data,"" , fm10k_gstrings_mbx_stats,FM10K_MBX_STATS_LEN );if (interface->hw.mac.type != fm10k_mac_vf) -fm10k_add_stat_strings (&p,"" , fm10k_gstrings_pf_stats, +fm10k_add_stat_strings (&data,"" , fm10k_gstrings_pf_stats,FM10K_PF_STATS_LEN );for (i =0 ; i < interface->hw.mac.max_queues; i++) {char prefix[ETH_GSTRING_LEN ];snprintf (prefix,ETH_GSTRING_LEN ,"tx_queue_%u_" , i); -fm10k_add_stat_strings (&p, prefix, +fm10k_add_stat_strings (&data, prefix, fm10k_gstrings_queue_stats,FM10K_QUEUE_STATS_LEN );snprintf (prefix,ETH_GSTRING_LEN ,"rx_queue_%u_" , i); -fm10k_add_stat_strings (&p, prefix, +fm10k_add_stat_strings (&data, prefix, fm10k_gstrings_queue_stats,FM10K_QUEUE_STATS_LEN ); }
@@ -198,18 +197,16 @@ static void fm10k_get_stat_strings(struct net_device *dev, u8 *data)static void fm10k_get_strings (struct net_device *dev,u32 stringset,u8 *data) { -char *p = (char *)data; -switch (stringset) {case ETH_SS_TEST : -memcpy (data, *fm10k_gstrings_test, +memcpy (data, fm10k_gstrings_test,FM10K_TEST_LEN *ETH_GSTRING_LEN );break ;case ETH_SS_STATS :fm10k_get_stat_strings (dev, data);break ;case ETH_SS_PRIV_FLAGS : -memcpy (p, fm10k_prv_flags, +memcpy (data, fm10k_prv_flags,FM10K_PRV_FLAG_LEN *ETH_GSTRING_LEN );break ; }
Signature · 1 line
2.10.1.777.gd068e6b
Singh
PATCH 2/4 fm10k: remove extraneous variable definition in fm10k_ethtool.c
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Jacob Keller
Sent: Wednesday, November 2, 2016 4:45 PM
To: Intel Wired LAN <[email protected]>
Subject: [Intel-wired-lan] [PATCH 2/4] fm10k: remove extraneous variable definition in fm10k_ethtool.c
We don't need to typecast a u8 * into a char *, so just remove the extra variable.
---
PATCH 3/4 fm10k: request reset when mbx->state changes
In reply to Jacob KellerFrom: Ngai-Mint Kwan <[email protected]>
Multiple IES API resets can cause a race condition where the mailbox interrupt request bits can be cleared before being handled. This can leave certain mailbox messages from the PF to be untreated and the PF will enter in some inactive state. If this situation occurs, the IES API will initiate a mailbox version reset which, then, trigger a mailbox state change. Once this mailbox transition occurs (from OPEN to CONNECT state), a request for reset will be returned.
This ensures that PF will undergo a reset whenever IES API encounters an unknown global mailbox interrupt event or whenever the IES API terminates.
--- drivers/net/ethernet/intel/fm10k/fm10k_mbx.c | 10 +++++++--- drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 6 +++++- 2 files changed, 12 insertions(+), 4 deletions(-)
drivers/net/ethernet/intel/fm10k/fm10k_mbx.c +7 -3
@@ -2011,9 +2011,10 @@ static void fm10k_sm_mbx_create_reply(struct fm10k_hw *hw,* function can also be used to respond to an error as the connection * resetting would also be a means of dealing with errors. **/ -static void fm10k_sm_mbx_process_reset (struct fm10k_hw *hw, -struct fm10k_mbx_info *mbx) +static s32 fm10k_sm_mbx_process_reset (struct fm10k_hw *hw, +struct fm10k_mbx_info *mbx) { +s32 err =0 ;const enum fm10k_mbx_state state = mbx->state;switch (state) {
@@ -2026,6 +2027,7 @@ static void fm10k_sm_mbx_process_reset(struct fm10k_hw *hw,case FM10K_STATE_OPEN :/* flush any incomplete work */ fm10k_sm_mbx_connect_reset (mbx); + err =FM10K_ERR_RESET_REQUESTED ;break ;case FM10K_STATE_CONNECT :/* Update remote value to match local value */
@@ -2035,6 +2037,8 @@ static void fm10k_sm_mbx_process_reset(struct fm10k_hw *hw, }fm10k_sm_mbx_create_reply (hw, mbx, mbx->tail); + +return err; }/**
@@ -2115,7 +2119,7 @@ static s32 fm10k_sm_mbx_process(struct fm10k_hw *hw,switch (FM10K_MSG_HDR_FIELD_GET (mbx->mbx_hdr,SM_VER )) {case 0 : -fm10k_sm_mbx_process_reset (hw, mbx); + err =fm10k_sm_mbx_process_reset (hw, mbx);break ;case FM10K_SM_MBX_VERSION : err =fm10k_sm_mbx_process_version_1 (hw, mbx);
drivers/net/ethernet/intel/fm10k/fm10k_pci.c +5 -1
@@ -1144,6 +1144,7 @@ static irqreturn_t fm10k_msix_mbx_pf(int __always_unused irq, void *data)struct fm10k_hw *hw = &interface->hw;struct fm10k_mbx_info *mbx = &hw->mbx;u32 eicr; +s32 err =0 ;/* unmask any set bits related to this interrupt */ eicr =fm10k_read_reg (hw,FM10K_EICR );
@@ -1159,12 +1160,15 @@ static irqreturn_t fm10k_msix_mbx_pf(int __always_unused irq, void *data)/* service mailboxes */ if (fm10k_mbx_trylock (interface)) { - mbx->ops.process (hw, mbx); + err = mbx->ops.process (hw, mbx);/* handle VFLRE events */ fm10k_iov_event (interface);fm10k_mbx_unlock (interface); } +if (err ==FM10K_ERR_RESET_REQUESTED ) + interface->flags |=FM10K_FLAG_RESET_REQUESTED ; +/* if switch toggled state we should reset GLORTs */ if (eicr &FM10K_EICR_SWITCHNOTREADY ) {/* force link down for at least 4 seconds */
Signature · 1 line
2.10.1.777.gd068e6b
Singh
PATCH 3/4 fm10k: request reset when mbx->state changes
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Jacob Keller
Sent: Wednesday, November 2, 2016 4:45 PM
To: Intel Wired LAN <[email protected]>
Cc: Kwan, Ngai-mint <[email protected]>
Subject: [Intel-wired-lan] [PATCH 3/4] fm10k: request reset when mbx->state changes
From: Ngai-Mint Kwan <[email protected]>
Multiple IES API resets can cause a race condition where the mailbox interrupt request bits can be cleared before being handled. This can leave certain mailbox messages from the PF to be untreated and the PF will enter in some inactive state. If this situation occurs, the IES API will initiate a mailbox version reset which, then, trigger a mailbox state change. Once this mailbox transition occurs (from OPEN to CONNECT state), a request for reset will be returned.
This ensures that PF will undergo a reset whenever IES API encounters an unknown global mailbox interrupt event or whenever the IES API terminates.
---
PATCH 4/4 fm10k: do not clear global mailbox interrupt bits
In reply to Jacob KellerFrom: Ngai-Mint Kwan <[email protected]>
Partially revert commit 5e93cbadd3e9 ("fm10k: Reset mailbox global interrupts", 2016-06-07)
The register bits related to this commit are now solely being handled by the IES API. Recent changes in the IES API will allow an automatic recovery from improper handling of these bits.
--- drivers/net/ethernet/intel/fm10k/fm10k_pf.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/net/ethernet/intel/fm10k/fm10k_pf.c +0 -4
@@ -72,10 +72,6 @@ static s32 fm10k_reset_hw_pf(struct fm10k_hw *hw)fm10k_write_flush (hw);udelay (FM10K_RESET_TIMEOUT ); -/* Reset mailbox global interrupts */ - reg =FM10K_MBX_GLOBAL_REQ_INTERRUPT |FM10K_MBX_GLOBAL_ACK_INTERRUPT ; -fm10k_write_reg (hw,FM10K_GMBX , reg); -/* Verify we made it out of reset */ reg =fm10k_read_reg (hw,FM10K_IP );if (!(reg &FM10K_IP_NOTINRESET ))
Signature · 1 line
2.10.1.777.gd068e6b
Singh
PATCH 4/4 fm10k: do not clear global mailbox interrupt bits
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Jacob Keller
Sent: Wednesday, November 2, 2016 4:45 PM
To: Intel Wired LAN <[email protected]>
Cc: Kwan, Ngai-mint <[email protected]>
Subject: [Intel-wired-lan] [PATCH 4/4] fm10k: do not clear global mailbox interrupt bits
From: Ngai-Mint Kwan <[email protected]>
Partially revert commit 5e93cbadd3e9 ("fm10k: Reset mailbox global interrupts", 2016-06-07)
The register bits related to this commit are now solely being handled by the IES API. Recent changes in the IES API will allow an automatic recovery from improper handling of these bits.
---
Singh
PATCH 1/4 fm10k-shared: use mac-> instead of hw->mac.
In reply to Jacob Keller-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Jacob Keller
Sent: Wednesday, November 2, 2016 4:45 PM
To: Intel Wired LAN <[email protected]>
Cc: Kwan, Ngai-mint <[email protected]>
Subject: [Intel-wired-lan] [PATCH 1/4] fm10k-shared: use mac-> instead of hw->mac.
From: Ngai-Mint Kwan <[email protected]>
Since a pointer "mac" to fm10k_mac_info structure exists, use it to access the contents of its members.
---