From 82af45b45f2b3481868b15eef8ffd41b01633f5c Mon Sep 17 00:00:00 2001 From: Jack Morgenstein Date: Mon, 26 Sep 2005 12:30:02 -0700 Subject: [PATCH] --- yaml --- r: 10695 b: refs/heads/master c: 33033b797225553e48ca68d8d8dc5e64ec22e02b h: refs/heads/master i: 10693: 8a82c106ab7cedca0c9ef5630c92e8bfc4d19043 10691: 4baae5f6ae1d142fbeedb3010666ed2335f1f6c1 10687: bd9089edc40b9e2b26709bad6fca4448ebd98411 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/mthca/mthca_dev.h | 1 + trunk/drivers/infiniband/hw/mthca/mthca_main.c | 1 + trunk/drivers/infiniband/hw/mthca/mthca_provider.c | 2 ++ 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 27bea5c9903b..6759c837d794 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0c33aeedb2cf99d877ad9adc7c3df07870f60293 +refs/heads/master: 33033b797225553e48ca68d8d8dc5e64ec22e02b diff --git a/trunk/drivers/infiniband/hw/mthca/mthca_dev.h b/trunk/drivers/infiniband/hw/mthca/mthca_dev.h index 7bff5a8425f4..67a2f324a274 100644 --- a/trunk/drivers/infiniband/hw/mthca/mthca_dev.h +++ b/trunk/drivers/infiniband/hw/mthca/mthca_dev.h @@ -148,6 +148,7 @@ struct mthca_limits { int reserved_mcgs; int num_pds; int reserved_pds; + u32 flags; u8 port_width_cap; }; diff --git a/trunk/drivers/infiniband/hw/mthca/mthca_main.c b/trunk/drivers/infiniband/hw/mthca/mthca_main.c index 23a3f56c7899..576e7fcd053c 100644 --- a/trunk/drivers/infiniband/hw/mthca/mthca_main.c +++ b/trunk/drivers/infiniband/hw/mthca/mthca_main.c @@ -172,6 +172,7 @@ static int __devinit mthca_dev_lim(struct mthca_dev *mdev, struct mthca_dev_lim mdev->limits.reserved_uars = dev_lim->reserved_uars; mdev->limits.reserved_pds = dev_lim->reserved_pds; mdev->limits.port_width_cap = dev_lim->max_port_width; + mdev->limits.flags = dev_lim->flags; /* IB_DEVICE_RESIZE_MAX_WR not supported by driver. May be doable since hardware supports it for SRQ. diff --git a/trunk/drivers/infiniband/hw/mthca/mthca_provider.c b/trunk/drivers/infiniband/hw/mthca/mthca_provider.c index 3f5319a46577..141509dced7e 100644 --- a/trunk/drivers/infiniband/hw/mthca/mthca_provider.c +++ b/trunk/drivers/infiniband/hw/mthca/mthca_provider.c @@ -99,6 +99,8 @@ static int mthca_query_device(struct ib_device *ibdev, props->max_qp_rd_atom = 1 << mdev->qp_table.rdb_shift; props->max_qp_init_rd_atom = 1 << mdev->qp_table.rdb_shift; props->local_ca_ack_delay = mdev->limits.local_ca_ack_delay; + props->atomic_cap = mdev->limits.flags & DEV_LIM_FLAG_ATOMIC ? + IB_ATOMIC_HCA : IB_ATOMIC_NONE; err = 0; out: