[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 7cb324428a183a60341ae40491afff7c7ace415c..6ab2e283b6283a70e3614ee103d5d268be012a6c 100644 (file)
--- 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 9d7f75f84b829a973263d74d93493585406cc8ce..0563bca97a253ba8caf81abc29407f0ef8d055c5 100644 (file)
--- 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},\r
        {NDIS_STRING_CONST("SaRetries"),        1, IPOIB_OFFSET(sa_retry_cnt),          IPOIB_SIZE(sa_retry_cnt),       10,         1,      UINT_MAX},\r
        {NDIS_STRING_CONST("RecvRatio"),        1, IPOIB_OFFSET(recv_pool_ratio),       IPOIB_SIZE(recv_pool_ratio),    1,          1,      10},\r
-       {NDIS_STRING_CONST("PayloadMtu"),       1, IPOIB_OFFSET(payload_mtu),           IPOIB_SIZE(payload_mtu),        2044,         60,   2044}\r
+       {NDIS_STRING_CONST("PayloadMtu"),       1, IPOIB_OFFSET(payload_mtu),           IPOIB_SIZE(payload_mtu),        2044,         60,   4092}\r
 };  \r
 \r
 #define IPOIB_NUM_REG_PARAMS (sizeof (HCARegTable) / sizeof(IPOIB_REG_ENTRY))\r

diff --git a/trunk/ulp/ipoib/kernel/ipoib_driver.h b/trunk/ulp/ipoib/kernel/ipoib_driver.h
index b80cb5acd303f0a93443454007184016cb7da647..32d769ab4506bec82a5dd6bef33babf1f92410e0 100644 (file)
--- a/trunk/ulp/ipoib/kernel/ipoib_driver.h
+++ b/trunk/ulp/ipoib/kernel/ipoib_driver.h
@@ -47,8 +47,8 @@
  */\r
 #define MAX_BUNDLE_ID_LENGTH   32\r
 \r
-\r
-#define IB_MTU                 2048\r
+/* MLX4 supports 4K MTU */\r
+#define IB_MTU                 4096\r
 /*\r
  * Header length as defined by IPoIB spec:\r
  * http://www.ietf.org/internet-drafts/draft-ietf-ipoib-ip-over-infiniband-04.txt\r

diff --git a/trunk/ulp/ipoib/kernel/netipoib.inf b/trunk/ulp/ipoib/kernel/netipoib.inf
index 6394e8ed84bad48791e7233543c93fdf423ee483..ef377b4a93269b5cf0abeb121622c96ee30b7130 100644 (file)
--- 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"\r
 HKR, Ndi\Params\PayloadMtu,            Default,        0, "2044"\r
 HKR, Ndi\Params\PayloadMtu,            Min,            0, "60"\r
-HKR, Ndi\Params\PayloadMtu,            Max,            0, "2044"\r
+HKR, Ndi\Params\PayloadMtu,            Max,            0, "4092"\r
 \r
 [IpoibService]\r
 DisplayName     = %IpoibServiceDispName%\r