From 077aa18d08fa49f79ae9f7d09e8ceece29ba988d Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Mon, 14 Jul 2008 23:48:49 -0700 Subject: [PATCH] --- yaml --- r: 101039 b: refs/heads/master c: 52c8084b740c42af27d5bfa62cec7079d12fbc2b h: refs/heads/master i: 101037: 7c66044f552e7cf450ecbb49255214a5883fb9c3 101035: fd8c3aaf6446679185c412bbb32f6af2385e1aef 101031: 56f57437a011a11267eb4d8a2d29533d45585cd6 101023: 7e191be5f51fe7881348593a1506a0317d325786 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/cxgb3/cxio_hal.h | 1 + trunk/drivers/infiniband/hw/cxgb3/iwch.c | 2 +- trunk/drivers/infiniband/hw/cxgb3/iwch_provider.c | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2f935eaa5d89..04ab3c233638 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1ff66e8c1faee7c2711b84b9c89e1c5fcd767839 +refs/heads/master: 52c8084b740c42af27d5bfa62cec7079d12fbc2b diff --git a/trunk/drivers/infiniband/hw/cxgb3/cxio_hal.h b/trunk/drivers/infiniband/hw/cxgb3/cxio_hal.h index a9ff32c36211..656fe47bc84f 100644 --- a/trunk/drivers/infiniband/hw/cxgb3/cxio_hal.h +++ b/trunk/drivers/infiniband/hw/cxgb3/cxio_hal.h @@ -55,6 +55,7 @@ #define T3_MAX_CQ_DEPTH 8192 #define T3_MAX_NUM_STAG (1<<15) #define T3_MAX_MR_SIZE 0x100000000ULL +#define T3_PAGESIZE_MASK 0xffff000 /* 4KB-128MB */ #define T3_STAG_UNSET 0xffffffff diff --git a/trunk/drivers/infiniband/hw/cxgb3/iwch.c b/trunk/drivers/infiniband/hw/cxgb3/iwch.c index 06086256ca1d..4489c89d6710 100644 --- a/trunk/drivers/infiniband/hw/cxgb3/iwch.c +++ b/trunk/drivers/infiniband/hw/cxgb3/iwch.c @@ -80,7 +80,7 @@ static void rnic_init(struct iwch_dev *rnicp) rnicp->attr.max_mem_regs = cxio_num_stags(&rnicp->rdev); rnicp->attr.max_phys_buf_entries = T3_MAX_PBL_SIZE; rnicp->attr.max_pds = T3_MAX_NUM_PD - 1; - rnicp->attr.mem_pgsizes_bitmask = 0x7FFF; /* 4KB-128MB */ + rnicp->attr.mem_pgsizes_bitmask = T3_PAGESIZE_MASK; rnicp->attr.max_mr_size = T3_MAX_MR_SIZE; rnicp->attr.can_resize_wq = 0; rnicp->attr.max_rdma_reads_per_qp = 8; diff --git a/trunk/drivers/infiniband/hw/cxgb3/iwch_provider.c b/trunk/drivers/infiniband/hw/cxgb3/iwch_provider.c index 18a6609f5e01..249d99f4a3cb 100644 --- a/trunk/drivers/infiniband/hw/cxgb3/iwch_provider.c +++ b/trunk/drivers/infiniband/hw/cxgb3/iwch_provider.c @@ -1130,6 +1130,7 @@ static int iwch_query_device(struct ib_device *ibdev, props->hw_ver = dev->rdev.t3cdev_p->type; props->fw_ver = fw_vers_string_to_u64(dev); props->device_cap_flags = dev->device_cap_flags; + props->page_size_cap = dev->attr.mem_pgsizes_bitmask; props->vendor_id = (u32)dev->rdev.rnic_info.pdev->vendor; props->vendor_part_id = (u32)dev->rdev.rnic_info.pdev->device; props->max_mr_size = dev->attr.max_mr_size;