* [PATCH mlx5-next 0/8] Mellanox, mlx5 updates 2018-07-16
@ 2018-07-17 1:35 Saeed Mahameed
2018-07-17 1:35 ` [PATCH mlx5-next 1/8] net/mlx5: FW tracer, add hardware structures Saeed Mahameed
` (8 more replies)
0 siblings, 9 replies; 10+ messages in thread
From: Saeed Mahameed @ 2018-07-17 1:35 UTC (permalink / raw)
To: netdev, linux-rdma
Cc: David S. Miller, Doug Ledford, Jason Gunthorpe, Leon Romanovsky,
Saeed Mahameed
Hi,
This series includes mlx5 core infrastructure updates and fixes
aimed for mlx5-next branch.
In case of no objections, below patches will be applied to mlx5-next branch
and next mlx5 net-next pull request will start with a merge commit
pointing to the last patch in this series.
>From Eran:
- Add MPEGC (Management PCIe General Configuration) registers and btis
- Fix tristate and description for MLX5 module
>From Feras:
- Add hardware structures for the firmware tracer
>From Jainbo:
- Core support for double vlan push/pop steering action
>From Max:
- Add XRQ commands definitions
>From Noa:
- Add missing SET_DRIVER_VERSION command translation
>From Roi:
- Use ERR_CAST() instead of coding it
>From Tariq:
- Better return types for CQE API
Thanks,
Saeed
---
Eran Ben Elisha (2):
net/mlx5: Expose MPEGC (Management PCIe General Configuration)
structures
net/mlx5: Fix tristate and description for MLX5 module
Feras Daoud (1):
net/mlx5: FW tracer, add hardware structures
Jianbo Liu (1):
net/mlx5: Add core support for double vlan push/pop steering action
Max Gurtovoy (1):
net/mlx5: Add XRQ commands definitions
Noa Osherovich (1):
net/mlx5: Add missing SET_DRIVER_VERSION command translation
Roi Dayan (1):
net/mlx5: Use ERR_CAST() instead of coding it
Tariq Toukan (1):
net/mlx5: Better return types for CQE API
drivers/infiniband/hw/mlx5/Kconfig | 2 +-
.../net/ethernet/mellanox/mlx5/core/Kconfig | 6 +-
drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 9 ++
.../mellanox/mlx5/core/diag/fs_tracepoint.h | 2 +
.../mellanox/mlx5/core/eswitch_offloads.c | 6 +-
.../net/ethernet/mellanox/mlx5/core/fs_cmd.c | 12 ++-
.../net/ethernet/mellanox/mlx5/core/fs_core.c | 6 +-
.../net/ethernet/mellanox/mlx5/core/main.c | 2 +-
include/linux/mlx5/device.h | 8 +-
include/linux/mlx5/driver.h | 5 +
include/linux/mlx5/fs.h | 4 +-
include/linux/mlx5/mlx5_ifc.h | 93 ++++++++++++++++++-
12 files changed, 133 insertions(+), 22 deletions(-)
--
2.17.0
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH mlx5-next 1/8] net/mlx5: FW tracer, add hardware structures
2018-07-17 1:35 [PATCH mlx5-next 0/8] Mellanox, mlx5 updates 2018-07-16 Saeed Mahameed
@ 2018-07-17 1:35 ` Saeed Mahameed
2018-07-17 1:35 ` [PATCH mlx5-next 2/8] net/mlx5: Expose MPEGC (Management PCIe General Configuration) structures Saeed Mahameed
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Saeed Mahameed @ 2018-07-17 1:35 UTC (permalink / raw)
To: netdev, linux-rdma
Cc: David S. Miller, Doug Ledford, Jason Gunthorpe, Leon Romanovsky,
Feras Daoud, Saeed Mahameed
From: Feras Daoud <ferasda@mellanox.com>
This change adds the infrastructure to mlx5 core fw tracer.
It introduces the following 4 new registers:
MLX5_REG_MTRC_CAP - Used to read tracer capabilities
MLX5_REG_MTRC_CONF - Used to set tracer configurations
MLX5_REG_MTRC_STDB - Used to query tracer strings database
MLX5_REG_MTRC_CTRL - Used to control the tracer
The capability of the tracing can be checked using mcam access
register, therefore, the mcam access register interface will expose
the tracer register.
Signed-off-by: Feras Daoud <ferasda@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
---
include/linux/mlx5/driver.h | 4 +++
include/linux/mlx5/mlx5_ifc.h | 61 ++++++++++++++++++++++++++++++++++-
2 files changed, 64 insertions(+), 1 deletion(-)
diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h
index 1cb1c0317b77..4a4125b4279d 100644
--- a/include/linux/mlx5/driver.h
+++ b/include/linux/mlx5/driver.h
@@ -138,6 +138,10 @@ enum {
MLX5_REG_HOST_ENDIANNESS = 0x7004,
MLX5_REG_MCIA = 0x9014,
MLX5_REG_MLCR = 0x902b,
+ MLX5_REG_MTRC_CAP = 0x9040,
+ MLX5_REG_MTRC_CONF = 0x9041,
+ MLX5_REG_MTRC_STDB = 0x9042,
+ MLX5_REG_MTRC_CTRL = 0x9043,
MLX5_REG_MPCNT = 0x9051,
MLX5_REG_MTPPS = 0x9053,
MLX5_REG_MTPPSE = 0x9054,
diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h
index 1853e7fd6924..bd7b71f54d59 100644
--- a/include/linux/mlx5/mlx5_ifc.h
+++ b/include/linux/mlx5/mlx5_ifc.h
@@ -8112,7 +8112,9 @@ struct mlx5_ifc_mcam_access_reg_bits {
u8 mcqi[0x1];
u8 reserved_at_1f[0x1];
- u8 regs_95_to_64[0x20];
+ u8 regs_95_to_68[0x1c];
+ u8 tracer_registers[0x4];
+
u8 regs_63_to_32[0x20];
u8 regs_31_to_0[0x20];
};
@@ -9187,4 +9189,61 @@ struct mlx5_ifc_create_uctx_in_bits {
struct mlx5_ifc_uctx_bits uctx;
};
+struct mlx5_ifc_mtrc_string_db_param_bits {
+ u8 string_db_base_address[0x20];
+
+ u8 reserved_at_20[0x8];
+ u8 string_db_size[0x18];
+};
+
+struct mlx5_ifc_mtrc_cap_bits {
+ u8 trace_owner[0x1];
+ u8 trace_to_memory[0x1];
+ u8 reserved_at_2[0x4];
+ u8 trc_ver[0x2];
+ u8 reserved_at_8[0x14];
+ u8 num_string_db[0x4];
+
+ u8 first_string_trace[0x8];
+ u8 num_string_trace[0x8];
+ u8 reserved_at_30[0x28];
+
+ u8 log_max_trace_buffer_size[0x8];
+
+ u8 reserved_at_60[0x20];
+
+ struct mlx5_ifc_mtrc_string_db_param_bits string_db_param[8];
+
+ u8 reserved_at_280[0x180];
+};
+
+struct mlx5_ifc_mtrc_conf_bits {
+ u8 reserved_at_0[0x1c];
+ u8 trace_mode[0x4];
+ u8 reserved_at_20[0x18];
+ u8 log_trace_buffer_size[0x8];
+ u8 trace_mkey[0x20];
+ u8 reserved_at_60[0x3a0];
+};
+
+struct mlx5_ifc_mtrc_stdb_bits {
+ u8 string_db_index[0x4];
+ u8 reserved_at_4[0x4];
+ u8 read_size[0x18];
+ u8 start_offset[0x20];
+ u8 string_db_data[0];
+};
+
+struct mlx5_ifc_mtrc_ctrl_bits {
+ u8 trace_status[0x2];
+ u8 reserved_at_2[0x2];
+ u8 arm_event[0x1];
+ u8 reserved_at_5[0xb];
+ u8 modify_field_select[0x10];
+ u8 reserved_at_20[0x2b];
+ u8 current_timestamp52_32[0x15];
+ u8 current_timestamp31_0[0x20];
+ u8 reserved_at_80[0x180];
+};
+
#endif /* MLX5_IFC_H */
--
2.17.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH mlx5-next 2/8] net/mlx5: Expose MPEGC (Management PCIe General Configuration) structures
2018-07-17 1:35 [PATCH mlx5-next 0/8] Mellanox, mlx5 updates 2018-07-16 Saeed Mahameed
2018-07-17 1:35 ` [PATCH mlx5-next 1/8] net/mlx5: FW tracer, add hardware structures Saeed Mahameed
@ 2018-07-17 1:35 ` Saeed Mahameed
2018-07-17 1:35 ` [PATCH mlx5-next 3/8] net/mlx5: Add core support for double vlan push/pop steering action Saeed Mahameed
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Saeed Mahameed @ 2018-07-17 1:35 UTC (permalink / raw)
To: netdev, linux-rdma
Cc: David S. Miller, Doug Ledford, Jason Gunthorpe, Leon Romanovsky,
Eran Ben Elisha, Saeed Mahameed
From: Eran Ben Elisha <eranbe@mellanox.com>
This patch exposes PRM layout for handling MPEGC (Management PCIe
General Configuration).
This will be used in the downstream patch for configuring MPEGC via the
driver.
Signed-off-by: Eran Ben Elisha <eranbe@mellanox.com>
Reviewed-by: Moshe Shemesh <moshe@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
---
include/linux/mlx5/driver.h | 1 +
include/linux/mlx5/mlx5_ifc.h | 23 +++++++++++++++++++++--
2 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h
index 4a4125b4279d..957199c20a0f 100644
--- a/include/linux/mlx5/driver.h
+++ b/include/linux/mlx5/driver.h
@@ -145,6 +145,7 @@ enum {
MLX5_REG_MPCNT = 0x9051,
MLX5_REG_MTPPS = 0x9053,
MLX5_REG_MTPPSE = 0x9054,
+ MLX5_REG_MPEGC = 0x9056,
MLX5_REG_MCQI = 0x9061,
MLX5_REG_MCC = 0x9062,
MLX5_REG_MCDA = 0x9063,
diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h
index bd7b71f54d59..2de5feaeb74a 100644
--- a/include/linux/mlx5/mlx5_ifc.h
+++ b/include/linux/mlx5/mlx5_ifc.h
@@ -8049,6 +8049,19 @@ struct mlx5_ifc_peir_reg_bits {
u8 error_type[0x8];
};
+struct mlx5_ifc_mpegc_reg_bits {
+ u8 reserved_at_0[0x30];
+ u8 field_select[0x10];
+
+ u8 tx_overflow_sense[0x1];
+ u8 mark_cqe[0x1];
+ u8 mark_cnp[0x1];
+ u8 reserved_at_43[0x1b];
+ u8 tx_lossy_overflow_oper[0x2];
+
+ u8 reserved_at_60[0x100];
+};
+
struct mlx5_ifc_pcam_enhanced_features_bits {
u8 reserved_at_0[0x6d];
u8 rx_icrc_encapsulated_counter[0x1];
@@ -8097,7 +8110,11 @@ struct mlx5_ifc_pcam_reg_bits {
};
struct mlx5_ifc_mcam_enhanced_features_bits {
- u8 reserved_at_0[0x7b];
+ u8 reserved_at_0[0x74];
+ u8 mark_tx_action_cnp[0x1];
+ u8 mark_tx_action_cqe[0x1];
+ u8 dynamic_tx_overflow[0x1];
+ u8 reserved_at_77[0x4];
u8 pcie_outbound_stalled[0x1];
u8 tx_overflow_buffer_pkt[0x1];
u8 mtpps_enh_out_per_adj[0x1];
@@ -8112,7 +8129,9 @@ struct mlx5_ifc_mcam_access_reg_bits {
u8 mcqi[0x1];
u8 reserved_at_1f[0x1];
- u8 regs_95_to_68[0x1c];
+ u8 regs_95_to_87[0x9];
+ u8 mpegc[0x1];
+ u8 regs_85_to_68[0x12];
u8 tracer_registers[0x4];
u8 regs_63_to_32[0x20];
--
2.17.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH mlx5-next 3/8] net/mlx5: Add core support for double vlan push/pop steering action
2018-07-17 1:35 [PATCH mlx5-next 0/8] Mellanox, mlx5 updates 2018-07-16 Saeed Mahameed
2018-07-17 1:35 ` [PATCH mlx5-next 1/8] net/mlx5: FW tracer, add hardware structures Saeed Mahameed
2018-07-17 1:35 ` [PATCH mlx5-next 2/8] net/mlx5: Expose MPEGC (Management PCIe General Configuration) structures Saeed Mahameed
@ 2018-07-17 1:35 ` Saeed Mahameed
2018-07-17 1:35 ` [PATCH mlx5-next 4/8] net/mlx5: Add XRQ commands definitions Saeed Mahameed
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Saeed Mahameed @ 2018-07-17 1:35 UTC (permalink / raw)
To: netdev, linux-rdma
Cc: David S. Miller, Doug Ledford, Jason Gunthorpe, Leon Romanovsky,
Jianbo Liu, Saeed Mahameed
From: Jianbo Liu <jianbol@mellanox.com>
As newer firmware supports double push/pop in a single FTE, we add
core bits and extend vlan action logic for it.
Signed-off-by: Jianbo Liu <jianbol@mellanox.com>
Reviewed-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
---
.../ethernet/mellanox/mlx5/core/diag/fs_tracepoint.h | 2 ++
.../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 6 +++---
drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 12 +++++++++---
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 4 +++-
include/linux/mlx5/fs.h | 4 +++-
include/linux/mlx5/mlx5_ifc.h | 11 +++++++++--
6 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/diag/fs_tracepoint.h b/drivers/net/ethernet/mellanox/mlx5/core/diag/fs_tracepoint.h
index 09f178a3fcab..0240aee9189e 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/diag/fs_tracepoint.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/diag/fs_tracepoint.h
@@ -138,6 +138,8 @@ TRACE_EVENT(mlx5_fs_del_fg,
{MLX5_FLOW_CONTEXT_ACTION_MOD_HDR, "MOD_HDR"},\
{MLX5_FLOW_CONTEXT_ACTION_VLAN_PUSH, "VLAN_PUSH"},\
{MLX5_FLOW_CONTEXT_ACTION_VLAN_POP, "VLAN_POP"},\
+ {MLX5_FLOW_CONTEXT_ACTION_VLAN_PUSH_2, "VLAN_PUSH_2"},\
+ {MLX5_FLOW_CONTEXT_ACTION_VLAN_POP_2, "VLAN_POP_2"},\
{MLX5_FLOW_CONTEXT_ACTION_FWD_NEXT_PRIO, "NEXT_PRIO"}
TRACE_EVENT(mlx5_fs_set_fte,
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
index cecd201f0b73..8f50ce80ff66 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
@@ -70,9 +70,9 @@ mlx5_eswitch_add_offloaded_rule(struct mlx5_eswitch *esw,
flow_act.action &= ~(MLX5_FLOW_CONTEXT_ACTION_VLAN_PUSH |
MLX5_FLOW_CONTEXT_ACTION_VLAN_POP);
else if (flow_act.action & MLX5_FLOW_CONTEXT_ACTION_VLAN_PUSH) {
- flow_act.vlan.ethtype = ntohs(attr->vlan_proto);
- flow_act.vlan.vid = attr->vlan_vid;
- flow_act.vlan.prio = attr->vlan_prio;
+ flow_act.vlan[0].ethtype = ntohs(attr->vlan_proto);
+ flow_act.vlan[0].vid = attr->vlan_vid;
+ flow_act.vlan[0].prio = attr->vlan_prio;
}
if (flow_act.action & MLX5_FLOW_CONTEXT_ACTION_FWD_DEST) {
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c
index 5a00deff5457..6a62b84e57f4 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c
@@ -349,9 +349,15 @@ static int mlx5_cmd_set_fte(struct mlx5_core_dev *dev,
vlan = MLX5_ADDR_OF(flow_context, in_flow_context, push_vlan);
- MLX5_SET(vlan, vlan, ethtype, fte->action.vlan.ethtype);
- MLX5_SET(vlan, vlan, vid, fte->action.vlan.vid);
- MLX5_SET(vlan, vlan, prio, fte->action.vlan.prio);
+ MLX5_SET(vlan, vlan, ethtype, fte->action.vlan[0].ethtype);
+ MLX5_SET(vlan, vlan, vid, fte->action.vlan[0].vid);
+ MLX5_SET(vlan, vlan, prio, fte->action.vlan[0].prio);
+
+ vlan = MLX5_ADDR_OF(flow_context, in_flow_context, push_vlan_2);
+
+ MLX5_SET(vlan, vlan, ethtype, fte->action.vlan[1].ethtype);
+ MLX5_SET(vlan, vlan, vid, fte->action.vlan[1].vid);
+ MLX5_SET(vlan, vlan, prio, fte->action.vlan[1].prio);
in_match_value = MLX5_ADDR_OF(flow_context, in_flow_context,
match_value);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
index 49a75d31185e..05e7a5112b74 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
@@ -1464,7 +1464,9 @@ static bool check_conflicting_actions(u32 action1, u32 action2)
MLX5_FLOW_CONTEXT_ACTION_DECAP |
MLX5_FLOW_CONTEXT_ACTION_MOD_HDR |
MLX5_FLOW_CONTEXT_ACTION_VLAN_POP |
- MLX5_FLOW_CONTEXT_ACTION_VLAN_PUSH))
+ MLX5_FLOW_CONTEXT_ACTION_VLAN_PUSH |
+ MLX5_FLOW_CONTEXT_ACTION_VLAN_POP_2 |
+ MLX5_FLOW_CONTEXT_ACTION_VLAN_PUSH_2))
return true;
return false;
diff --git a/include/linux/mlx5/fs.h b/include/linux/mlx5/fs.h
index 757b4a30281e..c40f2fc68655 100644
--- a/include/linux/mlx5/fs.h
+++ b/include/linux/mlx5/fs.h
@@ -152,6 +152,8 @@ struct mlx5_fs_vlan {
u8 prio;
};
+#define MLX5_FS_VLAN_DEPTH 2
+
struct mlx5_flow_act {
u32 action;
bool has_flow_tag;
@@ -159,7 +161,7 @@ struct mlx5_flow_act {
u32 encap_id;
u32 modify_id;
uintptr_t esp_id;
- struct mlx5_fs_vlan vlan;
+ struct mlx5_fs_vlan vlan[MLX5_FS_VLAN_DEPTH];
struct ib_counters *counters;
};
diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h
index 2de5feaeb74a..ae12120ef021 100644
--- a/include/linux/mlx5/mlx5_ifc.h
+++ b/include/linux/mlx5/mlx5_ifc.h
@@ -337,7 +337,10 @@ struct mlx5_ifc_flow_table_prop_layout_bits {
u8 reserved_at_9[0x1];
u8 pop_vlan[0x1];
u8 push_vlan[0x1];
- u8 reserved_at_c[0x14];
+ u8 reserved_at_c[0x1];
+ u8 pop_vlan_2[0x1];
+ u8 push_vlan_2[0x1];
+ u8 reserved_at_f[0x11];
u8 reserved_at_20[0x2];
u8 log_max_ft_size[0x6];
@@ -2386,6 +2389,8 @@ enum {
MLX5_FLOW_CONTEXT_ACTION_MOD_HDR = 0x40,
MLX5_FLOW_CONTEXT_ACTION_VLAN_POP = 0x80,
MLX5_FLOW_CONTEXT_ACTION_VLAN_PUSH = 0x100,
+ MLX5_FLOW_CONTEXT_ACTION_VLAN_POP_2 = 0x400,
+ MLX5_FLOW_CONTEXT_ACTION_VLAN_PUSH_2 = 0x800,
};
struct mlx5_ifc_vlan_bits {
@@ -2416,7 +2421,9 @@ struct mlx5_ifc_flow_context_bits {
u8 modify_header_id[0x20];
- u8 reserved_at_100[0x100];
+ struct mlx5_ifc_vlan_bits push_vlan_2;
+
+ u8 reserved_at_120[0xe0];
struct mlx5_ifc_fte_match_param_bits match_value;
--
2.17.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH mlx5-next 4/8] net/mlx5: Add XRQ commands definitions
2018-07-17 1:35 [PATCH mlx5-next 0/8] Mellanox, mlx5 updates 2018-07-16 Saeed Mahameed
` (2 preceding siblings ...)
2018-07-17 1:35 ` [PATCH mlx5-next 3/8] net/mlx5: Add core support for double vlan push/pop steering action Saeed Mahameed
@ 2018-07-17 1:35 ` Saeed Mahameed
2018-07-17 1:35 ` [PATCH mlx5-next 5/8] net/mlx5: Add missing SET_DRIVER_VERSION command translation Saeed Mahameed
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Saeed Mahameed @ 2018-07-17 1:35 UTC (permalink / raw)
To: netdev, linux-rdma
Cc: David S. Miller, Doug Ledford, Jason Gunthorpe, Leon Romanovsky,
Max Gurtovoy, Saeed Mahameed
From: Max Gurtovoy <maxg@mellanox.com>
Update mlx5 command list and error return function to handle XRQ
commands.
Signed-off-by: Max Gurtovoy <maxg@mellanox.com>
Reviewed-by: Daniel Jurgens <danielj@mellanox.com>
Reviewed-by: Artemy Kovalyov <artemyko@mellanox.com>
Reviewed-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
---
drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
index a94955302482..10517b2a0643 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
@@ -278,6 +278,7 @@ static int mlx5_internal_err_ret_value(struct mlx5_core_dev *dev, u16 op,
case MLX5_CMD_OP_DESTROY_PSV:
case MLX5_CMD_OP_DESTROY_SRQ:
case MLX5_CMD_OP_DESTROY_XRC_SRQ:
+ case MLX5_CMD_OP_DESTROY_XRQ:
case MLX5_CMD_OP_DESTROY_DCT:
case MLX5_CMD_OP_DEALLOC_Q_COUNTER:
case MLX5_CMD_OP_DESTROY_SCHEDULING_ELEMENT:
@@ -347,6 +348,9 @@ static int mlx5_internal_err_ret_value(struct mlx5_core_dev *dev, u16 op,
case MLX5_CMD_OP_CREATE_XRC_SRQ:
case MLX5_CMD_OP_QUERY_XRC_SRQ:
case MLX5_CMD_OP_ARM_XRC_SRQ:
+ case MLX5_CMD_OP_CREATE_XRQ:
+ case MLX5_CMD_OP_QUERY_XRQ:
+ case MLX5_CMD_OP_ARM_XRQ:
case MLX5_CMD_OP_CREATE_DCT:
case MLX5_CMD_OP_DRAIN_DCT:
case MLX5_CMD_OP_QUERY_DCT:
@@ -601,6 +605,10 @@ const char *mlx5_command_str(int command)
MLX5_COMMAND_STR_CASE(FPGA_QUERY_QP);
MLX5_COMMAND_STR_CASE(FPGA_QUERY_QP_COUNTERS);
MLX5_COMMAND_STR_CASE(FPGA_DESTROY_QP);
+ MLX5_COMMAND_STR_CASE(CREATE_XRQ);
+ MLX5_COMMAND_STR_CASE(DESTROY_XRQ);
+ MLX5_COMMAND_STR_CASE(QUERY_XRQ);
+ MLX5_COMMAND_STR_CASE(ARM_XRQ);
MLX5_COMMAND_STR_CASE(CREATE_GENERAL_OBJECT);
MLX5_COMMAND_STR_CASE(DESTROY_GENERAL_OBJECT);
default: return "unknown command opcode";
--
2.17.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH mlx5-next 5/8] net/mlx5: Add missing SET_DRIVER_VERSION command translation
2018-07-17 1:35 [PATCH mlx5-next 0/8] Mellanox, mlx5 updates 2018-07-16 Saeed Mahameed
` (3 preceding siblings ...)
2018-07-17 1:35 ` [PATCH mlx5-next 4/8] net/mlx5: Add XRQ commands definitions Saeed Mahameed
@ 2018-07-17 1:35 ` Saeed Mahameed
2018-07-17 1:35 ` [PATCH mlx5-next 6/8] net/mlx5: Use ERR_CAST() instead of coding it Saeed Mahameed
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Saeed Mahameed @ 2018-07-17 1:35 UTC (permalink / raw)
To: netdev, linux-rdma
Cc: David S. Miller, Doug Ledford, Jason Gunthorpe, Leon Romanovsky,
Noa Osherovich, Saeed Mahameed
From: Noa Osherovich <noaos@mellanox.com>
When translating command opcodes to a string, SET_DRIVER_VERSION
command was missing.
Fixes: 42ca502e179d0 ('net/mlx5_core: Use a macro in mlx5_command_str()')
Signed-off-by: Noa Osherovich <noaos@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
---
drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
index 10517b2a0643..041c18faea46 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
@@ -458,6 +458,7 @@ const char *mlx5_command_str(int command)
MLX5_COMMAND_STR_CASE(SET_HCA_CAP);
MLX5_COMMAND_STR_CASE(QUERY_ISSI);
MLX5_COMMAND_STR_CASE(SET_ISSI);
+ MLX5_COMMAND_STR_CASE(SET_DRIVER_VERSION);
MLX5_COMMAND_STR_CASE(CREATE_MKEY);
MLX5_COMMAND_STR_CASE(QUERY_MKEY);
MLX5_COMMAND_STR_CASE(DESTROY_MKEY);
--
2.17.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH mlx5-next 6/8] net/mlx5: Use ERR_CAST() instead of coding it
2018-07-17 1:35 [PATCH mlx5-next 0/8] Mellanox, mlx5 updates 2018-07-16 Saeed Mahameed
` (4 preceding siblings ...)
2018-07-17 1:35 ` [PATCH mlx5-next 5/8] net/mlx5: Add missing SET_DRIVER_VERSION command translation Saeed Mahameed
@ 2018-07-17 1:35 ` Saeed Mahameed
2018-07-17 1:35 ` [PATCH mlx5-next 7/8] net/mlx5: Better return types for CQE API Saeed Mahameed
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Saeed Mahameed @ 2018-07-17 1:35 UTC (permalink / raw)
To: netdev, linux-rdma
Cc: David S. Miller, Doug Ledford, Jason Gunthorpe, Leon Romanovsky,
Roi Dayan, Saeed Mahameed
From: Roi Dayan <roid@mellanox.com>
This makes it more readable that rule is being used to return an err.
Signed-off-by: Roi Dayan <roid@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
---
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
index 05e7a5112b74..29b86232f13a 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
@@ -1825,7 +1825,7 @@ _mlx5_add_flow_rules(struct mlx5_flow_table *ft,
g = alloc_auto_flow_group(ft, spec);
if (IS_ERR(g)) {
- rule = (void *)g;
+ rule = ERR_CAST(g);
up_write_ref_node(&ft->node);
return rule;
}
--
2.17.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH mlx5-next 7/8] net/mlx5: Better return types for CQE API
2018-07-17 1:35 [PATCH mlx5-next 0/8] Mellanox, mlx5 updates 2018-07-16 Saeed Mahameed
` (5 preceding siblings ...)
2018-07-17 1:35 ` [PATCH mlx5-next 6/8] net/mlx5: Use ERR_CAST() instead of coding it Saeed Mahameed
@ 2018-07-17 1:35 ` Saeed Mahameed
2018-07-17 1:35 ` [PATCH mlx5-next 8/8] net/mlx5: Fix tristate and description for MLX5 module Saeed Mahameed
2018-07-18 21:41 ` [PATCH mlx5-next 0/8] Mellanox, mlx5 updates 2018-07-16 Saeed Mahameed
8 siblings, 0 replies; 10+ messages in thread
From: Saeed Mahameed @ 2018-07-17 1:35 UTC (permalink / raw)
To: netdev, linux-rdma
Cc: David S. Miller, Doug Ledford, Jason Gunthorpe, Leon Romanovsky,
Tariq Toukan, Saeed Mahameed
From: Tariq Toukan <tariqt@mellanox.com>
Reduce sizes of return types.
Use bool for binary indication.
Signed-off-by: Tariq Toukan <tariqt@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
---
include/linux/mlx5/device.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/linux/mlx5/device.h b/include/linux/mlx5/device.h
index f8671c0a43aa..0566c6a94805 100644
--- a/include/linux/mlx5/device.h
+++ b/include/linux/mlx5/device.h
@@ -750,7 +750,7 @@ enum {
#define MLX5_MINI_CQE_ARRAY_SIZE 8
-static inline int mlx5_get_cqe_format(struct mlx5_cqe64 *cqe)
+static inline u8 mlx5_get_cqe_format(struct mlx5_cqe64 *cqe)
{
return (cqe->op_own >> 2) & 0x3;
}
@@ -770,14 +770,14 @@ static inline u8 get_cqe_l3_hdr_type(struct mlx5_cqe64 *cqe)
return (cqe->l4_l3_hdr_type >> 2) & 0x3;
}
-static inline u8 cqe_is_tunneled(struct mlx5_cqe64 *cqe)
+static inline bool cqe_is_tunneled(struct mlx5_cqe64 *cqe)
{
return cqe->outer_l3_tunneled & 0x1;
}
-static inline int cqe_has_vlan(struct mlx5_cqe64 *cqe)
+static inline bool cqe_has_vlan(struct mlx5_cqe64 *cqe)
{
- return !!(cqe->l4_l3_hdr_type & 0x1);
+ return cqe->l4_l3_hdr_type & 0x1;
}
static inline u64 get_cqe_ts(struct mlx5_cqe64 *cqe)
--
2.17.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH mlx5-next 8/8] net/mlx5: Fix tristate and description for MLX5 module
2018-07-17 1:35 [PATCH mlx5-next 0/8] Mellanox, mlx5 updates 2018-07-16 Saeed Mahameed
` (6 preceding siblings ...)
2018-07-17 1:35 ` [PATCH mlx5-next 7/8] net/mlx5: Better return types for CQE API Saeed Mahameed
@ 2018-07-17 1:35 ` Saeed Mahameed
2018-07-18 21:41 ` [PATCH mlx5-next 0/8] Mellanox, mlx5 updates 2018-07-16 Saeed Mahameed
8 siblings, 0 replies; 10+ messages in thread
From: Saeed Mahameed @ 2018-07-17 1:35 UTC (permalink / raw)
To: netdev, linux-rdma
Cc: David S. Miller, Doug Ledford, Jason Gunthorpe, Leon Romanovsky,
Eran Ben Elisha, Saeed Mahameed
From: Eran Ben Elisha <eranbe@mellanox.com>
Current description did not include new devices. Fix that by proving the
correct generic description.
Signed-off-by: Eran Ben Elisha <eranbe@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
---
drivers/infiniband/hw/mlx5/Kconfig | 2 +-
drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 6 +++---
drivers/net/ethernet/mellanox/mlx5/core/main.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/infiniband/hw/mlx5/Kconfig b/drivers/infiniband/hw/mlx5/Kconfig
index fb4d77be019b..0440966bc6ec 100644
--- a/drivers/infiniband/hw/mlx5/Kconfig
+++ b/drivers/infiniband/hw/mlx5/Kconfig
@@ -1,5 +1,5 @@
config MLX5_INFINIBAND
- tristate "Mellanox Connect-IB HCA support"
+ tristate "Mellanox 5th generation network adapters (ConnectX series) support"
depends on NETDEVICES && ETHERNET && PCI && MLX5_CORE
depends on INFINIBAND_USER_ACCESS || INFINIBAND_USER_ACCESS=n
---help---
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig
index 2545296a0c08..7a84dd07ced2 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig
+++ b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig
@@ -3,7 +3,7 @@
#
config MLX5_CORE
- tristate "Mellanox Technologies ConnectX-4 and Connect-IB core driver"
+ tristate "Mellanox 5th generation network adapters (ConnectX series) core driver"
depends on MAY_USE_DEVLINK
depends on PCI
imply PTP_1588_CLOCK
@@ -27,7 +27,7 @@ config MLX5_FPGA
sandbox-specific client drivers.
config MLX5_CORE_EN
- bool "Mellanox Technologies ConnectX-4 Ethernet support"
+ bool "Mellanox 5th generation network adapters (ConnectX series) Ethernet support"
depends on NETDEVICES && ETHERNET && INET && PCI && MLX5_CORE
depends on IPV6=y || IPV6=n || MLX5_CORE=m
select PAGE_POOL
@@ -69,7 +69,7 @@ config MLX5_CORE_EN_DCB
If unsure, set to Y
config MLX5_CORE_IPOIB
- bool "Mellanox Technologies ConnectX-4 IPoIB offloads support"
+ bool "Mellanox 5th generation network adapters (connectX series) IPoIB offloads support"
depends on MLX5_CORE_EN
default n
---help---
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c
index 615005e63819..f9b950e1bd85 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
@@ -64,7 +64,7 @@
#include "lib/clock.h"
MODULE_AUTHOR("Eli Cohen <eli@mellanox.com>");
-MODULE_DESCRIPTION("Mellanox Connect-IB, ConnectX-4 core driver");
+MODULE_DESCRIPTION("Mellanox 5th generation network adapters (ConnectX series) core driver");
MODULE_LICENSE("Dual BSD/GPL");
MODULE_VERSION(DRIVER_VERSION);
--
2.17.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH mlx5-next 0/8] Mellanox, mlx5 updates 2018-07-16
2018-07-17 1:35 [PATCH mlx5-next 0/8] Mellanox, mlx5 updates 2018-07-16 Saeed Mahameed
` (7 preceding siblings ...)
2018-07-17 1:35 ` [PATCH mlx5-next 8/8] net/mlx5: Fix tristate and description for MLX5 module Saeed Mahameed
@ 2018-07-18 21:41 ` Saeed Mahameed
8 siblings, 0 replies; 10+ messages in thread
From: Saeed Mahameed @ 2018-07-18 21:41 UTC (permalink / raw)
To: netdev, linux-rdma; +Cc: Jason Gunthorpe, davem, Leon Romanovsky, dledford
On Mon, 2018-07-16 at 18:35 -0700, Saeed Mahameed wrote:
> Hi,
>
> This series includes mlx5 core infrastructure updates and fixes
> aimed for mlx5-next branch.
>
> In case of no objections, below patches will be applied to mlx5-next
> branch
> and next mlx5 net-next pull request will start with a merge commit
> pointing to the last patch in this series.
>
Series applied to mlx5-next.
Thanks everyone.
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2018-07-18 22:21 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-07-17 1:35 [PATCH mlx5-next 0/8] Mellanox, mlx5 updates 2018-07-16 Saeed Mahameed
2018-07-17 1:35 ` [PATCH mlx5-next 1/8] net/mlx5: FW tracer, add hardware structures Saeed Mahameed
2018-07-17 1:35 ` [PATCH mlx5-next 2/8] net/mlx5: Expose MPEGC (Management PCIe General Configuration) structures Saeed Mahameed
2018-07-17 1:35 ` [PATCH mlx5-next 3/8] net/mlx5: Add core support for double vlan push/pop steering action Saeed Mahameed
2018-07-17 1:35 ` [PATCH mlx5-next 4/8] net/mlx5: Add XRQ commands definitions Saeed Mahameed
2018-07-17 1:35 ` [PATCH mlx5-next 5/8] net/mlx5: Add missing SET_DRIVER_VERSION command translation Saeed Mahameed
2018-07-17 1:35 ` [PATCH mlx5-next 6/8] net/mlx5: Use ERR_CAST() instead of coding it Saeed Mahameed
2018-07-17 1:35 ` [PATCH mlx5-next 7/8] net/mlx5: Better return types for CQE API Saeed Mahameed
2018-07-17 1:35 ` [PATCH mlx5-next 8/8] net/mlx5: Fix tristate and description for MLX5 module Saeed Mahameed
2018-07-18 21:41 ` [PATCH mlx5-next 0/8] Mellanox, mlx5 updates 2018-07-16 Saeed Mahameed
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).