From: tzachid <tzachid@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Date: Tue, 8 Jul 2008 14:36:14 +0000 (+0000)
Subject: [IPOIB, MLX4] Enabling the use of 4K MTU on ipoib.
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=8ed2edf3edec849a28aff358de43662792622827;p=~shefty%2Frdma-win.git

[IPOIB, MLX4] Enabling the use of 4K MTU on ipoib.

git-svn-id: svn://openib.tc.cornell.edu/gen1@1342 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86
---

diff --git a/trunk/hw/mlx4/kernel/bus/ib/qp.c b/trunk/hw/mlx4/kernel/bus/ib/qp.c
index 7cb32442..6ab2e283 100644
--- a/trunk/hw/mlx4/kernel/bus/ib/qp.c
+++ b/trunk/hw/mlx4/kernel/bus/ib/qp.c
@@ -769,7 +769,7 @@ static int __mlx4_ib_modify_qp(struct ib_qp *ibqp,
 
 	if (ibqp->qp_type == IB_QPT_GSI || ibqp->qp_type == IB_QPT_SMI ||
 	    ibqp->qp_type == IB_QPT_UD)
-		context->mtu_msgmax = (IB_MTU_4096 << 5) | 11;
+		context->mtu_msgmax = (IB_MTU_4096 << 5) | 12;
 	else if (attr_mask & IB_QP_PATH_MTU) {
 		if (attr->path_mtu < IB_MTU_256 || attr->path_mtu > IB_MTU_4096) {
 			printk(KERN_ERR "path MTU (%u) is invalid\n",
diff --git a/trunk/ulp/ipoib/kernel/ipoib_driver.c b/trunk/ulp/ipoib/kernel/ipoib_driver.c
index 9d7f75f8..0563bca9 100644
--- a/trunk/ulp/ipoib/kernel/ipoib_driver.c
+++ b/trunk/ulp/ipoib/kernel/ipoib_driver.c
@@ -152,7 +152,7 @@ IPOIB_REG_ENTRY HCARegTable[] = {
 	{NDIS_STRING_CONST("SaTimeout"),        1, IPOIB_OFFSET(sa_timeout),            IPOIB_SIZE(sa_timeout),         1000,       250,    UINT_MAX},
 	{NDIS_STRING_CONST("SaRetries"),        1, IPOIB_OFFSET(sa_retry_cnt),          IPOIB_SIZE(sa_retry_cnt),       10,         1,      UINT_MAX},
 	{NDIS_STRING_CONST("RecvRatio"),        1, IPOIB_OFFSET(recv_pool_ratio),       IPOIB_SIZE(recv_pool_ratio),    1,          1,      10},
-	{NDIS_STRING_CONST("PayloadMtu"),       1, IPOIB_OFFSET(payload_mtu),           IPOIB_SIZE(payload_mtu),        2044,         60,   2044}
+	{NDIS_STRING_CONST("PayloadMtu"),       1, IPOIB_OFFSET(payload_mtu),           IPOIB_SIZE(payload_mtu),        2044,         60,   4092}
 };  
 
 #define IPOIB_NUM_REG_PARAMS (sizeof (HCARegTable) / sizeof(IPOIB_REG_ENTRY))
diff --git a/trunk/ulp/ipoib/kernel/ipoib_driver.h b/trunk/ulp/ipoib/kernel/ipoib_driver.h
index b80cb5ac..32d769ab 100644
--- a/trunk/ulp/ipoib/kernel/ipoib_driver.h
+++ b/trunk/ulp/ipoib/kernel/ipoib_driver.h
@@ -47,8 +47,8 @@
  */
 #define MAX_BUNDLE_ID_LENGTH	32
 
-
-#define IB_MTU			2048
+/* MLX4 supports 4K MTU */
+#define IB_MTU			4096
 /*
  * Header length as defined by IPoIB spec:
  * http://www.ietf.org/internet-drafts/draft-ietf-ipoib-ip-over-infiniband-04.txt
diff --git a/trunk/ulp/ipoib/kernel/netipoib.inf b/trunk/ulp/ipoib/kernel/netipoib.inf
index 6394e8ed..ef377b4a 100644
--- a/trunk/ulp/ipoib/kernel/netipoib.inf
+++ b/trunk/ulp/ipoib/kernel/netipoib.inf
@@ -124,7 +124,7 @@ HKR, Ndi\Params\PayloadMtu,		ParamDesc,	0, "Payload Mtu size"
 HKR, Ndi\Params\PayloadMtu,		Type,		0, "dword"
 HKR, Ndi\Params\PayloadMtu,		Default,	0, "2044"
 HKR, Ndi\Params\PayloadMtu,		Min,		0, "60"
-HKR, Ndi\Params\PayloadMtu,		Max,		0, "2044"
+HKR, Ndi\Params\PayloadMtu,		Max,		0, "4092"
 
 [IpoibService]
 DisplayName     = %IpoibServiceDispName%