فهرست منبع

[IB] mthca: correct modify QP attribute masks for UC

The UC transport does not support RDMA reads or atomic operations, so
we shouldn't require or even allow the consumer to set attributes
relating to these operations for UC QPs.

Signed-off-by: Roland Dreier <rolandd@cisco.com>
Roland Dreier 19 سال پیش
والد
کامیت
547e309073
1فایلهای تغییر یافته به همراه3 افزوده شده و 7 حذف شده
  1. 3 7
      drivers/infiniband/hw/mthca/mthca_qp.c

+ 3 - 7
drivers/infiniband/hw/mthca/mthca_qp.c

@@ -338,8 +338,7 @@ static const struct {
 				[UC]  = (IB_QP_AV                  |
 				[UC]  = (IB_QP_AV                  |
 					 IB_QP_PATH_MTU            |
 					 IB_QP_PATH_MTU            |
 					 IB_QP_DEST_QPN            |
 					 IB_QP_DEST_QPN            |
-					 IB_QP_RQ_PSN              |
-					 IB_QP_MAX_DEST_RD_ATOMIC),
+					 IB_QP_RQ_PSN),
 				[RC]  = (IB_QP_AV                  |
 				[RC]  = (IB_QP_AV                  |
 					 IB_QP_PATH_MTU            |
 					 IB_QP_PATH_MTU            |
 					 IB_QP_DEST_QPN            |
 					 IB_QP_DEST_QPN            |
@@ -368,8 +367,7 @@ static const struct {
 			.trans = MTHCA_TRANS_RTR2RTS,
 			.trans = MTHCA_TRANS_RTR2RTS,
 			.req_param = {
 			.req_param = {
 				[UD]  = IB_QP_SQ_PSN,
 				[UD]  = IB_QP_SQ_PSN,
-				[UC]  = (IB_QP_SQ_PSN            |
-					 IB_QP_MAX_QP_RD_ATOMIC),
+				[UC]  = IB_QP_SQ_PSN,
 				[RC]  = (IB_QP_TIMEOUT           |
 				[RC]  = (IB_QP_TIMEOUT           |
 					 IB_QP_RETRY_CNT         |
 					 IB_QP_RETRY_CNT         |
 					 IB_QP_RNR_RETRY         |
 					 IB_QP_RNR_RETRY         |
@@ -446,8 +444,6 @@ static const struct {
 				[UD]  = (IB_QP_PKEY_INDEX            |
 				[UD]  = (IB_QP_PKEY_INDEX            |
 					 IB_QP_QKEY),
 					 IB_QP_QKEY),
 				[UC]  = (IB_QP_AV                    |
 				[UC]  = (IB_QP_AV                    |
-					 IB_QP_MAX_QP_RD_ATOMIC      |
-					 IB_QP_MAX_DEST_RD_ATOMIC    |
 					 IB_QP_CUR_STATE             |
 					 IB_QP_CUR_STATE             |
 					 IB_QP_ALT_PATH              |
 					 IB_QP_ALT_PATH              |
 					 IB_QP_ACCESS_FLAGS          |
 					 IB_QP_ACCESS_FLAGS          |
@@ -478,7 +474,7 @@ static const struct {
 			.opt_param = {
 			.opt_param = {
 				[UD]  = (IB_QP_CUR_STATE             |
 				[UD]  = (IB_QP_CUR_STATE             |
 					 IB_QP_QKEY),
 					 IB_QP_QKEY),
-				[UC]  = (IB_QP_CUR_STATE),
+				[UC]  = IB_QP_CUR_STATE,
 				[RC]  = (IB_QP_CUR_STATE             |
 				[RC]  = (IB_QP_CUR_STATE             |
 					 IB_QP_MIN_RNR_TIMER),
 					 IB_QP_MIN_RNR_TIMER),
 				[MLX] = (IB_QP_CUR_STATE             |
 				[MLX] = (IB_QP_CUR_STATE             |