diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-07-18 17:16:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-07-18 17:16:22 -0700 |
| commit | ca85855bdcae8f84f1512e88b4c75009ea17ea2f (patch) | |
| tree | 9b6af08842dd083f9ee7c9ec2fb21493c0042c71 /drivers/infiniband/hw/irdma/irdma.h | |
| parent | 80e19f34c2887a8881084b7bb7480e9544d56b91 (diff) | |
| parent | cc0315564d6eec91c716d314b743321be24c70b3 (diff) | |
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma
Pull rdma fixes from Jason Gunthorpe:
"Two bug fixes for irdma:
- x722 does not support 1GB pages, trying to configure them will
corrupt the dma mapping
- Fix a sleep while holding a spinlock"
* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
RDMA/irdma: Fix sleep from invalid context BUG
RDMA/irdma: Do not advertise 1GB page size for x722
Diffstat (limited to 'drivers/infiniband/hw/irdma/irdma.h')
| -rw-r--r-- | drivers/infiniband/hw/irdma/irdma.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/infiniband/hw/irdma/irdma.h b/drivers/infiniband/hw/irdma/irdma.h index 46c12334c735..4789e85d717b 100644 --- a/drivers/infiniband/hw/irdma/irdma.h +++ b/drivers/infiniband/hw/irdma/irdma.h @@ -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; |