47 lines
1.7 KiB
Diff
47 lines
1.7 KiB
Diff
From 84193e72c505286e4681b3c566c64eea3e25f7fd Mon Sep 17 00:00:00 2001
|
|
From: Lijun Ou <oulijun@huawei.com>
|
|
Date: Wed, 12 Dec 2018 17:49:08 +0800
|
|
Subject: [PATCH 29/31] RDMA/hns: Add constraint on the setting of local ACK
|
|
timeout
|
|
Origin: https://git.kernel.org/linus/44754b95dd35ee07c462b5425ae9c4cde8c7e7c8
|
|
|
|
According to IB protocol, local ACK timeout shall be a 5 bit
|
|
value. Currently, hip08 could not support the possible max value 31. Fail
|
|
the request in this case.
|
|
|
|
Signed-off-by: Yixian Liu <liuyixian@huawei.com>
|
|
Signed-off-by: Lijun Ou <oulijun@huawei.com>
|
|
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
|
|
---
|
|
drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 14 ++++++++++----
|
|
1 file changed, 10 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
|
|
index c7843d9817de..627f77a6e0a9 100644
|
|
--- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
|
|
+++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
|
|
@@ -3398,10 +3398,16 @@ static int modify_qp_rtr_to_rts(struct ib_qp *ibqp,
|
|
V2_QPC_BYTE_212_LSN_S, 0);
|
|
|
|
if (attr_mask & IB_QP_TIMEOUT) {
|
|
- roce_set_field(context->byte_28_at_fl, V2_QPC_BYTE_28_AT_M,
|
|
- V2_QPC_BYTE_28_AT_S, attr->timeout);
|
|
- roce_set_field(qpc_mask->byte_28_at_fl, V2_QPC_BYTE_28_AT_M,
|
|
- V2_QPC_BYTE_28_AT_S, 0);
|
|
+ if (attr->timeout < 31) {
|
|
+ roce_set_field(context->byte_28_at_fl,
|
|
+ V2_QPC_BYTE_28_AT_M, V2_QPC_BYTE_28_AT_S,
|
|
+ attr->timeout);
|
|
+ roce_set_field(qpc_mask->byte_28_at_fl,
|
|
+ V2_QPC_BYTE_28_AT_M, V2_QPC_BYTE_28_AT_S,
|
|
+ 0);
|
|
+ } else {
|
|
+ dev_warn(dev, "Local ACK timeout shall be 0 to 30.\n");
|
|
+ }
|
|
}
|
|
|
|
roce_set_field(context->byte_172_sq_psn, V2_QPC_BYTE_172_SQ_CUR_PSN_M,
|
|
--
|
|
2.20.1
|
|
|