Merge branch 'mlx4_vxlan' (5256d7e4) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/net/ethernet/mellanox/mlx4/cmd.c

+13 −13

Original line number	Original line	Diff line number	Diff line
	@@ -800,16 +800,7 @@ static int mlx4_MAD_IFC_wrapper(struct mlx4_dev *dev, int slave,
	vhcr->op, MLX4_CMD_TIME_CLASS_C, MLX4_CMD_NATIVE);		vhcr->op, MLX4_CMD_TIME_CLASS_C, MLX4_CMD_NATIVE);
	}		}

	static int MLX4_CMD_UPDATE_QP_wrapper(struct mlx4_dev *dev, int slave,		static int mlx4_CMD_EPERM_wrapper(struct mlx4_dev *dev, int slave,
	struct mlx4_vhcr *vhcr,
	struct mlx4_cmd_mailbox *inbox,
	struct mlx4_cmd_mailbox *outbox,
	struct mlx4_cmd_info *cmd)
	{
	return -EPERM;
	}

	static int MLX4_CMD_GET_OP_REQ_wrapper(struct mlx4_dev *dev, int slave,
	struct mlx4_vhcr *vhcr,		struct mlx4_vhcr *vhcr,
	struct mlx4_cmd_mailbox *inbox,		struct mlx4_cmd_mailbox *inbox,
	struct mlx4_cmd_mailbox *outbox,		struct mlx4_cmd_mailbox *outbox,
	@@ -963,6 +954,15 @@ static struct mlx4_cmd_info cmd_info[] = {
	.verify = NULL,		.verify = NULL,
	.wrapper = NULL		.wrapper = NULL
	},		},
			{
			.opcode = MLX4_CMD_CONFIG_DEV,
			.has_inbox = false,
			.has_outbox = false,
			.out_is_imm = false,
			.encode_slave_id = false,
			.verify = NULL,
			.wrapper = mlx4_CMD_EPERM_wrapper
			},
	{		{
	.opcode = MLX4_CMD_ALLOC_RES,		.opcode = MLX4_CMD_ALLOC_RES,
	.has_inbox = false,		.has_inbox = false,
	@@ -1258,7 +1258,7 @@ static struct mlx4_cmd_info cmd_info[] = {
	.out_is_imm = false,		.out_is_imm = false,
	.encode_slave_id = false,		.encode_slave_id = false,
	.verify = NULL,		.verify = NULL,
	.wrapper = MLX4_CMD_UPDATE_QP_wrapper		.wrapper = mlx4_CMD_EPERM_wrapper
	},		},
	{		{
	.opcode = MLX4_CMD_GET_OP_REQ,		.opcode = MLX4_CMD_GET_OP_REQ,
	@@ -1267,7 +1267,7 @@ static struct mlx4_cmd_info cmd_info[] = {
	.out_is_imm = false,		.out_is_imm = false,
	.encode_slave_id = false,		.encode_slave_id = false,
	.verify = NULL,		.verify = NULL,
	.wrapper = MLX4_CMD_GET_OP_REQ_wrapper,		.wrapper = mlx4_CMD_EPERM_wrapper,
	},		},
	{		{
	.opcode = MLX4_CMD_CONF_SPECIAL_QP,		.opcode = MLX4_CMD_CONF_SPECIAL_QP,
	@@ -1378,7 +1378,7 @@ static struct mlx4_cmd_info cmd_info[] = {
	.out_is_imm = false,		.out_is_imm = false,
	.encode_slave_id = false,		.encode_slave_id = false,
	.verify = NULL,		.verify = NULL,
	.wrapper = mlx4_FLOW_STEERING_IB_UC_QP_RANGE_wrapper		.wrapper = mlx4_CMD_EPERM_wrapper
	},		},
	};		};

drivers/net/ethernet/mellanox/mlx4/en_netdev.c

+84 −2

Original line number	Original line	Diff line number	Diff line
	@@ -39,6 +39,7 @@
	#include <linux/hash.h>		#include <linux/hash.h>
	#include <net/ip.h>		#include <net/ip.h>
	#include <net/busy_poll.h>		#include <net/busy_poll.h>
			#include <net/vxlan.h>

	#include <linux/mlx4/driver.h>		#include <linux/mlx4/driver.h>
	#include <linux/mlx4/device.h>		#include <linux/mlx4/device.h>
	@@ -1665,7 +1666,7 @@ int mlx4_en_start_port(struct net_device *dev)
	}		}

	if (mdev->dev->caps.tunnel_offload_mode == MLX4_TUNNEL_OFFLOAD_MODE_VXLAN) {		if (mdev->dev->caps.tunnel_offload_mode == MLX4_TUNNEL_OFFLOAD_MODE_VXLAN) {
	err = mlx4_SET_PORT_VXLAN(mdev->dev, priv->port, VXLAN_STEER_BY_OUTER_MAC);		err = mlx4_SET_PORT_VXLAN(mdev->dev, priv->port, VXLAN_STEER_BY_OUTER_MAC, 1);
	if (err) {		if (err) {
	en_err(priv, "Failed setting port L2 tunnel configuration, err %d\n",		en_err(priv, "Failed setting port L2 tunnel configuration, err %d\n",
	err);		err);
	@@ -1697,6 +1698,8 @@ int mlx4_en_start_port(struct net_device *dev)

	mlx4_set_stats_bitmap(mdev->dev, &priv->stats_bitmap);		mlx4_set_stats_bitmap(mdev->dev, &priv->stats_bitmap);

			if (priv->mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_VXLAN_OFFLOADS)
			vxlan_get_rx_port(dev);
	priv->port_up = true;		priv->port_up = true;
	netif_tx_start_all_queues(dev);		netif_tx_start_all_queues(dev);
	netif_device_attach(dev);		netif_device_attach(dev);
	@@ -2264,6 +2267,81 @@ static int mlx4_en_get_phys_port_id(struct net_device *dev,
	return 0;		return 0;
	}		}

			static void mlx4_en_add_vxlan_offloads(struct work_struct *work)
			{
			int ret;
			struct mlx4_en_priv *priv = container_of(work, struct mlx4_en_priv,
			vxlan_add_task);

			ret = mlx4_config_vxlan_port(priv->mdev->dev, priv->vxlan_port);
			if (ret)
			goto out;

			ret = mlx4_SET_PORT_VXLAN(priv->mdev->dev, priv->port,
			VXLAN_STEER_BY_OUTER_MAC, 1);
			out:
			if (ret)
			en_err(priv, "failed setting L2 tunnel configuration ret %d\n", ret);
			}

			static void mlx4_en_del_vxlan_offloads(struct work_struct *work)
			{
			int ret;
			struct mlx4_en_priv *priv = container_of(work, struct mlx4_en_priv,
			vxlan_del_task);

			ret = mlx4_SET_PORT_VXLAN(priv->mdev->dev, priv->port,
			VXLAN_STEER_BY_OUTER_MAC, 0);
			if (ret)
			en_err(priv, "failed setting L2 tunnel configuration ret %d\n", ret);

			priv->vxlan_port = 0;
			}

			static void mlx4_en_add_vxlan_port(struct net_device *dev,
			sa_family_t sa_family, __be16 port)
			{
			struct mlx4_en_priv *priv = netdev_priv(dev);
			__be16 current_port;

			if (!(priv->mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_VXLAN_OFFLOADS))
			return;

			if (sa_family == AF_INET6)
			return;

			current_port = priv->vxlan_port;
			if (current_port && current_port != port) {
			en_warn(priv, "vxlan port %d configured, can't add port %d\n",
			ntohs(current_port), ntohs(port));
			return;
			}

			priv->vxlan_port = port;
			queue_work(priv->mdev->workqueue, &priv->vxlan_add_task);
			}

			static void mlx4_en_del_vxlan_port(struct net_device *dev,
			sa_family_t sa_family, __be16 port)
			{
			struct mlx4_en_priv *priv = netdev_priv(dev);
			__be16 current_port;

			if (priv->mdev->dev->caps.tunnel_offload_mode != MLX4_TUNNEL_OFFLOAD_MODE_VXLAN)
			return;

			if (sa_family == AF_INET6)
			return;

			current_port = priv->vxlan_port;
			if (current_port != port) {
			en_dbg(DRV, priv, "vxlan port %d isn't configured, ignoring\n", ntohs(port));
			return;
			}

			queue_work(priv->mdev->workqueue, &priv->vxlan_del_task);
			}

	static const struct net_device_ops mlx4_netdev_ops = {		static const struct net_device_ops mlx4_netdev_ops = {
	.ndo_open = mlx4_en_open,		.ndo_open = mlx4_en_open,
	.ndo_stop = mlx4_en_close,		.ndo_stop = mlx4_en_close,
	@@ -2290,6 +2368,8 @@ static const struct net_device_ops mlx4_netdev_ops = {
	.ndo_busy_poll = mlx4_en_low_latency_recv,		.ndo_busy_poll = mlx4_en_low_latency_recv,
	#endif		#endif
	.ndo_get_phys_port_id = mlx4_en_get_phys_port_id,		.ndo_get_phys_port_id = mlx4_en_get_phys_port_id,
			.ndo_add_vxlan_port = mlx4_en_add_vxlan_port,
			.ndo_del_vxlan_port = mlx4_en_del_vxlan_port,
	};		};

	static const struct net_device_ops mlx4_netdev_ops_master = {		static const struct net_device_ops mlx4_netdev_ops_master = {
	@@ -2381,6 +2461,8 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
	INIT_WORK(&priv->linkstate_task, mlx4_en_linkstate);		INIT_WORK(&priv->linkstate_task, mlx4_en_linkstate);
	INIT_DELAYED_WORK(&priv->stats_task, mlx4_en_do_get_stats);		INIT_DELAYED_WORK(&priv->stats_task, mlx4_en_do_get_stats);
	INIT_DELAYED_WORK(&priv->service_task, mlx4_en_service_task);		INIT_DELAYED_WORK(&priv->service_task, mlx4_en_service_task);
			INIT_WORK(&priv->vxlan_add_task, mlx4_en_add_vxlan_offloads);
			INIT_WORK(&priv->vxlan_del_task, mlx4_en_del_vxlan_offloads);
	#ifdef CONFIG_MLX4_EN_DCB		#ifdef CONFIG_MLX4_EN_DCB
	if (!mlx4_is_slave(priv->mdev->dev)) {		if (!mlx4_is_slave(priv->mdev->dev)) {
	if (mdev->dev->caps.flags & MLX4_DEV_CAP_FLAG_SET_ETH_SCHED) {		if (mdev->dev->caps.flags & MLX4_DEV_CAP_FLAG_SET_ETH_SCHED) {
	@@ -2514,7 +2596,7 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
	}		}

	if (mdev->dev->caps.tunnel_offload_mode == MLX4_TUNNEL_OFFLOAD_MODE_VXLAN) {		if (mdev->dev->caps.tunnel_offload_mode == MLX4_TUNNEL_OFFLOAD_MODE_VXLAN) {
	err = mlx4_SET_PORT_VXLAN(mdev->dev, priv->port, VXLAN_STEER_BY_OUTER_MAC);		err = mlx4_SET_PORT_VXLAN(mdev->dev, priv->port, VXLAN_STEER_BY_OUTER_MAC, 1);
	if (err) {		if (err) {
	en_err(priv, "Failed setting port L2 tunnel configuration, err %d\n",		en_err(priv, "Failed setting port L2 tunnel configuration, err %d\n",
	err);		err);

drivers/net/ethernet/mellanox/mlx4/fw.c

+40 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1779,6 +1779,46 @@ int mlx4_CLOSE_HCA(struct mlx4_dev *dev, int panic)
	MLX4_CMD_NATIVE);		MLX4_CMD_NATIVE);
	}		}

			struct mlx4_config_dev {
			__be32 update_flags;
			__be32 rsdv1[3];
			__be16 vxlan_udp_dport;
			__be16 rsvd2;
			};

			#define MLX4_VXLAN_UDP_DPORT (1 << 0)

			static int mlx4_CONFIG_DEV(struct mlx4_dev dev, struct mlx4_config_dev config_dev)
			{
			int err;
			struct mlx4_cmd_mailbox *mailbox;

			mailbox = mlx4_alloc_cmd_mailbox(dev);
			if (IS_ERR(mailbox))
			return PTR_ERR(mailbox);

			memcpy(mailbox->buf, config_dev, sizeof(*config_dev));

			err = mlx4_cmd(dev, mailbox->dma, 0, 0, MLX4_CMD_CONFIG_DEV,
			MLX4_CMD_TIME_CLASS_B, MLX4_CMD_NATIVE);

			mlx4_free_cmd_mailbox(dev, mailbox);
			return err;
			}

			int mlx4_config_vxlan_port(struct mlx4_dev *dev, __be16 udp_port)
			{
			struct mlx4_config_dev config_dev;

			memset(&config_dev, 0, sizeof(config_dev));
			config_dev.update_flags = cpu_to_be32(MLX4_VXLAN_UDP_DPORT);
			config_dev.vxlan_udp_dport = udp_port;

			return mlx4_CONFIG_DEV(dev, &config_dev);
			}
			EXPORT_SYMBOL_GPL(mlx4_config_vxlan_port);


	int mlx4_SET_ICM_SIZE(struct mlx4_dev dev, u64 icm_size, u64 aux_pages)		int mlx4_SET_ICM_SIZE(struct mlx4_dev dev, u64 icm_size, u64 aux_pages)
	{		{
	int ret = mlx4_cmd_imm(dev, icm_size, aux_pages, 0, 0,		int ret = mlx4_cmd_imm(dev, icm_size, aux_pages, 0, 0,

drivers/net/ethernet/mellanox/mlx4/mlx4.h

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -1247,11 +1247,6 @@ int mlx4_QP_FLOW_STEERING_DETACH_wrapper(struct mlx4_dev *dev, int slave,
	struct mlx4_cmd_mailbox *inbox,		struct mlx4_cmd_mailbox *inbox,
	struct mlx4_cmd_mailbox *outbox,		struct mlx4_cmd_mailbox *outbox,
	struct mlx4_cmd_info *cmd);		struct mlx4_cmd_info *cmd);
	int mlx4_FLOW_STEERING_IB_UC_QP_RANGE_wrapper(struct mlx4_dev *dev, int slave,
	struct mlx4_vhcr *vhcr,
	struct mlx4_cmd_mailbox *inbox,
	struct mlx4_cmd_mailbox *outbox,
	struct mlx4_cmd_info *cmd);

	int mlx4_get_mgm_entry_size(struct mlx4_dev *dev);		int mlx4_get_mgm_entry_size(struct mlx4_dev *dev);
	int mlx4_get_qp_per_mgm(struct mlx4_dev *dev);		int mlx4_get_qp_per_mgm(struct mlx4_dev *dev);

drivers/net/ethernet/mellanox/mlx4/mlx4_en.h

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -559,6 +559,8 @@ struct mlx4_en_priv {
	struct work_struct linkstate_task;		struct work_struct linkstate_task;
	struct delayed_work stats_task;		struct delayed_work stats_task;
	struct delayed_work service_task;		struct delayed_work service_task;
			struct work_struct vxlan_add_task;
			struct work_struct vxlan_del_task;
	struct mlx4_en_perf_stats pstats;		struct mlx4_en_perf_stats pstats;
	struct mlx4_en_pkt_stats pkstats;		struct mlx4_en_pkt_stats pkstats;
	struct mlx4_en_port_stats port_stats;		struct mlx4_en_port_stats port_stats;
	@@ -585,6 +587,7 @@ struct mlx4_en_priv {
	struct hlist_head filter_hash[1 << MLX4_EN_FILTER_HASH_SHIFT];		struct hlist_head filter_hash[1 << MLX4_EN_FILTER_HASH_SHIFT];
	#endif		#endif
	u64 tunnel_reg_id;		u64 tunnel_reg_id;
			__be16 vxlan_port;
	};		};

	enum mlx4_en_wol {		enum mlx4_en_wol {