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

Commit 7adce751 authored by Roland Dreier's avatar Roland Dreier
Browse files

Merge branches 'misc', 'mlx4' and 'nes' into for-next

parents 91a4d157 21d60609 e3d33cb1

MAINTAINERS

+1 −2
Original line number Diff line number Diff line
@@ -4043,9 +4043,8 @@ F: drivers/scsi/NCR_D700.* 


NETEFFECT IWARP RNIC DRIVER (IW_NES)

M:	Faisal Latif <faisal.latif@intel.com>

M:	Chien Tung <chien.tin.tung@intel.com>

L:	linux-rdma@vger.kernel.org

W:	http://www.neteffect.com

W:	http://www.intel.com/Products/Server/Adapters/Server-Cluster/Server-Cluster-overview.htm

S:	Supported

F:	drivers/infiniband/hw/nes/

drivers/infiniband/hw/mlx4/main.c

+2 −2
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ static int eth_link_query_port(struct ib_device *ibdev, u8 port, 
	struct net_device *ndev;

	enum ib_mtu tmp;



	props->active_width	= IB_WIDTH_4X;

	props->active_width	= IB_WIDTH_1X;

	props->active_speed	= 4;

	props->port_cap_flags	= IB_PORT_CM_SUP;

	props->gid_tbl_len	= to_mdev(ibdev)->dev->caps.gid_table_len[port];
@@ -242,7 +242,7 @@ static int eth_link_query_port(struct ib_device *ibdev, u8 port, 
	tmp = iboe_get_mtu(ndev->mtu);

	props->active_mtu = tmp ? min(props->max_mtu, tmp) : IB_MTU_256;



	props->state		= netif_running(ndev) &&  netif_oper_up(ndev) ?

	props->state		= (netif_running(ndev) && netif_carrier_ok(ndev)) ?

					IB_PORT_ACTIVE : IB_PORT_DOWN;

	props->phys_state	= state_to_phys_state(props->state);

drivers/infiniband/hw/mlx4/qp.c

+5 −5
Original line number Diff line number Diff line
@@ -1816,6 +1816,11 @@ int mlx4_ib_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr, 
		ctrl->fence_size = (wr->send_flags & IB_SEND_FENCE ?

				    MLX4_WQE_CTRL_FENCE : 0) | size;



		if (be16_to_cpu(vlan) < 0x1000) {

			ctrl->ins_vlan = 1 << 6;

			ctrl->vlan_tag = vlan;

		}



		/*

		 * Make sure descriptor is fully written before

		 * setting ownership bit (because HW can start
@@ -1831,11 +1836,6 @@ int mlx4_ib_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr, 
		ctrl->owner_opcode = mlx4_ib_opcode[wr->opcode] |

			(ind & qp->sq.wqe_cnt ? cpu_to_be32(1 << 31) : 0) | blh;



		if (be16_to_cpu(vlan) < 0x1000) {

			ctrl->ins_vlan = 1 << 6;

			ctrl->vlan_tag = vlan;

		}



		stamp = ind + qp->sq_spare_wqes;

		ind += DIV_ROUND_UP(size * 16, 1U << qp->sq.wqe_shift);

drivers/net/mlx4/fw.c

+4 −0
Original line number Diff line number Diff line
@@ -289,6 +289,10 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap) 
		MLX4_GET(field, outbox, QUERY_DEV_CAP_LOG_BF_REG_SZ_OFFSET);

		dev_cap->bf_reg_size = 1 << (field & 0x1f);

		MLX4_GET(field, outbox, QUERY_DEV_CAP_LOG_MAX_BF_REGS_PER_PAGE_OFFSET);

		if ((1 << (field & 0x3f)) > (PAGE_SIZE / dev_cap->bf_reg_size)) {

			mlx4_warn(dev, "firmware bug: log2 # of blue flame regs is invalid (%d), forcing 3\n", field & 0x1f);

			field = 3;

		}

		dev_cap->bf_regs_per_page = 1 << (field & 0x3f);

		mlx4_dbg(dev, "BlueFlame available (reg size %d, regs/page %d)\n",

			 dev_cap->bf_reg_size, dev_cap->bf_regs_per_page);