From: Moshe Shemesh <moshe@mellanox.com>
To: "David S. Miller" <davem@davemloft.net>,
Jiri Pirko <jiri@mellanox.com>,
Vasundhara Volam <vasundhara-v.volam@broadcom.com>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
Moshe Shemesh <moshe@mellanox.com>
Subject: [PATCH net-next RFC 08/13] net/mlx5: Add support for devlink reload level fw reset
Date: Mon, 27 Jul 2020 14:02:28 +0300 [thread overview]
Message-ID: <1595847753-2234-9-git-send-email-moshe@mellanox.com> (raw)
In-Reply-To: <1595847753-2234-1-git-send-email-moshe@mellanox.com>
Add support for devlink reload level fw_reset which does firmware reset
and driver entities re-instantiation. Once this reload command is
executed the driver initiates fw sync reset flow, where the firmware
synchronizes all PFs on coming reset and driver's entities
re-instantiation.
Signed-off-by: Moshe Shemesh <moshe@mellanox.com>
---
.../net/ethernet/mellanox/mlx5/core/devlink.c | 53 +++++++++++++++++--
.../ethernet/mellanox/mlx5/core/fw_reset.c | 14 +++++
.../ethernet/mellanox/mlx5/core/fw_reset.h | 1 +
3 files changed, 64 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/devlink.c b/drivers/net/ethernet/mellanox/mlx5/core/devlink.c
index 5424e31a0f45..905d55cab4c3 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/devlink.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/devlink.c
@@ -4,6 +4,7 @@
#include <devlink.h>
#include "mlx5_core.h"
+#include "fw_reset.h"
#include "fs_core.h"
#include "eswitch.h"
@@ -88,13 +89,48 @@ mlx5_devlink_info_get(struct devlink *devlink, struct devlink_info_req *req,
return 0;
}
+static int mlx5_devlink_trigger_fw_reset(struct devlink *devlink, struct netlink_ext_ack *extack)
+{
+ struct mlx5_core_dev *dev = devlink_priv(devlink);
+ u8 reset_level, reset_type, net_port_alive;
+ int err;
+
+ err = mlx5_reg_mfrl_query(dev, &reset_level, &reset_type);
+ if (err)
+ return err;
+ if (!(reset_level & MLX5_MFRL_REG_RESET_LEVEL3)) {
+ NL_SET_ERR_MSG_MOD(extack, "FW reset requires reboot");
+ return -EINVAL;
+ }
+
+ net_port_alive = !!(reset_type & MLX5_MFRL_REG_RESET_TYPE_NET_PORT_ALIVE);
+ err = mlx5_fw_set_reset_sync(dev, net_port_alive);
+ if (err)
+ goto out;
+
+ err = mlx5_fw_wait_fw_reset_done(dev);
+out:
+ if (err)
+ NL_SET_ERR_MSG_MOD(extack, "FW reset command failed");
+ return err;
+}
+
static int mlx5_devlink_reload_down(struct devlink *devlink, bool netns_change,
enum devlink_reload_level level, struct netlink_ext_ack *extack)
{
struct mlx5_core_dev *dev = devlink_priv(devlink);
- mlx5_unload_one(dev, false);
- return 0;
+ switch (level) {
+ case DEVLINK_RELOAD_LEVEL_DRIVER:
+ mlx5_unload_one(dev, false);
+ return 0;
+ case DEVLINK_RELOAD_LEVEL_FW_RESET:
+ return mlx5_devlink_trigger_fw_reset(devlink, extack);
+ default:
+ /* Unsupported level should not get to this function */
+ WARN_ON(1);
+ return -EOPNOTSUPP;
+ }
}
static int mlx5_devlink_reload_up(struct devlink *devlink, enum devlink_reload_level level,
@@ -102,7 +138,15 @@ static int mlx5_devlink_reload_up(struct devlink *devlink, enum devlink_reload_l
{
struct mlx5_core_dev *dev = devlink_priv(devlink);
- return mlx5_load_one(dev, false);
+ switch (level) {
+ case DEVLINK_RELOAD_LEVEL_DRIVER:
+ case DEVLINK_RELOAD_LEVEL_FW_RESET:
+ return mlx5_load_one(dev, false);
+ default:
+ /* Unsupported level should not get to this function */
+ WARN_ON(1);
+ return -EOPNOTSUPP;
+ }
}
static const struct devlink_ops mlx5_devlink_ops = {
@@ -118,7 +162,8 @@ static const struct devlink_ops mlx5_devlink_ops = {
#endif
.flash_update = mlx5_devlink_flash_update,
.info_get = mlx5_devlink_info_get,
- .supported_reload_levels = BIT(DEVLINK_RELOAD_LEVEL_DRIVER),
+ .supported_reload_levels = BIT(DEVLINK_RELOAD_LEVEL_DRIVER) |
+ BIT(DEVLINK_RELOAD_LEVEL_FW_RESET),
.default_reload_level = DEVLINK_RELOAD_LEVEL_DRIVER,
.reload_down = mlx5_devlink_reload_down,
.reload_up = mlx5_devlink_reload_up,
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c b/drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c
index e665080e9a4e..f95df226b915 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c
@@ -239,6 +239,20 @@ static int fw_reset_event_notifier(struct notifier_block *nb, unsigned long acti
return NOTIFY_OK;
}
+#define MLX5_FW_RESET_TIMEOUT_MSEC 5000
+int mlx5_fw_wait_fw_reset_done(struct mlx5_core_dev *dev)
+{
+ unsigned long timeout = msecs_to_jiffies(MLX5_FW_RESET_TIMEOUT_MSEC);
+ struct mlx5_fw_reset *fw_reset = dev->priv.fw_reset;
+
+ if (!wait_for_completion_timeout(&fw_reset->done, timeout)) {
+ mlx5_core_warn(dev, "FW sync reset timeout after %d seconds\n",
+ MLX5_FW_RESET_TIMEOUT_MSEC / 1000);
+ return -ETIMEDOUT;
+ }
+ return fw_reset->ret;
+}
+
int mlx5_fw_reset_events_init(struct mlx5_core_dev *dev)
{
struct mlx5_fw_reset *fw_reset = kzalloc(sizeof(*fw_reset), GFP_KERNEL);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fw_reset.h b/drivers/net/ethernet/mellanox/mlx5/core/fw_reset.h
index 278f538ea92a..d7ee951a2258 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/fw_reset.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fw_reset.h
@@ -10,6 +10,7 @@ int mlx5_reg_mfrl_query(struct mlx5_core_dev *dev, u8 *reset_level, u8 *reset_ty
int mlx5_fw_set_reset_sync(struct mlx5_core_dev *dev, u8 reset_type_sel);
int mlx5_fw_set_live_patch(struct mlx5_core_dev *dev);
+int mlx5_fw_wait_fw_reset_done(struct mlx5_core_dev *dev);
int mlx5_fw_reset_events_init(struct mlx5_core_dev *dev);
void mlx5_fw_reset_events_cleanup(struct mlx5_core_dev *dev);
--
2.17.1
next prev parent reply other threads:[~2020-07-27 11:06 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-27 11:02 [PATCH net-next RFC 00/13] Add devlink reload level option Moshe Shemesh
2020-07-27 11:02 ` [PATCH net-next RFC 01/13] devlink: Add reload level option to devlink reload command Moshe Shemesh
2020-07-28 0:58 ` Jakub Kicinski
2020-07-28 13:58 ` Jiri Pirko
2020-07-28 16:47 ` Jacob Keller
2020-07-28 18:44 ` Jakub Kicinski
2020-07-28 19:18 ` Jacob Keller
2020-07-28 20:06 ` Jakub Kicinski
2020-07-29 14:54 ` Moshe Shemesh
2020-07-29 21:07 ` Jakub Kicinski
2020-07-30 12:30 ` Moshe Shemesh
2020-07-30 23:11 ` Jakub Kicinski
2020-08-01 21:32 ` Moshe Shemesh
2020-08-03 14:14 ` Jiri Pirko
2020-08-03 20:57 ` Jakub Kicinski
2020-08-04 10:04 ` Jiri Pirko
2020-08-04 20:39 ` Jakub Kicinski
2020-08-05 11:02 ` Jiri Pirko
2020-08-06 18:25 ` Jakub Kicinski
2020-08-06 22:56 ` Jacob Keller
2020-08-09 13:21 ` Moshe Shemesh
2020-08-10 16:53 ` Jakub Kicinski
2020-08-10 17:09 ` Jacob Keller
2020-08-10 18:17 ` Jakub Kicinski
2020-08-11 5:46 ` Jiri Pirko
2020-07-27 11:02 ` [PATCH net-next RFC 02/13] devlink: Add reload levels data to dev get Moshe Shemesh
2020-07-28 0:58 ` Jakub Kicinski
2020-07-29 14:37 ` Moshe Shemesh
2020-07-29 21:11 ` Jakub Kicinski
2020-07-30 12:05 ` Moshe Shemesh
2020-07-27 11:02 ` [PATCH net-next RFC 03/13] net/mlx5: Add functions to set/query MFRL register Moshe Shemesh
2020-07-27 11:02 ` [PATCH net-next RFC 04/13] net/mlx5: Set cap for pci sync for fw update event Moshe Shemesh
2020-07-27 11:02 ` [PATCH net-next RFC 05/13] net/mlx5: Handle sync reset request event Moshe Shemesh
2020-07-27 11:02 ` [PATCH net-next RFC 06/13] net/mlx5: Handle sync reset now event Moshe Shemesh
2020-07-27 11:02 ` [PATCH net-next RFC 07/13] net/mlx5: Handle sync reset abort event Moshe Shemesh
2020-07-27 11:02 ` Moshe Shemesh [this message]
2020-07-27 11:02 ` [PATCH net-next RFC 09/13] devlink: Add enable_remote_dev_reset generic parameter Moshe Shemesh
2020-07-28 0:59 ` Jakub Kicinski
2020-07-29 14:42 ` Moshe Shemesh
2020-07-29 20:57 ` Jakub Kicinski
2020-07-30 12:08 ` Moshe Shemesh
2020-07-27 11:02 ` [PATCH net-next RFC 10/13] net/mlx5: Add devlink param enable_remote_dev_reset support Moshe Shemesh
2020-07-28 0:59 ` Jakub Kicinski
2020-07-27 11:02 ` [PATCH net-next RFC 11/13] net/mlx5: Add support for fw live patch event Moshe Shemesh
2020-07-27 11:02 ` [PATCH net-next RFC 12/13] net/mlx5: Add support for devlink reload level live patch Moshe Shemesh
2020-07-27 11:02 ` [PATCH net-next RFC 13/13] devlink: Add Documentation/networking/devlink/devlink-reload.rst Moshe Shemesh
2020-07-28 5:25 ` [PATCH net-next RFC 00/13] Add devlink reload level option Vasundhara Volam
2020-07-28 16:43 ` Jacob Keller
2020-08-03 10:24 ` Vasundhara Volam
2020-08-03 12:17 ` Moshe Shemesh
2020-08-03 12:47 ` Vasundhara Volam
2020-08-03 13:52 ` Moshe Shemesh
2020-08-04 10:13 ` Vasundhara Volam
2020-08-05 6:32 ` Moshe Shemesh
2020-08-05 6:55 ` Vasundhara Volam
2020-08-05 8:20 ` Moshe Shemesh
2020-08-12 9:34 ` Vasundhara Volam
2020-07-28 16:37 ` Jacob Keller
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=1595847753-2234-9-git-send-email-moshe@mellanox.com \
--to=moshe@mellanox.com \
--cc=davem@davemloft.net \
--cc=jiri@mellanox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=vasundhara-v.volam@broadcom.com \
/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).