All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH net-next 0/6] mlxsw: Misc updates
@ 2021-03-10 11:02 Ido Schimmel
  2021-03-10 11:02 ` [PATCH net-next 1/6] mlxsw: spectrum: Reword an error message for Q-in-Q veto Ido Schimmel
                   ` (6 more replies)
  0 siblings, 7 replies; 8+ messages in thread
From: Ido Schimmel @ 2021-03-10 11:02 UTC (permalink / raw)
  To: netdev; +Cc: davem, kuba, jiri, danieller, amcohen, petrm, mlxsw, Ido Schimmel

From: Ido Schimmel <idosch@nvidia.com>

This patch set contains miscellaneous updates for mlxsw.

Patches #1-#2 reword an extack message to make it clearer and fix a
comment.

Patch #3 bumps the minimum firmware version enforced by mlxsw. This is
needed for two upcoming features: Resilient hashing and per-flow
sampling.

Patches #4-#6 improve the information reported via devlink-health for
'fw_fatal' events.

Amit Cohen (1):
  mlxsw: reg: Fix comment about slot_index field in PMAOS register

Danielle Ratson (4):
  mlxsw: spectrum: Reword an error message for Q-in-Q veto
  mlxsw: reg: Extend MFDE register with new log_ip field
  mlxsw: core: Expose MFDE.log_ip to devlink health
  mlxsw: Adjust some MFDE fields shift and size to fw implementation

Petr Machata (1):
  mlxsw: spectrum: Bump minimum FW version to xx.2008.2406

 drivers/net/ethernet/mellanox/mlxsw/core.c     |  6 +++++-
 drivers/net/ethernet/mellanox/mlxsw/reg.h      | 13 ++++++++++---
 drivers/net/ethernet/mellanox/mlxsw/spectrum.c |  8 ++++----
 3 files changed, 19 insertions(+), 8 deletions(-)

-- 
2.29.2


^ permalink raw reply	[flat|nested] 8+ messages in thread
* [PATCH net-next 1/6] mlxsw: spectrum: Reword an error message for Q-in-Q veto
  2021-03-10 11:02 [PATCH net-next 0/6] mlxsw: Misc updates Ido Schimmel
@ 2021-03-10 11:02 ` Ido Schimmel
  2021-03-10 11:02 ` [PATCH net-next 2/6] mlxsw: reg: Fix comment about slot_index field in PMAOS register Ido Schimmel
                   ` (5 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: Ido Schimmel @ 2021-03-10 11:02 UTC (permalink / raw)
  To: netdev; +Cc: davem, kuba, jiri, danieller, amcohen, petrm, mlxsw, Ido Schimmel

From: Danielle Ratson <danieller@nvidia.com>

'Uppers' is not clear enough for all users when referring to upper
devices.

Reword the error message so it will be clearer.

Signed-off-by: Danielle Ratson <danieller@nvidia.com>
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
---
 drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
index 1650d9852b5b..5d2b965f934f 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -4283,7 +4283,7 @@ static int mlxsw_sp_netdevice_bridge_event(struct net_device *br_dev,
 		if (br_vlan_enabled(br_dev)) {
 			br_vlan_get_proto(br_dev, &proto);
 			if (proto == ETH_P_8021AD) {
-				NL_SET_ERR_MSG_MOD(extack, "Uppers are not supported on top of an 802.1ad bridge");
+				NL_SET_ERR_MSG_MOD(extack, "Upper devices are not supported on top of an 802.1ad bridge");
 				return -EOPNOTSUPP;
 			}
 		}
-- 
2.29.2


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [PATCH net-next 2/6] mlxsw: reg: Fix comment about slot_index field in PMAOS register
  2021-03-10 11:02 [PATCH net-next 0/6] mlxsw: Misc updates Ido Schimmel
  2021-03-10 11:02 ` [PATCH net-next 1/6] mlxsw: spectrum: Reword an error message for Q-in-Q veto Ido Schimmel
