Commit 5e8afb87 authored by Mustafa Ismail's avatar Mustafa Ismail Committed by Jason Gunthorpe
Browse files

RDMA/irdma: Do not advertise 1GB page size for x722 



x722 does not support 1GB page size but the irdma driver incorrectly
advertises 1GB page size support for x722 device to ib_core to compute the
best page size to use on this MR.  This could lead to incorrect start
offsets computed by hardware on the MR.

Fixes: b48c24c2 ("RDMA/irdma: Implement device supported verb APIs")
Signed-off-by: default avatarMustafa Ismail <mustafa.ismail@intel.com>
Signed-off-by: default avatarShiraz Saleem <shiraz.saleem@intel.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 32346491

drivers/infiniband/hw/irdma/i40iw_hw.c

+1 −0
Original line number Diff line number Diff line
@@ -201,6 +201,7 @@ void i40iw_init_hw(struct irdma_sc_dev *dev) 
	dev->hw_attrs.uk_attrs.max_hw_read_sges = I40IW_MAX_SGE_RD;

	dev->hw_attrs.max_hw_device_pages = I40IW_MAX_PUSH_PAGE_COUNT;

	dev->hw_attrs.uk_attrs.max_hw_inline = I40IW_MAX_INLINE_DATA_SIZE;

	dev->hw_attrs.page_size_cap = SZ_4K | SZ_2M;

	dev->hw_attrs.max_hw_ird = I40IW_MAX_IRD_SIZE;

	dev->hw_attrs.max_hw_ord = I40IW_MAX_ORD_SIZE;

	dev->hw_attrs.max_hw_wqes = I40IW_MAX_WQ_ENTRIES;

drivers/infiniband/hw/irdma/icrdma_hw.c

+1 −0
Original line number Diff line number Diff line
@@ -139,6 +139,7 @@ void icrdma_init_hw(struct irdma_sc_dev *dev) 
	dev->cqp_db = dev->hw_regs[IRDMA_CQPDB];

	dev->cq_ack_db = dev->hw_regs[IRDMA_CQACK];

	dev->irq_ops = &icrdma_irq_ops;

	dev->hw_attrs.page_size_cap = SZ_4K | SZ_2M | SZ_1G;

	dev->hw_attrs.max_hw_ird = ICRDMA_MAX_IRD_SIZE;

	dev->hw_attrs.max_hw_ord = ICRDMA_MAX_ORD_SIZE;

	dev->hw_attrs.max_stat_inst = ICRDMA_MAX_STATS_COUNT;

drivers/infiniband/hw/irdma/irdma.h

+1 −0
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ struct irdma_hw_attrs { 
	u64 max_hw_outbound_msg_size;

	u64 max_hw_inbound_msg_size;

	u64 max_mr_size;

	u64 page_size_cap;

	u32 min_hw_qp_id;

	u32 min_hw_aeq_size;

	u32 max_hw_aeq_size;

drivers/infiniband/hw/irdma/verbs.c

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ static int irdma_query_device(struct ib_device *ibdev, 
	props->vendor_part_id = pcidev->device;



	props->hw_ver = rf->pcidev->revision;

	props->page_size_cap = SZ_4K | SZ_2M | SZ_1G;

	props->page_size_cap = hw_attrs->page_size_cap;

	props->max_mr_size = hw_attrs->max_mr_size;

	props->max_qp = rf->max_qp - rf->used_qps;

	props->max_qp_wr = hw_attrs->max_qp_wr;
@@ -2781,7 +2781,7 @@ static struct ib_mr *irdma_reg_user_mr(struct ib_pd *pd, u64 start, u64 len, 


	if (req.reg_type == IRDMA_MEMREG_TYPE_MEM) {

		iwmr->page_size = ib_umem_find_best_pgsz(region,

							 SZ_4K | SZ_2M | SZ_1G,

							 iwdev->rf->sc_dev.hw_attrs.page_size_cap,

							 virt);

		if (unlikely(!iwmr->page_size)) {

			kfree(iwmr);