Commit e4fdf762 authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

Merge branch 'mellanox/mlx5-next' into rdma.git for/next 

From the mlx5-next branch at
  git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux



Required for dependencies in following patches

* branch 'mellanox/mlx5-next':
  net/mlx5: Add ability to read and write ECE options
  net/mlx5: Add support for RDMA TX FT headers modifying
  net/mlx5: Move iseg access helper routines close to mlx5_core driver
  net/mlx5: Cleanup mlx5_ifc_fte_match_set_misc2_bits

Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parents d246a306 6b646a7e

drivers/infiniband/hw/mlx5/flow.c

+4 −1
Original line number Diff line number Diff line
@@ -438,7 +438,10 @@ static bool mlx5_ib_modify_header_supported(struct mlx5_ib_dev *dev) 
{

	return MLX5_CAP_FLOWTABLE_NIC_RX(dev->mdev,

					 max_modify_header_actions) ||

	       MLX5_CAP_FLOWTABLE_NIC_TX(dev->mdev, max_modify_header_actions);

	       MLX5_CAP_FLOWTABLE_NIC_TX(dev->mdev,

					 max_modify_header_actions) ||

	       MLX5_CAP_FLOWTABLE_RDMA_TX(dev->mdev,

					 max_modify_header_actions);

}



static int UVERBS_HANDLER(MLX5_IB_METHOD_FLOW_ACTION_CREATE_MODIFY_HEADER)(

drivers/net/ethernet/mellanox/mlx5/core/cmd.c

+5 −0
Original line number Diff line number Diff line
@@ -1894,6 +1894,11 @@ static void free_cmd_page(struct mlx5_core_dev *dev, struct mlx5_cmd *cmd) 
			  cmd->alloc_dma);

}



static u16 cmdif_rev(struct mlx5_core_dev *dev)

{

	return ioread32be(&dev->iseg->cmdif_rev_fw_sub) >> 16;

}



int mlx5_cmd_init(struct mlx5_core_dev *dev)

{

	int size = sizeof(struct mlx5_cmd_prot_block);

drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c

+4 −0
Original line number Diff line number Diff line
@@ -781,6 +781,10 @@ static int mlx5_cmd_modify_header_alloc(struct mlx5_flow_root_namespace *ns, 
		max_actions = MLX5_CAP_ESW_INGRESS_ACL(dev, max_modify_header_actions);

		table_type = FS_FT_ESW_INGRESS_ACL;

		break;

	case MLX5_FLOW_NAMESPACE_RDMA_TX:

		max_actions = MLX5_CAP_FLOWTABLE_RDMA_TX(dev, max_modify_header_actions);

		table_type = FS_FT_RDMA_TX;

		break;

	default:

		return -EOPNOTSUPP;

	}

drivers/net/ethernet/mellanox/mlx5/core/main.c

+5 −0
Original line number Diff line number Diff line
@@ -177,6 +177,11 @@ static struct mlx5_profile profile[] = { 
#define FW_PRE_INIT_TIMEOUT_MILI	120000

#define FW_INIT_WARN_MESSAGE_INTERVAL	20000



static int fw_initializing(struct mlx5_core_dev *dev)

{

	return ioread32be(&dev->iseg->initializing) >> 31;

}



static int wait_fw_init(struct mlx5_core_dev *dev, u32 max_wait_mili,

			u32 warn_time_mili)

{

drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste.c

+0 −1
Original line number Diff line number Diff line
@@ -961,7 +961,6 @@ static void dr_ste_copy_mask_misc2(char *mask, struct mlx5dr_match_misc2 *spec) 
	spec->metadata_reg_c_1 = MLX5_GET(fte_match_set_misc2, mask, metadata_reg_c_1);

	spec->metadata_reg_c_0 = MLX5_GET(fte_match_set_misc2, mask, metadata_reg_c_0);

	spec->metadata_reg_a = MLX5_GET(fte_match_set_misc2, mask, metadata_reg_a);

	spec->metadata_reg_b = MLX5_GET(fte_match_set_misc2, mask, metadata_reg_b);

}



static void dr_ste_copy_mask_misc3(char *mask, struct mlx5dr_match_misc3 *spec)

CRA Git | Maintained and supported by SUSTech CRA and CCSE