@ 2021-03-10 11:02 ` Ido Schimmel
  2021-03-10 11:02 ` [PATCH net-next 3/6] mlxsw: spectrum: Bump minimum FW version to xx.2008.2406 Ido Schimmel
                   ` (4 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: Ido Schimmel @ 2021-03-10 11:02 UTC (permalink / raw)
  To: netdev; +Cc: davem, kuba, jiri, danieller, amcohen, petrm, mlxsw, Ido Schimmel

From: Amit Cohen <amcohen@nvidia.com>

The comment did not include the register name.
Add `pmaos` to align the comment with other comments.

Signed-off-by: Amit Cohen <amcohen@nvidia.com>
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
---
 drivers/net/ethernet/mellanox/mlxsw/reg.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/mellanox/mlxsw/reg.h b/drivers/net/ethernet/mellanox/mlxsw/reg.h
index c4adc7f740d3..afd42907092f 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/reg.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/reg.h
@@ -5637,7 +5637,7 @@ static inline void mlxsw_reg_pspa_pack(char *payload, u8 swid, u8 local_port)
 
 MLXSW_REG_DEFINE(pmaos, MLXSW_REG_PMAOS_ID, MLXSW_REG_PMAOS_LEN);
 
-/* reg_slot_index
+/* reg_pmaos_slot_index
  * Slot index.
  * Access: Index
  */
-- 
2.29.2


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [PATCH net-next 3/6] mlxsw: spectrum: Bump minimum FW version to xx.2008.2406
  2021-03-10 11:02 [PATCH net-next 0/6] mlxsw: Misc updates Ido Schimmel
  2021-03-10 11:02 ` [PATCH net-next 1/6] mlxsw: spectrum: Reword an error message for Q-in-Q veto Ido Schimmel
  2021-03-10 11:02 ` [PATCH net-next 2/6] mlxsw: reg: Fix comment about slot_index field in PMAOS register Ido Schimmel
@ 2021-03-10 11:02 ` Ido Schimmel
  2021-03-10 11:02 ` [PATCH net-next 4/6] mlxsw: reg: Extend MFDE register with new log_ip field Ido Schimmel
                   ` (3 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: Ido Schimmel @ 2021-03-10 11:02 UTC (permalink / raw)
  To: netdev; +Cc: davem, kuba, jiri, danieller, amcohen, petrm, mlxsw, Ido Schimmel

From: Petr Machata <petrm@nvidia.com>

The indicated version fixes the following two issues:

- MIRROR_SAMPLER_ACTION.mirror_probability_rate inverted. This has
  implication for per-flow sampling.

- When adjacency is replaced-if-inactive (RATR.opcode=3), bad parameter
  was reported when replacing an active entry. This breaks offload of
  resilient next-hop groups.

Signed-off-by: Petr Machata <petrm@nvidia.com>
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
---
 drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
index 5d2b965f934f..dbf95e52b341 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -45,7 +45,7 @@
 
 #define MLXSW_SP1_FWREV_MAJOR 13
 #define MLXSW_SP1_FWREV_MINOR 2008
-#define MLXSW_SP1_FWREV_SUBMINOR 2018
+#define MLXSW_SP1_FWREV_SUBMINOR 2406
 #define MLXSW_SP1_FWREV_CAN_RESET_MINOR 1702
 
 static const struct mlxsw_fw_rev mlxsw_sp1_fw_rev = {
@@ -62,7 +62,7 @@ static const struct mlxsw_fw_rev mlxsw_sp1_fw_rev = {
 
 #define MLXSW_SP2_FWREV_MAJOR 29
 #define MLXSW_SP2_FWREV_MINOR 2008
-#define MLXSW_SP2_FWREV_SUBMINOR 2018
+#define MLXSW_SP2_FWREV_SUBMINOR 2406
 
 static const struct mlxsw_fw_rev mlxsw_sp2_fw_rev = {
 	.major = MLXSW_SP2_FWREV_MAJOR,
@@ -77,7 +77,7 @@ static const struct mlxsw_fw_rev mlxsw_sp2_fw_rev = {
 
 #define MLXSW_SP3_FWREV_MAJOR 30
 #define MLXSW_SP3_FWREV_MINOR 2008
-#define MLXSW_SP3_FWREV_SUBMINOR 2018
+#define MLXSW_SP3_FWREV_SUBMINOR 2406
 
 static const struct mlxsw_fw_rev mlxsw_sp3_fw_rev = {
 	.major = MLXSW_SP3_FWREV_MAJOR,
-- 
2.29.2


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [PATCH net-next 4/6] mlxsw: reg: Extend MFDE register with new log_ip field
  2021-03-10 11:02 [PATCH net-next 0/6] mlxsw: Misc updates Ido Schimmel
                   ` (2 preceding siblings ...)
  2021-03-10 11:02 ` [PATCH net-next 3/6] mlxsw: spectrum: Bump minimum FW version to xx.2008.2406 Ido Schimmel
@ 2021-03-10 11:02 ` Ido Schimmel
  2021-03-10 11:02 ` [PATCH net-next 5/6] mlxsw: core: Expose MFDE.log_ip to devlink health Ido Schimmel
                   ` (2 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: Ido Schimmel @ 2021-03-10 11:02 UTC (permalink / raw)
  To: netdev; +Cc: davem, kuba, jiri, danieller, amcohen, petrm, mlxsw, Ido Schimmel

From: Danielle Ratson <danieller@nvidia.com>

Extend MFDE (Monitoring FW Debug) register with new field specifying the
instruction pointer that triggered the CR space timeout.

Signed-off-by: Danielle Ratson <danieller@nvidia.com>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
---
 drivers/net/ethernet/mellanox/mlxsw/reg.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/net/ethernet/mellanox/mlxsw/reg.h b/drivers/net/ethernet/mellanox/mlxsw/reg.h
index afd42907092f..a042ff79d306 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/reg.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/reg.h
@@ -10979,6 +10979,13 @@ MLXSW_ITEM32(reg, mfde, log_address, 0x10, 0, 32);
  */
 MLXSW_ITEM32(reg, mfde, log_id, 0x14, 0, 4);
 
+/* reg_mfde_log_ip
+ * IP (instruction pointer) that triggered the timeout.
+ * Valid in case event_id == MLXSW_REG_MFDE_EVENT_ID_CRSPACE_TO
+ * Access: RO
+ */
+MLXSW_ITEM64(reg, mfde, log_ip, 0x18, 0, 64);
+
 /* reg_mfde_pipes_mask
  * Bit per kvh pipe.
  * Access: RO
-- 
2.29.2


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [PATCH net-next 5/6] mlxsw: core: Expose MFDE.log_ip to devlink health
  2021-03-10 11:02 [PATCH net-next 0/6] mlxsw: Misc updates Ido Schimmel
                   ` (3 preceding siblings ...)
  2021-03-10 11:02 ` [PATCH net-next 4/6] mlxsw: reg: Extend MFDE register with new log_ip field Ido Schimmel
@ 2021-03-10 11:02 ` Ido Schimmel
  2021-03-10 11:02 ` [PATCH net-next 6/6] mlxsw: Adjust some MFDE fields shift and size to fw implementation Ido Schimmel
  2021-03-10 21:10 ` [PATCH net-next 0/6] mlxsw: Misc updates patchwork-bot+netdevbpf
  6 siblings, 0 replies; 8+ messages in thread
From: Ido Schimmel @ 2021-03-10 11:02 UTC (permalink / raw)
  To: netdev; +Cc: davem, kuba, jiri, danieller, amcohen, petrm, mlxsw, Ido Schimmel

From: Danielle Ratson <danieller@nvidia.com>

Add the MFDE.log_ip field to devlink health reporter in order to ease
firmware debug. This field encodes the instruction pointer that triggered
the CR space timeout.

Signed-off-by: Danielle Ratson <danieller@nvidia.com>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
---
 drivers/net/ethernet/mellanox/mlxsw/core.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.c b/drivers/net/ethernet/mellanox/mlxsw/core.c
index 52fdc34251ba..c53461ac4e10 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/core.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/core.c
@@ -1806,6 +1806,10 @@ static int mlxsw_core_health_fw_fatal_dump(struct devlink_health_reporter *repor
 		err = devlink_fmsg_u8_pair_put(fmsg, "log_irisc_id", val);
 		if (err)
 			return err;
+		val = mlxsw_reg_mfde_log_ip_get(mfde_pl);
+		err = devlink_fmsg_u64_pair_put(fmsg, "log_ip", val);
+		if (err)
+			return err;
 	} else if (event_id == MLXSW_REG_MFDE_EVENT_ID_KVD_IM_STOP) {
 		val = mlxsw_reg_mfde_pipes_mask_get(mfde_pl);
 		err = devlink_fmsg_u32_pair_put(fmsg, "pipes_mask", val);
-- 
2.29.2


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [PATCH net-next 6/6] mlxsw: Adjust some MFDE fields shift and size to fw implementation
  2021-03-10 11:02 [PATCH net-next 0/6] mlxsw: Misc updates Ido Schimmel
                   ` (4 preceding siblings ...)
  2021-03-10 11:02 ` [PATCH net-next 5/6] mlxsw: core: Expose MFDE.log_ip to devlink health Ido Schimmel
@ 2021-03-10 11:02 ` Ido Schimmel
  2021-03-10 21:10 ` [PATCH net-next 0/6] mlxsw: Misc updates patchwork-bot+netdevbpf
  6 siblings, 0 replies; 8+ messages in thread
From: Ido Schimmel @ 2021-03-10 11:02 UTC (permalink / raw)
  To: netdev; +Cc: davem, kuba, jiri, danieller, amcohen, petrm, mlxsw, Ido Schimmel

From: Danielle Ratson <danieller@nvidia.com>

MFDE.irisc_id and MFDE.event_id were adjusted according to what is
actually implemented in firmware.

Adjust the shift and size of these fields in mlxsw as well.

Note that the displacement of the first field is not a regression.
It was always incorrect and therefore reported "0".

Signed-off-by: Danielle Ratson <danieller@nvidia.com>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
---
 drivers/net/ethernet/mellanox/mlxsw/core.c | 2 +-
 drivers/net/ethernet/mellanox/mlxsw/reg.h  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.c b/drivers/net/ethernet/mellanox/mlxsw/core.c
index c53461ac4e10..7e9a7cb31720 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/core.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/core.c
@@ -1728,7 +1728,7 @@ static int mlxsw_core_health_fw_fatal_dump(struct devlink_health_reporter *repor
 		return err;
 
 	event_id = mlxsw_reg_mfde_event_id_get(mfde_pl);
-	err = devlink_fmsg_u8_pair_put(fmsg, "id", event_id);
+	err = devlink_fmsg_u32_pair_put(fmsg, "id", event_id);
 	if (err)
 		return err;
 	switch (event_id) {
diff --git a/drivers/net/ethernet/mellanox/mlxsw/reg.h b/drivers/net/ethernet/mellanox/mlxsw/reg.h
index a042ff79d306..2f7f691f85ff 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/reg.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/reg.h
@@ -10919,7 +10919,7 @@ MLXSW_REG_DEFINE(mfde, MLXSW_REG_MFDE_ID, MLXSW_REG_MFDE_LEN);
  * Which irisc triggered the event
  * Access: RO
  */
-MLXSW_ITEM32(reg, mfde, irisc_id, 0x00, 8, 4);
+MLXSW_ITEM32(reg, mfde, irisc_id, 0x00, 24, 8);
 
 enum mlxsw_reg_mfde_event_id {
 	MLXSW_REG_MFDE_EVENT_ID_CRSPACE_TO = 1,
@@ -10930,7 +10930,7 @@ enum mlxsw_reg_mfde_event_id {
 /* reg_mfde_event_id
  * Access: RO
  */
-MLXSW_ITEM32(reg, mfde, event_id, 0x00, 0, 8);
+MLXSW_ITEM32(reg, mfde, event_id, 0x00, 0, 16);
 
 enum mlxsw_reg_mfde_method {
 	MLXSW_REG_MFDE_METHOD_QUERY,
-- 
2.29.2


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* Re: [PATCH net-next 0/6] mlxsw: Misc updates
  2021-03-10 11:02 [PATCH net-next 0/6] mlxsw: Misc updates Ido Schimmel
                   ` (5 preceding siblings ...)
  2021-03-10 11:02 ` [PATCH net-next 6/6] mlxsw: Adjust some MFDE fields shift and size to fw implementation Ido Schimmel
@ 2021-03-10 21:10 ` patchwork-bot+netdevbpf
  6 siblings, 0 replies; 8+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-03-10 21:10 UTC (permalink / raw)
  To: Ido Schimmel
  Cc: netdev, davem, kuba, jiri, danieller, amcohen, petrm, mlxsw, idosch

Hello:

This series was applied to netdev/net-next.git (refs/heads/master):

On Wed, 10 Mar 2021 13:02:14 +0200 you wrote:
> From: Ido Schimmel <idosch@nvidia.com>
> 
> This patch set contains miscellaneous updates for mlxsw.
> 
> Patches #1-#2 reword an extack message to make it clearer and fix a
> comment.
> 
> [...]

Here is the summary with links:
  - [net-next,1/6] mlxsw: spectrum: Reword an error message for Q-in-Q veto
    https://git.kernel.org/netdev/net-next/c/825e8885779d
  - [net-next,2/6] mlxsw: reg: Fix comment about slot_index field in PMAOS register
    https://git.kernel.org/netdev/net-next/c/675e5a1e1afa
  - [net-next,3/6] mlxsw: spectrum: Bump minimum FW version to xx.2008.2406
    https://git.kernel.org/netdev/net-next/c/2ab781c2ccf4
  - [net-next,4/6] mlxsw: reg: Extend MFDE register with new log_ip field
    https://git.kernel.org/netdev/net-next/c/ff12ba3ad78d
  - [net-next,5/6] mlxsw: core: Expose MFDE.log_ip to devlink health
    https://git.kernel.org/netdev/net-next/c/315afd2068a8
  - [net-next,6/6] mlxsw: Adjust some MFDE fields shift and size to fw implementation
    https://git.kernel.org/netdev/net-next/c/4734a750f467

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html



^ permalink raw reply	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-03-10 21:10 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-10 11:02 [PATCH net-next 0/6] mlxsw: Misc updates Ido Schimmel
2021-03-10 11:02 ` [PATCH net-next 1/6] mlxsw: spectrum: Reword an error message for Q-in-Q veto Ido Schimmel
2021-03-10 11:02 ` [PATCH net-next 2/6] mlxsw: reg: Fix comment about slot_index field in PMAOS register Ido Schimmel
2021-03-10 11:02 ` [PATCH net-next 3/6] mlxsw: spectrum: Bump minimum FW version to xx.2008.2406 Ido Schimmel
2021-03-10 11:02 ` [PATCH net-next 4/6] mlxsw: reg: Extend MFDE register with new log_ip field Ido Schimmel
2021-03-10 11:02 ` [PATCH net-next 5/6] mlxsw: core: Expose MFDE.log_ip to devlink health Ido Schimmel
2021-03-10 11:02 ` [PATCH net-next 6/6] mlxsw: Adjust some MFDE fields shift and size to fw implementation Ido Schimmel
2021-03-10 21:10 ` [PATCH net-next 0/6] mlxsw: Misc updates patchwork-bot+netdevbpf

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.