diff options
| author | Pradeep Satyanarayana <pradeeps@linux.vnet.ibm.com> | 2007-12-21 16:08:23 -0500 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2008-01-25 17:15:37 -0500 |
| commit | 586a693448676de5174e752426ced69ec79ab174 (patch) | |
| tree | a42a760115ccdde07853428c485296ce364a9b7d /drivers/infiniband/ulp/ipoib/ipoib_main.c | |
| parent | fff09a8e6e726f0752254e1f46f7224e3bebb302 (diff) | |
IPoIB/CM: Enable SRQ support on HCAs that support fewer than 16 SG entries
Some HCAs (such as ehca2) support SRQ, but only support fewer than 16 SG
entries for SRQs. Currently IPoIB/CM implicitly assumes all HCAs will
support 16 SG entries for SRQs (to handle a 64K MTU with 4K pages). This
patch removes that restriction by limiting the maximum MTU in connected
mode to what the maximum number of SRQ SG entries allows.
This patch addresses <https://bugs.openfabrics.org/show_bug.cgi?id=728>
Signed-off-by: Pradeep Satyanarayana <pradeeps@linux.vnet.ibm.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband/ulp/ipoib/ipoib_main.c')
| -rw-r--r-- | drivers/infiniband/ulp/ipoib/ipoib_main.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c index 3bfc2ef1303e..d7330451685c 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_main.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c | |||
| @@ -182,17 +182,20 @@ static int ipoib_change_mtu(struct net_device *dev, int new_mtu) | |||
| 182 | struct ipoib_dev_priv *priv = netdev_priv(dev); | 182 | struct ipoib_dev_priv *priv = netdev_priv(dev); |
| 183 | 183 | ||
| 184 | /* dev->mtu > 2K ==> connected mode */ | 184 | /* dev->mtu > 2K ==> connected mode */ |
| 185 | if (ipoib_cm_admin_enabled(dev) && new_mtu <= IPOIB_CM_MTU) { | 185 | if (ipoib_cm_admin_enabled(dev)) { |
| 186 | if (new_mtu > ipoib_cm_max_mtu(dev)) | ||
| 187 | return -EINVAL; | ||
| 188 | |||
| 186 | if (new_mtu > priv->mcast_mtu) | 189 | if (new_mtu > priv->mcast_mtu) |
| 187 | ipoib_warn(priv, "mtu > %d will cause multicast packet drops.\n", | 190 | ipoib_warn(priv, "mtu > %d will cause multicast packet drops.\n", |
| 188 | priv->mcast_mtu); | 191 | priv->mcast_mtu); |
| 192 | |||
| 189 | dev->mtu = new_mtu; | 193 | dev->mtu = new_mtu; |
| 190 | return 0; | 194 | return 0; |
| 191 | } | 195 | } |
| 192 | 196 | ||
| 193 | if (new_mtu > IPOIB_PACKET_SIZE - IPOIB_ENCAP_LEN) { | 197 | if (new_mtu > IPOIB_PACKET_SIZE - IPOIB_ENCAP_LEN) |
| 194 | return -EINVAL; | 198 | return -EINVAL; |
| 195 | } | ||
| 196 | 199 | ||
| 197 | priv->admin_mtu = new_mtu; | 200 | priv->admin_mtu = new_mtu; |
| 198 | 201 | ||