[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20191122224126.24847-1-saeedm@mellanox.com>
Date: Fri, 22 Nov 2019 22:41:45 +0000
From: Saeed Mahameed <saeedm@...lanox.com>
To: "David S. Miller" <davem@...emloft.net>
CC: "netdev@...r.kernel.org" <netdev@...r.kernel.org>,
Jiri Pirko <jiri@...lanox.com>,
Saeed Mahameed <saeedm@...lanox.com>
Subject: [PATCH V2 net-next 0/6] mlxfw: Improve error reporting
Hi Dave,
This patchset improves mlxfw error reporting of mlxfw to netlink and
kernel log.
1) patch #1, Convert extack msg to a formattable buffer
2) patch #2, Make mlxfw/mlxsw fw flash devlink status notify generic,
and enable it for mlx5.
3) rest of the patches are improving mlxfw flash error messages by
reporting detailed mlxfw FSM error messages to netlink and more detailed
kernel log.
v2:
- Avoid long switch case and replace it with one call to NL_SET_ERR_MSG_MOD
to format the message directly from the mlxfw_fsm_state_err_str table.
merge conflict with net:
@ drivers/net/ethernet/mellanox/mlxfw/mlxfw_fsm.c
++<<<<<<< (net-next) (keep)
+
+ if (fsm_state_err != MLXFW_FSM_STATE_ERR_OK)
+ return mlxfw_fsm_state_err(mlxfw_dev, extack, fsm_state_err);
+
++=======
+
+ if (fsm_state_err != MLXFW_FSM_STATE_ERR_OK) {
+ fsm_state_err = min_t(enum mlxfw_fsm_state_err,
+ fsm_state_err, MLXFW_FSM_STATE_ERR_MAX);
+ pr_err("Firmware flash failed: %s\n",
+ mlxfw_fsm_state_err_str[fsm_state_err]);
+ NL_SET_ERR_MSG_MOD(extack, "Firmware flash failed");
+ return -EINVAL;
++>>>>>>> (net) (delete)
To resolve just use the 1st hunk, from net-next.
Thanks,
Saeed.
---
Saeed Mahameed (6):
netlink: Convert extack msg to a formattable buffer
net/mlxfw: Generic mlx FW flash status notify
net/mlxfw: Improve FSM err message reporting and return codes
net/mlxfw: Convert pr_* to dev_* in mlxfw_fsm.c
net/mlxfw: More error messages coverage
net/mlxfw: Macro for error reporting
drivers/net/ethernet/mellanox/mlx5/core/fw.c | 1 +
drivers/net/ethernet/mellanox/mlxfw/Kconfig | 1 +
drivers/net/ethernet/mellanox/mlxfw/mlxfw.h | 36 +++--
.../net/ethernet/mellanox/mlxfw/mlxfw_fsm.c | 149 ++++++++++++------
.../net/ethernet/mellanox/mlxsw/spectrum.c | 17 +-
include/linux/netlink.h | 27 ++--
lib/nlattr.c | 2 +-
7 files changed, 145 insertions(+), 88 deletions(-)
--
2.21.0
Powered by blists - more mailing lists