Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e400b797 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mlx4-misc-fixes' 



Tariq Toukan says:

====================
mlx4 misc fixes

This patchset contains several bug fixes from the team to the
mlx4 Eth and Core drivers.

Series generated against net commit:
60133867 'net: wan: slic_ds26522: fix spelling mistake: "configurated" -> "configured"'
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f0c16ba8 10b1c04e

drivers/infiniband/hw/mlx4/main.c

+12 −2
Original line number Diff line number Diff line
@@ -1682,9 +1682,19 @@ static int __mlx4_ib_create_flow(struct ib_qp *qp, struct ib_flow_attr *flow_att 
		size += ret;

	}



	if (mlx4_is_master(mdev->dev) && flow_type == MLX4_FS_REGULAR &&

	    flow_attr->num_of_specs == 1) {

		struct _rule_hw *rule_header = (struct _rule_hw *)(ctrl + 1);

		enum ib_flow_spec_type header_spec =

			((union ib_flow_spec *)(flow_attr + 1))->type;



		if (header_spec == IB_FLOW_SPEC_ETH)

			mlx4_handle_eth_header_mcast_prio(ctrl, rule_header);

	}



	ret = mlx4_cmd_imm(mdev->dev, mailbox->dma, reg_id, size >> 2, 0,

			   MLX4_QP_FLOW_STEERING_ATTACH, MLX4_CMD_TIME_CLASS_A,

			   MLX4_CMD_WRAPPED);

			   MLX4_CMD_NATIVE);

	if (ret == -ENOMEM)

		pr_err("mcg table is full. Fail to register network rule.\n");

	else if (ret == -ENXIO)
@@ -1701,7 +1711,7 @@ static int __mlx4_ib_destroy_flow(struct mlx4_dev *dev, u64 reg_id) 
	int err;

	err = mlx4_cmd(dev, reg_id, 0, 0,

		       MLX4_QP_FLOW_STEERING_DETACH, MLX4_CMD_TIME_CLASS_A,

		       MLX4_CMD_WRAPPED);

		       MLX4_CMD_NATIVE);

	if (err)

		pr_err("Fail to detach network rule. registration id = 0x%llx\n",

		       reg_id);

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

+2 −6
Original line number Diff line number Diff line
@@ -245,13 +245,9 @@ static u32 freq_to_shift(u16 freq) 
{

	u32 freq_khz = freq * 1000;

	u64 max_val_cycles = freq_khz * 1000 * MLX4_EN_WRAP_AROUND_SEC;

	u64 tmp_rounded =

		roundup_pow_of_two(max_val_cycles) > max_val_cycles ?

		roundup_pow_of_two(max_val_cycles) - 1 : UINT_MAX;

	u64 max_val_cycles_rounded = is_power_of_2(max_val_cycles + 1) ?

		max_val_cycles : tmp_rounded;

	u64 max_val_cycles_rounded = 1ULL << fls64(max_val_cycles - 1);

	/* calculate max possible multiplier in order to fit in 64bit */

	u64 max_mul = div_u64(0xffffffffffffffffULL, max_val_cycles_rounded);

	u64 max_mul = div64_u64(ULLONG_MAX, max_val_cycles_rounded);



	/* This comes from the reverse of clocksource_khz2mult */

	return ilog2(div_u64(max_mul * freq_khz, 1000000));

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

+7 −1
Original line number Diff line number Diff line
@@ -445,8 +445,14 @@ int mlx4_en_activate_rx_rings(struct mlx4_en_priv *priv) 
		ring->cqn = priv->rx_cq[ring_ind]->mcq.cqn;



		ring->stride = stride;

		if (ring->stride <= TXBB_SIZE)

		if (ring->stride <= TXBB_SIZE) {

			/* Stamp first unused send wqe */

			__be32 *ptr = (__be32 *)ring->buf;

			__be32 stamp = cpu_to_be32(1 << STAMP_SHIFT);

			*ptr = stamp;

			/* Move pointer to start of rx section */

			ring->buf += TXBB_SIZE;

		}



		ring->log_stride = ffs(ring->stride) - 1;

		ring->buf_size = ring->size * ring->stride;

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

+6 −1
Original line number Diff line number Diff line
@@ -118,8 +118,13 @@ static int mlx4_alloc_icm_coherent(struct device *dev, struct scatterlist *mem, 
	if (!buf)

		return -ENOMEM;



	if (offset_in_page(buf)) {

		dma_free_coherent(dev, PAGE_SIZE << order,

				  buf, sg_dma_address(mem));

		return -ENOMEM;

	}



	sg_set_buf(mem, buf, PAGE_SIZE << order);

	BUG_ON(mem->offset);

	sg_dma_len(mem) = PAGE_SIZE << order;

	return 0;

}

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

+18 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#include <linux/io-mapping.h>

#include <linux/delay.h>

#include <linux/kmod.h>

#include <linux/etherdevice.h>

#include <net/devlink.h>



#include <linux/mlx4/device.h>
@@ -782,6 +783,23 @@ int mlx4_is_slave_active(struct mlx4_dev *dev, int slave) 
}

EXPORT_SYMBOL(mlx4_is_slave_active);



void mlx4_handle_eth_header_mcast_prio(struct mlx4_net_trans_rule_hw_ctrl *ctrl,

				       struct _rule_hw *eth_header)

{

	if (is_multicast_ether_addr(eth_header->eth.dst_mac) ||

	    is_broadcast_ether_addr(eth_header->eth.dst_mac)) {

		struct mlx4_net_trans_rule_hw_eth *eth =

			(struct mlx4_net_trans_rule_hw_eth *)eth_header;

		struct _rule_hw *next_rule = (struct _rule_hw *)(eth + 1);

		bool last_rule = next_rule->size == 0 && next_rule->id == 0 &&

			next_rule->rsvd == 0;



		if (last_rule)

			ctrl->prio = cpu_to_be16(MLX4_DOMAIN_NIC);

	}

}

EXPORT_SYMBOL(mlx4_handle_eth_header_mcast_prio);



static void slave_adjust_steering_mode(struct mlx4_dev *dev,

				       struct mlx4_dev_cap *dev_cap,

				       struct mlx4_init_hca_param *hca_param)