From: Jack Morgenstein Date: Thu, 15 Nov 2012 16:01:30 +0000 (+0200) Subject: mlx4_ib: Do not enable blueflame sends if write combining is not available X-Git-Tag: v4.1.12-92~319^2^2~6^2~13 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=06cb7e82c9bdc0ffb3aabe598d2b3ad705438935;p=users%2Fjedix%2Flinux-maple.git mlx4_ib: Do not enable blueflame sends if write combining is not available V2: adjusted for Or Gerlitz' 64-byte CQE patch Signed-off-by: Jack Morgenstein Signed-off-by: Vladimir Sokolovsky (Ported from Mellanox OFED 2.4) Signed-off-by: Mukesh Kacker --- diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c index b5a1b037c9a4..9ff3e3a9d917 100644 --- a/drivers/infiniband/hw/mlx4/main.c +++ b/drivers/infiniband/hw/mlx4/main.c @@ -644,13 +644,23 @@ static struct ib_ucontext *mlx4_ib_alloc_ucontext(struct ib_device *ibdev, if (ibdev->uverbs_abi_ver == MLX4_IB_UVERBS_NO_DEV_CAPS_ABI_VERSION) { resp_v3.qp_tab_size = dev->dev->caps.num_qps; - resp_v3.bf_reg_size = dev->dev->caps.bf_reg_size; - resp_v3.bf_regs_per_page = dev->dev->caps.bf_regs_per_page; + if (mlx4_wc_enabled()) { + resp_v3.bf_reg_size = dev->dev->caps.bf_reg_size; + resp_v3.bf_regs_per_page = dev->dev->caps.bf_regs_per_page; + } else { + resp_v3.bf_reg_size = 0; + resp_v3.bf_regs_per_page = 0; + } } else { resp.dev_caps = dev->dev->caps.userspace_caps; resp.qp_tab_size = dev->dev->caps.num_qps; - resp.bf_reg_size = dev->dev->caps.bf_reg_size; - resp.bf_regs_per_page = dev->dev->caps.bf_regs_per_page; + if (mlx4_wc_enabled()) { + resp.bf_reg_size = dev->dev->caps.bf_reg_size; + resp.bf_regs_per_page = dev->dev->caps.bf_regs_per_page; + } else { + resp.bf_reg_size = 0; + resp.bf_regs_per_page = 0; + } resp.cqe_size = dev->dev->caps.cqe_size; }