Added SLES11 SP3 support

Compilation passed for ib_core/ib_ipoib/mlx4/mlx5

Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>

diff --git a/ofed_scripts/gen-compat-config.sh b/ofed_scripts/gen-compat-config.sh
index 22f5d6a8f249b4b524bd796d730da84ef683cfb5..cc0e4d9f59a443d715d3182a5ee78a9cb2b81a2a 100755 (executable)
--- a/ofed_scripts/gen-compat-config.sh
+++ b/ofed_scripts/gen-compat-config.sh
@@ -185,6 +185,10 @@ if [[ -f ${KLIB_BUILD}/include/linux/cpu_rmap.h || -f /lib/modules/${KVERSION}/s
        set_config CONFIG_COMPAT_IS_LINUX_CPU_RMAP y
 fi
 
+if (grep -w -A6 "struct ethtool_flow_ext" ${KLIB_BUILD}/include/{,uapi}/linux/ethtool.h 2> /dev/null | grep -wq "unsigned char   h_dest" > /dev/null 2>&1 || grep -q -A6 "struct ethtool_flow_ext" /lib/modules/${KVERSION}/source/include/{,uapi}/linux/ethtool.h 2> /dev/null | grep -wq "unsigned char   h_dest" > /dev/null 2>&1); then
+       set_config CONFIG_COMPAT_ETHTOOL_FLOW_EXT_IS_H_DEST y
+fi
+
 if [[ ${CONFIG_COMPAT_RHEL_6_3} = "y" ]]; then
        set_config CONFIG_COMPAT_XPRT_ALLOC_4PARAMS y
        set_config CONFIG_COMPAT_XPRT_RESERVE_XPRT_CONG_2PARAMS y

diff --git a/patches/0001-BACKPORT-ib_core.patch b/patches/0001-BACKPORT-ib_core.patch
index 0c7db911a2316f6806bcdcdf3a0a4bed34165b58..fb4397a155ae274c82d745d198918d80d58fbeb1 100644 (file)
--- a/patches/0001-BACKPORT-ib_core.patch
+++ b/patches/0001-BACKPORT-ib_core.patch
@@ -3,19 +3,19 @@ Subject: [PATCH] BACKPORT: ib_core
 
 Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>
 ---
- drivers/infiniband/core/addr.c        |  105 +++++++++++++++++++++++++++++++++
- drivers/infiniband/core/cm.c          |   23 +++++++
- drivers/infiniband/core/cma.c         |   43 +++++++++++++
- drivers/infiniband/core/fmr_pool.c    |    7 ++
- drivers/infiniband/core/netlink.c     |   20 ++++++
- drivers/infiniband/core/sa_query.c    |   15 +++++
- drivers/infiniband/core/ucm.c         |   38 ++++++++++++
- drivers/infiniband/core/ucma.c        |   76 ++++++++++++++++++++++++
- drivers/infiniband/core/umem.c        |   16 +++++
- drivers/infiniband/core/user_mad.c    |   16 +++++
- drivers/infiniband/core/uverbs_cmd.c  |   51 ++++++++++++++++
- drivers/infiniband/core/uverbs_main.c |   40 +++++++++++++
- 12 files changed, 450 insertions(+), 0 deletions(-)
+ drivers/infiniband/core/addr.c        | 105 ++++++++++++++++++++++++++++++++++
+ drivers/infiniband/core/cm.c          |  23 ++++++++
+ drivers/infiniband/core/cma.c         |  43 ++++++++++++++
+ drivers/infiniband/core/fmr_pool.c    |   7 +++
+ drivers/infiniband/core/netlink.c     |  20 +++++++
+ drivers/infiniband/core/sa_query.c    |  15 +++++
+ drivers/infiniband/core/ucm.c         |  38 ++++++++++++
+ drivers/infiniband/core/ucma.c        |  76 ++++++++++++++++++++++++
+ drivers/infiniband/core/umem.c        |  16 ++++++
+ drivers/infiniband/core/user_mad.c    |  16 ++++++
+ drivers/infiniband/core/uverbs_cmd.c  |  51 +++++++++++++++++
+ drivers/infiniband/core/uverbs_main.c |  40 +++++++++++++
+ 12 files changed, 450 insertions(+)
 
 diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
 index xxxxxxx..xxxxxxx xxxxxx

diff --git a/patches/0002-BACKPORT-mlx4-mlx4_core-mlx4_en-and-mlx4_ib.patch b/patches/0002-BACKPORT-mlx4-mlx4_core-mlx4_en-and-mlx4_ib.patch
index cd32642c28b48f5bdb6017280dca04b301cb6235..7cd7d02555592f0f4bccaad4267487a980f36adb 100644 (file)
--- a/patches/0002-BACKPORT-mlx4-mlx4_core-mlx4_en-and-mlx4_ib.patch
+++ b/patches/0002-BACKPORT-mlx4-mlx4_core-mlx4_en-and-mlx4_ib.patch
@@ -3,19 +3,20 @@ Subject: [PATCH] BACKPORT: mlx4 (mlx4_core, mlx4_en and mlx4_ib)
 
 Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>
 ---
- drivers/infiniband/hw/mlx4/cm.c                 |   31 ++++
- drivers/infiniband/hw/mlx4/main.c               |   16 ++
- drivers/net/ethernet/mellanox/mlx4/cmd.c        |    6 +
- drivers/net/ethernet/mellanox/mlx4/en_cq.c      |   10 ++
- drivers/net/ethernet/mellanox/mlx4/en_ethtool.c |   47 ++++++
- drivers/net/ethernet/mellanox/mlx4/en_netdev.c  |  176 ++++++++++++++++++++++-
- drivers/net/ethernet/mellanox/mlx4/en_rx.c      |   29 ++++
- drivers/net/ethernet/mellanox/mlx4/en_tx.c      |   32 ++++
- drivers/net/ethernet/mellanox/mlx4/eq.c         |    8 +
- drivers/net/ethernet/mellanox/mlx4/mlx4_en.h    |   57 ++++++++
- include/linux/mlx4/cmd.h                        |    2 +
- include/linux/mlx4/device.h                     |    6 +
- 12 files changed, 419 insertions(+), 1 deletions(-)
+ drivers/infiniband/hw/mlx4/cm.c                 |  31 +++++
+ drivers/infiniband/hw/mlx4/main.c               |  16 +++
+ drivers/net/ethernet/mellanox/mlx4/cmd.c        |   6 +
+ drivers/net/ethernet/mellanox/mlx4/en_cq.c      |  10 ++
+ drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c  |  12 ++
+ drivers/net/ethernet/mellanox/mlx4/en_ethtool.c |  51 +++++++
+ drivers/net/ethernet/mellanox/mlx4/en_netdev.c  | 176 +++++++++++++++++++++++-
+ drivers/net/ethernet/mellanox/mlx4/en_rx.c      |  29 ++++
+ drivers/net/ethernet/mellanox/mlx4/en_tx.c      |  36 +++++
+ drivers/net/ethernet/mellanox/mlx4/eq.c         |   8 ++
+ drivers/net/ethernet/mellanox/mlx4/mlx4_en.h    |  57 ++++++++
+ include/linux/mlx4/cmd.h                        |   2 +
+ include/linux/mlx4/device.h                     |   6 +
+ 13 files changed, 439 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/infiniband/hw/mlx4/cm.c b/drivers/infiniband/hw/mlx4/cm.c
 index xxxxxxx..xxxxxxx xxxxxx
@@ -213,6 +214,49 @@ index xxxxxxx..xxxxxxx xxxxxx
                synchronize_rcu();
                netif_napi_del(&cq->napi);
        }
+diff --git a/drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c b/drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c
+index xxxxxxx..xxxxxxx xxxxxx
+--- a/drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c
++++ b/drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c
+@@ -204,8 +204,13 @@ static u8 mlx4_en_dcbnl_setdcbx(struct net_device *dev, u8 mode)
+ }
+ 
+ #define MLX4_RATELIMIT_UNITS_IN_KB 100000 /* rate-limit HW unit in Kbps */
++#ifdef CONFIG_COMPAT_IS_MAXRATE
+ static int mlx4_en_dcbnl_ieee_getmaxrate(struct net_device *dev,
+                                  struct ieee_maxrate *maxrate)
++#else
++int mlx4_en_dcbnl_ieee_getmaxrate(struct net_device *dev,
++                                struct ieee_maxrate *maxrate)
++#endif
+ {
+       struct mlx4_en_priv *priv = netdev_priv(dev);
+       int i;
+@@ -217,8 +222,13 @@ static int mlx4_en_dcbnl_ieee_getmaxrate(struct net_device *dev,
+       return 0;
+ }
+ 
++#ifdef CONFIG_COMPAT_IS_MAXRATE
+ static int mlx4_en_dcbnl_ieee_setmaxrate(struct net_device *dev,
+               struct ieee_maxrate *maxrate)
++#else
++int mlx4_en_dcbnl_ieee_setmaxrate(struct net_device *dev,
++                                struct ieee_maxrate *maxrate)
++#endif
+ {
+       struct mlx4_en_priv *priv = netdev_priv(dev);
+       u16 tmp[IEEE_8021QAZ_MAX_TCS];
+@@ -245,8 +255,10 @@ static int mlx4_en_dcbnl_ieee_setmaxrate(struct net_device *dev,
+ const struct dcbnl_rtnl_ops mlx4_en_dcbnl_ops = {
+       .ieee_getets    = mlx4_en_dcbnl_ieee_getets,
+       .ieee_setets    = mlx4_en_dcbnl_ieee_setets,
++#ifdef CONFIG_COMPAT_IS_MAXRATE
+       .ieee_getmaxrate = mlx4_en_dcbnl_ieee_getmaxrate,
+       .ieee_setmaxrate = mlx4_en_dcbnl_ieee_setmaxrate,
++#endif
+       .ieee_getpfc    = mlx4_en_dcbnl_ieee_getpfc,
+       .ieee_setpfc    = mlx4_en_dcbnl_ieee_setpfc,
+ 
 diff --git a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
 index xxxxxxx..xxxxxxx xxxxxx
 --- a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
@@ -254,7 +298,33 @@ index xxxxxxx..xxxxxxx xxxxxx
  {
        struct mlx4_en_priv *priv = netdev_priv(dev);
        struct mlx4_en_dev *mdev = priv->mdev;
-@@ -1035,8 +1048,13 @@ static int mlx4_en_get_num_flows(struct mlx4_en_priv *priv)
+@@ -641,11 +654,13 @@ static int mlx4_en_validate_flow(struct net_device *dev,
+       if (cmd->fs.location >= MAX_NUM_OF_FS_RULES)
+               return -EINVAL;
+ 
++#ifdef CONFIG_COMPAT_ETHTOOL_FLOW_EXT_IS_H_DEST
+       if (cmd->fs.flow_type & FLOW_MAC_EXT) {
+               /* dest mac mask must be ff:ff:ff:ff:ff:ff */
+               if (!is_broadcast_ether_addr(cmd->fs.m_ext.h_dest))
+                       return -EINVAL;
+       }
++#endif
+ 
+       switch (cmd->fs.flow_type & ~(FLOW_EXT | FLOW_MAC_EXT)) {
+       case TCP_V4_FLOW:
+@@ -737,9 +752,11 @@ static int mlx4_en_ethtool_add_mac_rule_by_ipv4(struct mlx4_en_priv *priv,
+       unsigned char mac[ETH_ALEN];
+ 
+       if (!ipv4_is_multicast(ipv4_dst)) {
++#ifdef CONFIG_COMPAT_ETHTOOL_FLOW_EXT_IS_H_DEST
+               if (cmd->fs.flow_type & FLOW_MAC_EXT)
+                       memcpy(&mac, cmd->fs.h_ext.h_dest, ETH_ALEN);
+               else
++#endif
+                       memcpy(&mac, priv->dev->dev_addr, ETH_ALEN);
+       } else {
+               ip_eth_mc_map(ipv4_dst, mac);
+@@ -1035,8 +1052,13 @@ static int mlx4_en_get_num_flows(struct mlx4_en_priv *priv)
  
  }
  
@@ -268,7 +338,7 @@ index xxxxxxx..xxxxxxx xxxxxx
  {
        struct mlx4_en_priv *priv = netdev_priv(dev);
        struct mlx4_en_dev *mdev = priv->mdev;
-@@ -1064,7 +1082,11 @@ static int mlx4_en_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd,
+@@ -1064,7 +1086,11 @@ static int mlx4_en_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd,
                while ((!err || err == -ENOENT) && priority < cmd->rule_cnt) {
                        err = mlx4_en_get_flow(dev, cmd, i);
                        if (!err)
@@ -280,7 +350,7 @@ index xxxxxxx..xxxxxxx xxxxxx
                        i++;
                }
                err = 0;
-@@ -1102,8 +1124,13 @@ static int mlx4_en_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd)
+@@ -1102,8 +1128,13 @@ static int mlx4_en_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd)
        return err;
  }
  
@@ -294,7 +364,7 @@ index xxxxxxx..xxxxxxx xxxxxx
  {
        struct mlx4_en_priv *priv = netdev_priv(dev);
  
-@@ -1116,8 +1143,13 @@ static void mlx4_en_get_channels(struct net_device *dev,
+@@ -1116,8 +1147,13 @@ static void mlx4_en_get_channels(struct net_device *dev,
        channel->tx_count = priv->tx_ring_num / MLX4_EN_NUM_UP;
  }
  
@@ -308,7 +378,7 @@ index xxxxxxx..xxxxxxx xxxxxx
  {
        struct mlx4_en_priv *priv = netdev_priv(dev);
        struct mlx4_en_dev *mdev = priv->mdev;
-@@ -1148,10 +1180,15 @@ static int mlx4_en_set_channels(struct net_device *dev,
+@@ -1148,10 +1184,15 @@ static int mlx4_en_set_channels(struct net_device *dev,
                goto out;
        }
  
@@ -324,7 +394,7 @@ index xxxxxxx..xxxxxxx xxxxxx
  
        en_warn(priv, "Using %d TX rings\n", priv->tx_ring_num);
        en_warn(priv, "Using %d RX rings\n", priv->rx_ring_num);
-@@ -1219,11 +1256,21 @@ const struct ethtool_ops mlx4_en_ethtool_ops = {
+@@ -1219,11 +1260,21 @@ const struct ethtool_ops mlx4_en_ethtool_ops = {
        .set_ringparam = mlx4_en_set_ringparam,
        .get_rxnfc = mlx4_en_get_rxnfc,
        .set_rxnfc = mlx4_en_set_rxnfc,
@@ -951,7 +1021,7 @@ index xxxxxxx..xxxxxxx xxxxxx
        if (ring->bf_enabled)
                ring->context.usr_page = cpu_to_be32(ring->bf.uar->index);
  
-@@ -567,16 +576,34 @@ static void build_inline_wqe(struct mlx4_en_tx_desc *tx_desc, struct sk_buff *sk
+@@ -567,16 +576,38 @@ static void build_inline_wqe(struct mlx4_en_tx_desc *tx_desc, struct sk_buff *sk
  u16 mlx4_en_select_queue(struct net_device *dev, struct sk_buff *skb)
  {
        struct mlx4_en_priv *priv = netdev_priv(dev);
@@ -969,7 +1039,11 @@ index xxxxxxx..xxxxxxx xxxxxx
        if (vlan_tx_tag_present(skb))
                up = vlan_tx_tag_get(skb) >> VLAN_PRIO_SHIFT;
  
++#ifdef CONFIG_COMPAT_IS_NETDEV_PICK_TX
        return __netdev_pick_tx(dev, skb) % rings_p_up + up * rings_p_up;
++#else
++      return __skb_tx_hash(dev, skb, rings_p_up) + up * rings_p_up;
++#endif
 +#else /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) || defined (CONFIG_COMPAT_NEW_TX_RING_SCHEME) */
 +      u16 vlan_tag = 0;
 +
@@ -986,7 +1060,7 @@ index xxxxxxx..xxxxxxx xxxxxx
  }
  
  static void mlx4_bf_copy(void __iomem *dst, unsigned long *src, unsigned bytecnt)
-@@ -732,8 +759,13 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev)
+@@ -732,8 +763,13 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev)
         * set flag for further reference
         */
        if (ring->hwtstamp_tx_type == HWTSTAMP_TX_ON &&

diff --git a/patches/0003-BACKPORT-ib_ipoib.patch b/patches/0003-BACKPORT-ib_ipoib.patch
index 2caf839b11c4a59f98cb28768eecfd6f01815a2c..a3e7c535aead9f07ab5cfe40a7230418651f04c2 100644 (file)
--- a/patches/0003-BACKPORT-ib_ipoib.patch
+++ b/patches/0003-BACKPORT-ib_ipoib.patch
@@ -3,12 +3,12 @@ Subject: [PATCH] BACKPORT: ib_ipoib
 
 Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>
 ---
- drivers/infiniband/ulp/ipoib/ipoib.h           |    3 ++
- drivers/infiniband/ulp/ipoib/ipoib_cm.c        |    8 ++++++
- drivers/infiniband/ulp/ipoib/ipoib_main.c      |   31 ++++++++++++++++++++++++
- drivers/infiniband/ulp/ipoib/ipoib_multicast.c |   15 +++++++++++
- drivers/infiniband/ulp/ipoib/ipoib_netlink.c   |    8 ++++++
- 5 files changed, 65 insertions(+), 0 deletions(-)
+ drivers/infiniband/ulp/ipoib/ipoib.h           |  3 +++
+ drivers/infiniband/ulp/ipoib/ipoib_cm.c        |  8 ++++++
+ drivers/infiniband/ulp/ipoib/ipoib_main.c      | 35 ++++++++++++++++++++++++++
+ drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 15 +++++++++++
+ drivers/infiniband/ulp/ipoib/ipoib_netlink.c   |  8 ++++++
+ 5 files changed, 69 insertions(+)
 
 diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h
 index xxxxxxx..xxxxxxx xxxxxx
@@ -104,7 +104,19 @@ index xxxxxxx..xxxxxxx xxxxxx
                dev_set_mtu(dev, min(priv->mcast_mtu, dev->mtu));
                rtnl_unlock();
                ipoib_flush_paths(dev);
-@@ -1335,7 +1353,9 @@ static const struct net_device_ops ipoib_netdev_ops = {
+@@ -1313,7 +1331,11 @@ void ipoib_dev_cleanup(struct net_device *dev)
+               cancel_delayed_work(&cpriv->neigh_reap_task);
+               unregister_netdevice_queue(cpriv->dev, &head);
+       }
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
+       unregister_netdevice_many(&head);
++#else
++      unregister_netdevice(cpriv->dev);
++#endif
+ 
+       ipoib_ib_dev_cleanup(dev);
+ 
+@@ -1335,7 +1357,9 @@ static const struct net_device_ops ipoib_netdev_ops = {
        .ndo_open                = ipoib_open,
        .ndo_stop                = ipoib_stop,
        .ndo_change_mtu          = ipoib_change_mtu,
@@ -114,7 +126,7 @@ index xxxxxxx..xxxxxxx xxxxxx
        .ndo_start_xmit          = ipoib_start_xmit,
        .ndo_tx_timeout          = ipoib_timeout,
        .ndo_set_rx_mode         = ipoib_set_mcast_list,
-@@ -1522,6 +1542,7 @@ int ipoib_set_dev_features(struct ipoib_dev_priv *priv, struct ib_device *hca)
+@@ -1522,6 +1546,7 @@ int ipoib_set_dev_features(struct ipoib_dev_priv *priv, struct ib_device *hca)
        kfree(device_attr);
  
        if (priv->hca_caps & IB_DEVICE_UD_IP_CSUM) {
@@ -122,7 +134,7 @@ index xxxxxxx..xxxxxxx xxxxxx
                priv->dev->hw_features = NETIF_F_SG |
                        NETIF_F_IP_CSUM | NETIF_F_RXCSUM;
  
-@@ -1529,6 +1550,14 @@ int ipoib_set_dev_features(struct ipoib_dev_priv *priv, struct ib_device *hca)
+@@ -1529,6 +1554,14 @@ int ipoib_set_dev_features(struct ipoib_dev_priv *priv, struct ib_device *hca)
                        priv->dev->hw_features |= NETIF_F_TSO;
  
                priv->dev->features |= priv->dev->hw_features;
@@ -137,7 +149,7 @@ index xxxxxxx..xxxxxxx xxxxxx
        }
  
        return 0;
-@@ -1560,7 +1589,9 @@ static struct net_device *ipoib_add_port(const char *format,
+@@ -1560,7 +1593,9 @@ static struct net_device *ipoib_add_port(const char *format,
        priv->dev->mtu  = IPOIB_UD_MTU(priv->max_ib_mtu);
        priv->mcast_mtu  = priv->admin_mtu = priv->dev->mtu;
  

diff --git a/patches/0004-iw_cxgb3-iw_cxgb4-Enable-header-file-inclusion-with-.patch b/patches/0004-iw_cxgb3-iw_cxgb4-Enable-header-file-inclusion-with-.patch
index 92837f99420e8d9351341e8aa930eebfbce2e8ef..b7b032dbedff09189e4bf5c60d4a42c2504045e6 100644 (file)
--- a/patches/0004-iw_cxgb3-iw_cxgb4-Enable-header-file-inclusion-with-.patch
+++ b/patches/0004-iw_cxgb3-iw_cxgb4-Enable-header-file-inclusion-with-.patch
@@ -1,5 +1,6 @@
 From: Vipul Pandya <vipul@chelsio.com>
-Subject: [PATCH] iw_cxgb3/iw_cxgb4: Enable header file inclusion with absolute path
+Subject: [PATCH] iw_cxgb3/iw_cxgb4: Enable header file inclusion with
+ absolute path
 
 iw_cxgb3/iw_cxgb4 driver includes header files of cxgb3/cxgb4 drivers
 respectively. OFED build environment is not able to find the header files
@@ -7,8 +8,8 @@ if absolute path is not given.
 
 Signed-off-by: Vipul Pandya <vipul@chelsio.com>
 ---
- drivers/infiniband/hw/cxgb3/Makefile |    2 +-
- drivers/infiniband/hw/cxgb4/Makefile |    2 +-
+ drivers/infiniband/hw/cxgb3/Makefile | 2 +-
+ drivers/infiniband/hw/cxgb4/Makefile | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/infiniband/hw/cxgb3/Makefile b/drivers/infiniband/hw/cxgb3/Makefile