diff options
author | Jack Morgenstein <jackm@mellanox.co.il> | 2005-09-26 15:30:02 -0400 |
---|---|---|
committer | Roland Dreier <rolandd@cisco.com> | 2005-10-17 18:20:24 -0400 |
commit | 33033b797225553e48ca68d8d8dc5e64ec22e02b (patch) | |
tree | f76970269a0a16eb6b301f3d048af7670232d652 /drivers/infiniband | |
parent | 0c33aeedb2cf99d877ad9adc7c3df07870f60293 (diff) |
[IB] mthca: Report correct atomic capability
Return correct atomic capability flag from mthca query function.
Signed-off-by: Jack Morgenstein <jackm@mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband')
-rw-r--r-- | drivers/infiniband/hw/mthca/mthca_dev.h | 1 | ||||
-rw-r--r-- | drivers/infiniband/hw/mthca/mthca_main.c | 1 | ||||
-rw-r--r-- | drivers/infiniband/hw/mthca/mthca_provider.c | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/drivers/infiniband/hw/mthca/mthca_dev.h b/drivers/infiniband/hw/mthca/mthca_dev.h index 7bff5a8425f4..67a2f324a274 100644 --- a/drivers/infiniband/hw/mthca/mthca_dev.h +++ b/drivers/infiniband/hw/mthca/mthca_dev.h | |||
@@ -148,6 +148,7 @@ struct mthca_limits { | |||
148 | int reserved_mcgs; | 148 | int reserved_mcgs; |
149 | int num_pds; | 149 | int num_pds; |
150 | int reserved_pds; | 150 | int reserved_pds; |
151 | u32 flags; | ||
151 | u8 port_width_cap; | 152 | u8 port_width_cap; |
152 | }; | 153 | }; |
153 | 154 | ||
diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c index 23a3f56c7899..576e7fcd053c 100644 --- a/drivers/infiniband/hw/mthca/mthca_main.c +++ b/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 | |||
172 | mdev->limits.reserved_uars = dev_lim->reserved_uars; | 172 | mdev->limits.reserved_uars = dev_lim->reserved_uars; |
173 | mdev->limits.reserved_pds = dev_lim->reserved_pds; | 173 | mdev->limits.reserved_pds = dev_lim->reserved_pds; |
174 | mdev->limits.port_width_cap = dev_lim->max_port_width; | 174 | mdev->limits.port_width_cap = dev_lim->max_port_width; |
175 | mdev->limits.flags = dev_lim->flags; | ||
175 | 176 | ||
176 | /* IB_DEVICE_RESIZE_MAX_WR not supported by driver. | 177 | /* IB_DEVICE_RESIZE_MAX_WR not supported by driver. |
177 | May be doable since hardware supports it for SRQ. | 178 | May be doable since hardware supports it for SRQ. |
diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c index 3f5319a46577..141509dced7e 100644 --- a/drivers/infiniband/hw/mthca/mthca_provider.c +++ b/drivers/infiniband/hw/mthca/mthca_provider.c | |||
@@ -99,6 +99,8 @@ static int mthca_query_device(struct ib_device *ibdev, | |||
99 | props->max_qp_rd_atom = 1 << mdev->qp_table.rdb_shift; | 99 | props->max_qp_rd_atom = 1 << mdev->qp_table.rdb_shift; |
100 | props->max_qp_init_rd_atom = 1 << mdev->qp_table.rdb_shift; | 100 | props->max_qp_init_rd_atom = 1 << mdev->qp_table.rdb_shift; |
101 | props->local_ca_ack_delay = mdev->limits.local_ca_ack_delay; | 101 | props->local_ca_ack_delay = mdev->limits.local_ca_ack_delay; |
102 | props->atomic_cap = mdev->limits.flags & DEV_LIM_FLAG_ATOMIC ? | ||
103 | IB_ATOMIC_HCA : IB_ATOMIC_NONE; | ||
102 | 104 | ||
103 | err = 0; | 105 | err = 0; |
104 | out: | 106 | out: |