From: Edward Cree <ecree@solarflare.com>
To: <linux-net-drivers@solarflare.com>, <davem@davemloft.net>
Cc: <netdev@vger.kernel.org>
Subject: [PATCH v2 net-next 07/16] sfc_ef100: don't call efx_reset_down()/up() on EF100
Date: Mon, 13 Jul 2020 12:33:32 +0100 [thread overview]
Message-ID: <abe855ac-6737-235a-f57e-7828aebf6198@solarflare.com> (raw)
In-Reply-To: <dbd87499-161e-09f3-7dec-8b7c13ad02dd@solarflare.com>
We handle everything ourselves in ef100_reset(), rather than relying on
the generic down/up routines.
Signed-off-by: Edward Cree <ecree@solarflare.com>
---
drivers/net/ethernet/sfc/efx_common.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/sfc/efx_common.c b/drivers/net/ethernet/sfc/efx_common.c
index 5667694c6514..26b05ec4e712 100644
--- a/drivers/net/ethernet/sfc/efx_common.c
+++ b/drivers/net/ethernet/sfc/efx_common.c
@@ -814,14 +814,18 @@ int efx_reset_up(struct efx_nic *efx, enum reset_type method, bool ok)
*/
int efx_reset(struct efx_nic *efx, enum reset_type method)
{
+ int rc, rc2 = 0;
bool disabled;
- int rc, rc2;
netif_info(efx, drv, efx->net_dev, "resetting (%s)\n",
RESET_TYPE(method));
efx_device_detach_sync(efx);
- efx_reset_down(efx, method);
+ /* efx_reset_down() grabs locks that prevent recovery on EF100.
+ * EF100 reset is handled in the efx_nic_type callback below.
+ */
+ if (efx_nic_rev(efx) != EFX_REV_EF100)
+ efx_reset_down(efx, method);
rc = efx->type->reset(efx, method);
if (rc) {
@@ -849,7 +853,8 @@ int efx_reset(struct efx_nic *efx, enum reset_type method)
disabled = rc ||
method == RESET_TYPE_DISABLE ||
method == RESET_TYPE_RECOVER_OR_DISABLE;
- rc2 = efx_reset_up(efx, method, !disabled);
+ if (efx_nic_rev(efx) != EFX_REV_EF100)
+ rc2 = efx_reset_up(efx, method, !disabled);
if (rc2) {
disabled = true;
if (!rc)
next prev parent reply other threads:[~2020-07-13 11:33 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-13 11:27 [PATCH v2 net-next 00/16] sfc_ef100: driver for EF100 family NICs, part 1 Edward Cree
2020-07-13 11:29 ` [PATCH v2 net-next 01/16] sfc: remove efx_ethtool_nway_reset() Edward Cree
2020-07-13 11:30 ` [PATCH v2 net-next 02/16] sfc_ef100: add EF100 register definitions Edward Cree
2020-07-13 11:31 ` [PATCH v2 net-next 03/16] sfc_ef100: register accesses on EF100 Edward Cree
2020-07-13 11:32 ` [PATCH v2 net-next 04/16] sfc_ef100: skeleton EF100 PF driver Edward Cree
2020-07-13 23:02 ` Jakub Kicinski
2020-07-14 9:02 ` Edward Cree
2020-07-14 16:33 ` Jakub Kicinski
2020-07-13 23:07 ` Jakub Kicinski
2020-07-13 23:08 ` Jakub Kicinski
2020-07-13 11:32 ` [PATCH v2 net-next 05/16] sfc_ef100: reset-handling stub Edward Cree
2020-07-13 11:32 ` [PATCH v2 net-next 06/16] sfc_ef100: PHY probe stub Edward Cree
2020-07-13 11:33 ` Edward Cree [this message]
2020-07-13 11:33 ` [PATCH v2 net-next 08/16] sfc_ef100: implement MCDI transport Edward Cree
2020-07-13 11:34 ` [PATCH v2 net-next 09/16] sfc_ef100: implement ndo_open/close and EVQ probing Edward Cree
2020-07-13 11:34 ` [PATCH v2 net-next 10/16] sfc_ef100: process events for MCDI completions Edward Cree
2020-07-13 11:35 ` [PATCH v2 net-next 11/16] sfc_ef100: read datapath caps, implement check_caps Edward Cree
2020-07-13 11:35 ` [PATCH v2 net-next 12/16] sfc_ef100: extend ef100_check_caps to cover datapath_caps3 Edward Cree
2020-07-13 11:36 ` [PATCH v2 net-next 13/16] sfc_ef100: actually perform resets Edward Cree
2020-07-13 11:36 ` [PATCH v2 net-next 14/16] sfc_ef100: probe the PHY and configure the MAC Edward Cree
2020-07-13 11:37 ` [PATCH v2 net-next 15/16] sfc_ef100: read device MAC address at probe time Edward Cree
2020-07-13 11:37 ` [PATCH v2 net-next 16/16] sfc_ef100: implement ndo_get_phys_port_{id,name} Edward Cree
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=abe855ac-6737-235a-f57e-7828aebf6198@solarflare.com \
--to=ecree@solarflare.com \
--cc=davem@davemloft.net \
--cc=linux-net-drivers@solarflare.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).