Merge branch 'ip-roce' into for-next

Conflicts:
	drivers/infiniband/hw/mlx4/main.c

18 files changed, 504 insertions, 326 deletions

diff --git a/drivers/infiniband/hw/ehca/ehca_qp.c b/drivers/infiniband/hw/ehca/ehca_qp.c
index 00d6861a6a18..2e89356c46fa 100644
--- a/drivers/infiniband/hw/ehca/ehca_qp.c
+++ b/drivers/infiniband/hw/ehca/ehca_qp.c
@@ -1329,7 +1329,7 @@ static int internal_modify_qp(struct ib_qp *ibqp,
         qp_new_state = attr_mask & IB_QP_STATE ? attr->qp_state : qp_cur_state;
         if (!smi_reset2init &&
             !ib_modify_qp_is_ok(qp_cur_state, qp_new_state, ibqp->qp_type,
-                                attr_mask)) {
+                                attr_mask, IB_LINK_LAYER_UNSPECIFIED)) {
                 ret = -EINVAL;
                 ehca_err(ibqp->device,
                          "Invalid qp transition new_state=%x cur_state=%x "
diff --git a/drivers/infiniband/hw/ipath/ipath_qp.c b/drivers/infiniband/hw/ipath/ipath_qp.c
index 0857a9c3cd3d..face87602dc1 100644
--- a/drivers/infiniband/hw/ipath/ipath_qp.c
+++ b/drivers/infiniband/hw/ipath/ipath_qp.c
@@ -463,7 +463,7 @@ int ipath_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
         new_state = attr_mask & IB_QP_STATE ? attr->qp_state : cur_state;
 
         if (!ib_modify_qp_is_ok(cur_state, new_state, ibqp->qp_type,
-                                attr_mask))
+                                attr_mask, IB_LINK_LAYER_UNSPECIFIED))
                 goto inval;
 
         if (attr_mask & IB_QP_AV) {
diff --git a/drivers/infiniband/hw/mlx4/Kconfig b/drivers/infiniband/hw/mlx4/Kconfig
index 24ab11a9ad1e..fc01deac1d3c 100644
--- a/drivers/infiniband/hw/mlx4/Kconfig
+++ b/drivers/infiniband/hw/mlx4/Kconfig
@@ -1,6 +1,6 @@
 config MLX4_INFINIBAND
         tristate "Mellanox ConnectX HCA support"
-        depends on NETDEVICES && ETHERNET && PCI
+        depends on NETDEVICES && ETHERNET && PCI && INET
         select NET_VENDOR_MELLANOX
         select MLX4_CORE
         ---help---
diff --git a/drivers/infiniband/hw/mlx4/ah.c b/drivers/infiniband/hw/mlx4/ah.c
index a251becdaa98..170dca608042 100644
--- a/drivers/infiniband/hw/mlx4/ah.c
+++ b/drivers/infiniband/hw/mlx4/ah.c
@@ -39,25 +39,6 @@
 
 #include "mlx4_ib.h"
 
-int mlx4_ib_resolve_grh(struct mlx4_ib_dev *dev, const struct ib_ah_attr *ah_attr,
-                        u8 *mac, int *is_mcast, u8 port)
-{
-        struct in6_addr in6;
-
-        *is_mcast = 0;
-
-        memcpy(&in6, ah_attr->grh.dgid.raw, sizeof in6);
-        if (rdma_link_local_addr(&in6))
-                rdma_get_ll_mac(&in6, mac);
-        else if (rdma_is_multicast_addr(&in6)) {
-                rdma_get_mcast_mac(&in6, mac);
-                *is_mcast = 1;
-        } else
-                return -EINVAL;
-
-        return 0;
-}
-
 static struct ib_ah *create_ib_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr,
                                   struct mlx4_ib_ah *ah)
 {
@@ -92,21 +73,18 @@ static struct ib_ah *create_iboe_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr
 {
         struct mlx4_ib_dev *ibdev = to_mdev(pd->device);
         struct mlx4_dev *dev = ibdev->dev;
-        union ib_gid sgid;
-        u8 mac[6];
-        int err;
         int is_mcast;
+        struct in6_addr in6;
         u16 vlan_tag;
 
-        err = mlx4_ib_resolve_grh(ibdev, ah_attr, mac, &is_mcast, ah_attr->port_num);
-        if (err)
-                return ERR_PTR(err);
-
-        memcpy(ah->av.eth.mac, mac, 6);
-        err = ib_get_cached_gid(pd->device, ah_attr->port_num, ah_attr->grh.sgid_index, &sgid);
-        if (err)
-                return ERR_PTR(err);
-        vlan_tag = rdma_get_vlan_id(&sgid);
+        memcpy(&in6, ah_attr->grh.dgid.raw, sizeof(in6));
+        if (rdma_is_multicast_addr(&in6)) {
+                is_mcast = 1;
+                rdma_get_mcast_mac(&in6, ah->av.eth.mac);
+        } else {
+                memcpy(ah->av.eth.mac, ah_attr->dmac, ETH_ALEN);
+        }
+        vlan_tag = ah_attr->vlan_id;
         if (vlan_tag < 0x1000)
                 vlan_tag |= (ah_attr->sl & 7) << 13;
         ah->av.eth.port_pd = cpu_to_be32(to_mpd(pd)->pdn | (ah_attr->port_num << 24));
diff --git a/drivers/infiniband/hw/mlx4/cq.c b/drivers/infiniband/hw/mlx4/cq.c
index 66dbf8062374..cc40f08ca8f1 100644
--- a/drivers/infiniband/hw/mlx4/cq.c
+++ b/drivers/infiniband/hw/mlx4/cq.c
@@ -798,6 +798,15 @@ repoll:
                         wc->sl  = be16_to_cpu(cqe->sl_vid) >> 13;
                 else
                         wc->sl  = be16_to_cpu(cqe->sl_vid) >> 12;
+                if (be32_to_cpu(cqe->vlan_my_qpn) & MLX4_CQE_VLAN_PRESENT_MASK) {
+                        wc->vlan_id = be16_to_cpu(cqe->sl_vid) &
+                                MLX4_CQE_VID_MASK;
+                } else {
+                        wc->vlan_id = 0xffff;
+                }
+                wc->wc_flags |= IB_WC_WITH_VLAN;
+                memcpy(wc->smac, cqe->smac, ETH_ALEN);
+                wc->wc_flags |= IB_WC_WITH_SMAC;
         }
 
         return 0;
diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index ea5844e89b2a..c2702f549f10 100644
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -39,6 +39,8 @@
 #include <linux/inetdevice.h>
 #include <linux/rtnetlink.h>
 #include <linux/if_vlan.h>
+#include <net/ipv6.h>
+#include <net/addrconf.h>
 
 #include <rdma/ib_smi.h>
 #include <rdma/ib_user_verbs.h>
@@ -794,7 +796,6 @@ static int add_gid_entry(struct ib_qp *ibqp, union ib_gid *gid)
 int mlx4_ib_add_mc(struct mlx4_ib_dev *mdev, struct mlx4_ib_qp *mqp,
                    union ib_gid *gid)
 {
-        u8 mac[6];
         struct net_device *ndev;
         int ret = 0;
 
@@ -808,11 +809,7 @@ int mlx4_ib_add_mc(struct mlx4_ib_dev *mdev, struct mlx4_ib_qp *mqp,
         spin_unlock(&mdev->iboe.lock);
 
         if (ndev) {
-                rdma_get_mcast_mac((struct in6_addr *)gid, mac);
-                rtnl_lock();
-                dev_mc_add(mdev->iboe.netdevs[mqp->port - 1], mac);
                 ret = 1;
-                rtnl_unlock();
                 dev_put(ndev);
         }
 
@@ -1164,6 +1161,8 @@ static int mlx4_ib_mcg_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
         struct mlx4_ib_qp *mqp = to_mqp(ibqp);
         u64 reg_id;
         struct mlx4_ib_steering *ib_steering = NULL;
+        enum mlx4_protocol prot = (gid->raw[1] == 0x0e) ?
+                MLX4_PROT_IB_IPV4 : MLX4_PROT_IB_IPV6;
 
         if (mdev->dev->caps.steering_mode ==
             MLX4_STEERING_MODE_DEVICE_MANAGED) {
@@ -1175,7 +1174,7 @@ static int mlx4_ib_mcg_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
         err = mlx4_multicast_attach(mdev->dev, &mqp->mqp, gid->raw, mqp->port,
                                     !!(mqp->flags &
                                        MLX4_IB_QP_BLOCK_MULTICAST_LOOPBACK),
-                                    MLX4_PROT_IB_IPV6, &reg_id);
+                                    prot, &reg_id);
         if (err)
                 goto err_malloc;
 
@@ -1194,7 +1193,7 @@ static int mlx4_ib_mcg_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
 
 err_add:
         mlx4_multicast_detach(mdev->dev, &mqp->mqp, gid->raw,
-                              MLX4_PROT_IB_IPV6, reg_id);
+                              prot, reg_id);
 err_malloc:
         kfree(ib_steering);
 
@@ -1222,10 +1221,11 @@ static int mlx4_ib_mcg_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
         int err;
         struct mlx4_ib_dev *mdev = to_mdev(ibqp->device);
         struct mlx4_ib_qp *mqp = to_mqp(ibqp);
-        u8 mac[6];
         struct net_device *ndev;
         struct mlx4_ib_gid_entry *ge;
         u64 reg_id = 0;
+        enum mlx4_protocol prot = (gid->raw[1] == 0x0e) ?
+                MLX4_PROT_IB_IPV4 : MLX4_PROT_IB_IPV6;
 
         if (mdev->dev->caps.steering_mode ==
             MLX4_STEERING_MODE_DEVICE_MANAGED) {
@@ -1248,7 +1248,7 @@ static int mlx4_ib_mcg_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
         }
 
         err = mlx4_multicast_detach(mdev->dev, &mqp->mqp, gid->raw,
-                                    MLX4_PROT_IB_IPV6, reg_id);
+                                    prot, reg_id);
         if (err)
                 return err;
 
@@ -1260,13 +1260,8 @@ static int mlx4_ib_mcg_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
                 if (ndev)
                         dev_hold(ndev);
                 spin_unlock(&mdev->iboe.lock);
-                rdma_get_mcast_mac((struct in6_addr *)gid, mac);
-                if (ndev) {
-                        rtnl_lock();
-                        dev_mc_del(mdev->iboe.netdevs[ge->port - 1], mac);
-                        rtnl_unlock();
+                if (ndev)
                         dev_put(ndev);
-                }
                 list_del(&ge->list);
                 kfree(ge);
         } else
@@ -1362,20 +1357,6 @@ static struct device_attribute *mlx4_class_attributes[] = {
         &dev_attr_board_id
 };
 
-static void mlx4_addrconf_ifid_eui48(u8 *eui, u16 vlan_id, struct net_device *dev)
-{
-        memcpy(eui, dev->dev_addr, 3);
-        memcpy(eui + 5, dev->dev_addr + 3, 3);
-        if (vlan_id < 0x1000) {
-                eui[3] = vlan_id >> 8;
-                eui[4] = vlan_id & 0xff;
-        } else {
-                eui[3] = 0xff;
-                eui[4] = 0xfe;
-        }
-        eui[0] ^= 2;
-}
-
 static void update_gids_task(struct work_struct *work)
 {
         struct update_gid_work *gw = container_of(work, struct update_gid_work, work);
@@ -1398,161 +1379,318 @@ static void update_gids_task(struct work_struct *work)
                        MLX4_CMD_WRAPPED);
         if (err)
                 pr_warn("set port command failed\n");
-        else {
-                memcpy(gw->dev->iboe.gid_table[gw->port - 1], gw->gids, sizeof gw->gids);
+        else
                 mlx4_ib_dispatch_event(gw->dev, gw->port, IB_EVENT_GID_CHANGE);
-        }
 
         mlx4_free_cmd_mailbox(dev, mailbox);
         kfree(gw);
 }
 
-static int update_ipv6_gids(struct mlx4_ib_dev *dev, int port, int clear)
+static void reset_gids_task(struct work_struct *work)
 {
-        struct net_device *ndev = dev->iboe.netdevs[port - 1];
-        struct update_gid_work *work;
-        struct net_device *tmp;
+        struct update_gid_work *gw =
+                        container_of(work, struct update_gid_work, work);
+        struct mlx4_cmd_mailbox *mailbox;
+        union ib_gid *gids;
+        int err;
         int i;
-        u8 *hits;
-        int ret;
-        union ib_gid gid;
-        int free;
-        int found;
-        int need_update = 0;
-        u16 vid;
+        struct mlx4_dev *dev = gw->dev->dev;
 
-        work = kzalloc(sizeof *work, GFP_ATOMIC);
-        if (!work)
-                return -ENOMEM;
+        mailbox = mlx4_alloc_cmd_mailbox(dev);
+        if (IS_ERR(mailbox)) {
+                pr_warn("reset gid table failed\n");
+                goto free;
+        }
 
-        hits = kzalloc(128, GFP_ATOMIC);
-        if (!hits) {
-                ret = -ENOMEM;
-                goto out;
+        gids = mailbox->buf;
+        memcpy(gids, gw->gids, sizeof(gw->gids));
+
+        for (i = 1; i < gw->dev->num_ports + 1; i++) {
+                if (mlx4_ib_port_link_layer(&gw->dev->ib_dev, i) ==
+                                            IB_LINK_LAYER_ETHERNET) {
+                        err = mlx4_cmd(dev, mailbox->dma,
+                                       MLX4_SET_PORT_GID_TABLE << 8 | i,
+                                       1, MLX4_CMD_SET_PORT,
+                                       MLX4_CMD_TIME_CLASS_B,
+                                       MLX4_CMD_WRAPPED);
+                        if (err)
+                                pr_warn(KERN_WARNING
+                                        "set port %d command failed\n", i);
+                }
         }
 
-        rcu_read_lock();
-        for_each_netdev_rcu(&init_net, tmp) {
-                if (ndev && (tmp == ndev || rdma_vlan_dev_real_dev(tmp) == ndev)) {
-                        gid.global.subnet_prefix = cpu_to_be64(0xfe80000000000000LL);
-                        vid = rdma_vlan_dev_vlan_id(tmp);
-                        mlx4_addrconf_ifid_eui48(&gid.raw[8], vid, ndev);
-                        found = 0;
-                        free = -1;
-                        for (i = 0; i < 128; ++i) {
-                                if (free < 0 &&
-                                    !memcmp(&dev->iboe.gid_table[port - 1][i], &zgid, sizeof zgid))
-                                        free = i;
-                                if (!memcmp(&dev->iboe.gid_table[port - 1][i], &gid, sizeof gid)) {
-                                        hits[i] = 1;
-                                        found = 1;
-                                        break;
-                                }
-                        }
+        mlx4_free_cmd_mailbox(dev, mailbox);
+free:
+        kfree(gw);
+}
 
-                        if (!found) {
-                                if (tmp == ndev &&
-                                    (memcmp(&dev->iboe.gid_table[port - 1][0],
-                                            &gid, sizeof gid) ||
-                                     !memcmp(&dev->iboe.gid_table[port - 1][0],
-                                             &zgid, sizeof gid))) {
-                                        dev->iboe.gid_table[port - 1][0] = gid;
-                                        ++need_update;
-                                        hits[0] = 1;
-                                } else if (free >= 0) {
-                                        dev->iboe.gid_table[port - 1][free] = gid;
-                                        hits[free] = 1;
-                                        ++need_update;
-                                }
+static int update_gid_table(struct mlx4_ib_dev *dev, int port,
+                            union ib_gid *gid, int clear)
+{
+        struct update_gid_work *work;
+        int i;
+        int need_update = 0;
+        int free = -1;
+        int found = -1;
+        int max_gids;
+
+        max_gids = dev->dev->caps.gid_table_len[port];
+        for (i = 0; i < max_gids; ++i) {
+                if (!memcmp(&dev->iboe.gid_table[port - 1][i], gid,
+                            sizeof(*gid)))
+                        found = i;
+
+                if (clear) {
+                        if (found >= 0) {
+                                need_update = 1;
+                                dev->iboe.gid_table[port - 1][found] = zgid;
+                                break;
                         }
+                } else {
+                        if (found >= 0)
+                                break;
+
+                        if (free < 0 &&
+                            !memcmp(&dev->iboe.gid_table[port - 1][i], &zgid,
+                                    sizeof(*gid)))
+                                free = i;
                 }
         }
-        rcu_read_unlock();
 
-        for (i = 0; i < 128; ++i)
-                if (!hits[i]) {
-                        if (memcmp(&dev->iboe.gid_table[port - 1][i], &zgid, sizeof zgid))
-                                ++need_update;
-                        dev->iboe.gid_table[port - 1][i] = zgid;
-                }
+        if (found == -1 && !clear && free >= 0) {
+                dev->iboe.gid_table[port - 1][free] = *gid;
+                need_update = 1;
+        }
 
-        if (need_update) {
-                memcpy(work->gids, dev->iboe.gid_table[port - 1], sizeof work->gids);
-                INIT_WORK(&work->work, update_gids_task);
-                work->port = port;
-                work->dev = dev;
-                queue_work(wq, &work->work);
-        } else
-                kfree(work);
+        if (!need_update)
+                return 0;
+
+        work = kzalloc(sizeof(*work), GFP_ATOMIC);
+        if (!work)
+                return -ENOMEM;
+
+        memcpy(work->gids, dev->iboe.gid_table[port - 1], sizeof(work->gids));
+        INIT_WORK(&work->work, update_gids_task);
+        work->port = port;
+        work->dev = dev;
+        queue_work(wq, &work->work);
 
-        kfree(hits);
         return 0;
+}
 
-out:
-        kfree(work);
-        return ret;
+static int reset_gid_table(struct mlx4_ib_dev *dev)
+{
+        struct update_gid_work *work;
+
+
+        work = kzalloc(sizeof(*work), GFP_ATOMIC);
+        if (!work)
+                return -ENOMEM;
+        memset(dev->iboe.gid_table, 0, sizeof(dev->iboe.gid_table));
+        memset(work->gids, 0, sizeof(work->gids));
+        INIT_WORK(&work->work, reset_gids_task);
+        work->dev = dev;
+        queue_work(wq, &work->work);
+        return 0;
 }
 
-static void handle_en_event(struct mlx4_ib_dev *dev, int port, unsigned long event)
+static int mlx4_ib_addr_event(int event, struct net_device *event_netdev,
+                              struct mlx4_ib_dev *ibdev, union ib_gid *gid)
 {
-        switch (event) {
-        case NETDEV_UP:
-        case NETDEV_CHANGEADDR:
-                update_ipv6_gids(dev, port, 0);
-                break;
+        struct mlx4_ib_iboe *iboe;
+        int port = 0;
+        struct net_device *real_dev = rdma_vlan_dev_real_dev(event_netdev) ?
+                                rdma_vlan_dev_real_dev(event_netdev) :
+                                event_netdev;
+
+        if (event != NETDEV_DOWN && event != NETDEV_UP)
+                return 0;
+
+        if ((real_dev != event_netdev) &&
+            (event == NETDEV_DOWN) &&
+            rdma_link_local_addr((struct in6_addr *)gid))
+                return 0;
+
+        iboe = &ibdev->iboe;
+        spin_lock(&iboe->lock);
+
+        for (port = 1; port <= MLX4_MAX_PORTS; ++port)
+                if ((netif_is_bond_master(real_dev) &&
+                     (real_dev == iboe->masters[port - 1])) ||
+                     (!netif_is_bond_master(real_dev) &&
+                     (real_dev == iboe->netdevs[port - 1])))
+                        update_gid_table(ibdev, port, gid,
+                                         event == NETDEV_DOWN);
+
+        spin_unlock(&iboe->lock);
+        return 0;
 
-        case NETDEV_DOWN:
-                update_ipv6_gids(dev, port, 1);
-                dev->iboe.netdevs[port - 1] = NULL;
-        }
 }
 
-static void netdev_added(struct mlx4_ib_dev *dev, int port)
+static u8 mlx4_ib_get_dev_port(struct net_device *dev,
+                               struct mlx4_ib_dev *ibdev)
 {
-        update_ipv6_gids(dev, port, 0);
+        u8 port = 0;
+        struct mlx4_ib_iboe *iboe;
+        struct net_device *real_dev = rdma_vlan_dev_real_dev(dev) ?
+                                rdma_vlan_dev_real_dev(dev) : dev;
+
+        iboe = &ibdev->iboe;
+        spin_lock(&iboe->lock);
+
+        for (port = 1; port <= MLX4_MAX_PORTS; ++port)
+                if ((netif_is_bond_master(real_dev) &&
+                     (real_dev == iboe->masters[port - 1])) ||
+                     (!netif_is_bond_master(real_dev) &&
+                     (real_dev == iboe->netdevs[port - 1])))
+                        break;
+
+        spin_unlock(&iboe->lock);
+
+        if ((port == 0) || (port > MLX4_MAX_PORTS))
+                return 0;
+        else
+                return port;
 }
 
-static void netdev_removed(struct mlx4_ib_dev *dev, int port)
+static int mlx4_ib_inet_event(struct notifier_block *this, unsigned long event,
+                                void *ptr)
 {
-        update_ipv6_gids(dev, port, 1);
+        struct mlx4_ib_dev *ibdev;
+        struct in_ifaddr *ifa = ptr;
+        union ib_gid gid;
+        struct net_device *event_netdev = ifa->ifa_dev->dev;
+
+        ipv6_addr_set_v4mapped(ifa->ifa_address, (struct in6_addr *)&gid);
+
+        ibdev = container_of(this, struct mlx4_ib_dev, iboe.nb_inet);
+
+        mlx4_ib_addr_event(event, event_netdev, ibdev, &gid);
+        return NOTIFY_DONE;
 }
 
-static int mlx4_ib_netdev_event(struct notifier_block *this, unsigned long event,
+#if IS_ENABLED(CONFIG_IPV6)
+static int mlx4_ib_inet6_event(struct notifier_block *this, unsigned long event,
                                 void *ptr)
 {
-        struct net_device *dev = netdev_notifier_info_to_dev(ptr);
         struct mlx4_ib_dev *ibdev;
-        struct net_device *oldnd;
+        struct inet6_ifaddr *ifa = ptr;
+        union  ib_gid *gid = (union ib_gid *)&ifa->addr;
+        struct net_device *event_netdev = ifa->idev->dev;
+
+        ibdev = container_of(this, struct mlx4_ib_dev, iboe.nb_inet6);
+
+        mlx4_ib_addr_event(event, event_netdev, ibdev, gid);
+        return NOTIFY_DONE;
+}
+#endif
+
+static void mlx4_ib_get_dev_addr(struct net_device *dev,
+                                 struct mlx4_ib_dev *ibdev, u8 port)
+{
+        struct in_device *in_dev;
+#if IS_ENABLED(CONFIG_IPV6)
+        struct inet6_dev *in6_dev;
+        union ib_gid  *pgid;
+        struct inet6_ifaddr *ifp;
+#endif
+        union ib_gid gid;
+
+
+        if ((port == 0) || (port > MLX4_MAX_PORTS))
+                return;
+
+        /* IPv4 gids */
+        in_dev = in_dev_get(dev);
+        if (in_dev) {
+                for_ifa(in_dev) {
+                        /*ifa->ifa_address;*/
+                        ipv6_addr_set_v4mapped(ifa->ifa_address,
+                                               (struct in6_addr *)&gid);
+                        update_gid_table(ibdev, port, &gid, 0);
+                }
+                endfor_ifa(in_dev);
+                in_dev_put(in_dev);
+        }
+#if IS_ENABLED(CONFIG_IPV6)
+        /* IPv6 gids */
+        in6_dev = in6_dev_get(dev);
+        if (in6_dev) {
+                read_lock_bh(&in6_dev->lock);
+                list_for_each_entry(ifp, &in6_dev->addr_list, if_list) {
+                        pgid = (union ib_gid *)&ifp->addr;
+                        update_gid_table(ibdev, port, pgid, 0);
+                }
+                read_unlock_bh(&in6_dev->lock);
+                in6_dev_put(in6_dev);
+        }
+#endif
+}
+
+static int mlx4_ib_init_gid_table(struct mlx4_ib_dev *ibdev)
+{
+        struct  net_device *dev;
+
+        if (reset_gid_table(ibdev))
+                return -1;
+
+        read_lock(&dev_base_lock);
+
+        for_each_netdev(&init_net, dev) {
+                u8 port = mlx4_ib_get_dev_port(dev, ibdev);
+                if (port)
+                        mlx4_ib_get_dev_addr(dev, ibdev, port);
+        }
+
+        read_unlock(&dev_base_lock);
+
+        return 0;
+}
+
+static void mlx4_ib_scan_netdevs(struct mlx4_ib_dev *ibdev)
+{
         struct mlx4_ib_iboe *iboe;
         int port;
 
-        if (!net_eq(dev_net(dev), &init_net))
-                return NOTIFY_DONE;
-
-        ibdev = container_of(this, struct mlx4_ib_dev, iboe.nb);
         iboe = &ibdev->iboe;
 
         spin_lock(&iboe->lock);
         mlx4_foreach_ib_transport_port(port, ibdev->dev) {
-                oldnd = iboe->netdevs[port - 1];
+                struct net_device *old_master = iboe->masters[port - 1];
+                struct net_device *curr_master;
                 iboe->netdevs[port - 1] =
                         mlx4_get_protocol_dev(ibdev->dev, MLX4_PROT_ETH, port);
-                if (oldnd != iboe->netdevs[port - 1]) {
-                        if (iboe->netdevs[port - 1])
-                                netdev_added(ibdev, port);
-                        else
-                                netdev_removed(ibdev, port);
+
+                if (iboe->netdevs[port - 1] &&
+                    netif_is_bond_slave(iboe->netdevs[port - 1])) {
+                        rtnl_lock();
+                        iboe->masters[port - 1] = netdev_master_upper_dev_get(
+                                iboe->netdevs[port - 1]);
+                        rtnl_unlock();
                 }
-        }
+                curr_master = iboe->masters[port - 1];
 
-        if (dev == iboe->netdevs[0] ||
-            (iboe->netdevs[0] && rdma_vlan_dev_real_dev(dev) == iboe->netdevs[0]))
-                handle_en_event(ibdev, 1, event);
-        else if (dev == iboe->netdevs[1]
-                 || (iboe->netdevs[1] && rdma_vlan_dev_real_dev(dev) == iboe->netdevs[1]))
-                handle_en_event(ibdev, 2, event);
+                /* if bonding is used it is possible that we add it to masters
+                    only after IP address is assigned to the net bonding
+                    interface */
+                if (curr_master && (old_master != curr_master))
+                        mlx4_ib_get_dev_addr(curr_master, ibdev, port);
+        }
 
         spin_unlock(&iboe->lock);
+}
+
+static int mlx4_ib_netdev_event(struct notifier_block *this,
+                                unsigned long event, void *ptr)
+{
+        struct net_device *dev = netdev_notifier_info_to_dev(ptr);
+        struct mlx4_ib_dev *ibdev;
+
+        if (!net_eq(dev_net(dev), &init_net))
+                return NOTIFY_DONE;
+
+        ibdev = container_of(this, struct mlx4_ib_dev, iboe.nb);
+        mlx4_ib_scan_netdevs(ibdev);
 
         return NOTIFY_DONE;
 }
@@ -1886,11 +2024,35 @@ static void *mlx4_ib_add(struct mlx4_dev *dev)
         if (mlx4_ib_init_sriov(ibdev))
                 goto err_mad;
 
-        if (dev->caps.flags & MLX4_DEV_CAP_FLAG_IBOE && !iboe->nb.notifier_call) {
-                iboe->nb.notifier_call = mlx4_ib_netdev_event;
-                err = register_netdevice_notifier(&iboe->nb);
-                if (err)
-                        goto err_sriov;
+        if (dev->caps.flags & MLX4_DEV_CAP_FLAG_IBOE) {
+                if (!iboe->nb.notifier_call) {
+                        iboe->nb.notifier_call = mlx4_ib_netdev_event;
+                        err = register_netdevice_notifier(&iboe->nb);
+                        if (err) {
+                                iboe->nb.notifier_call = NULL;
+                                goto err_notif;
+                        }
+                }
+                if (!iboe->nb_inet.notifier_call) {
+                        iboe->nb_inet.notifier_call = mlx4_ib_inet_event;
+                        err = register_inetaddr_notifier(&iboe->nb_inet);
+                        if (err) {
+                                iboe->nb_inet.notifier_call = NULL;
+                                goto err_notif;
+                        }
+                }
+#if IS_ENABLED(CONFIG_IPV6)
+                if (!iboe->nb_inet6.notifier_call) {
+                        iboe->nb_inet6.notifier_call = mlx4_ib_inet6_event;
+                        err = register_inet6addr_notifier(&iboe->nb_inet6);
+                        if (err) {
+                                iboe->nb_inet6.notifier_call = NULL;
+                                goto err_notif;
+                        }
+                }
+#endif
+                mlx4_ib_scan_netdevs(ibdev);
+                mlx4_ib_init_gid_table(ibdev);
         }
 
         for (j = 0; j < ARRAY_SIZE(mlx4_class_attributes); ++j) {
@@ -1916,11 +2078,25 @@ static void *mlx4_ib_add(struct mlx4_dev *dev)
         return ibdev;
 
 err_notif:
-        if (unregister_netdevice_notifier(&ibdev->iboe.nb))
-                pr_warn("failure unregistering notifier\n");
+        if (ibdev->iboe.nb.notifier_call) {
+                if (unregister_netdevice_notifier(&ibdev->iboe.nb))
+                        pr_warn("failure unregistering notifier\n");
+                ibdev->iboe.nb.notifier_call = NULL;
+        }
+        if (ibdev->iboe.nb_inet.notifier_call) {
+                if (unregister_inetaddr_notifier(&ibdev->iboe.nb_inet))
+                        pr_warn("failure unregistering notifier\n");
+                ibdev->iboe.nb_inet.notifier_call = NULL;
+        }
+#if IS_ENABLED(CONFIG_IPV6)
+        if (ibdev->iboe.nb_inet6.notifier_call) {
+                if (unregister_inet6addr_notifier(&ibdev->iboe.nb_inet6))
+                        pr_warn("failure unregistering notifier\n");
+                ibdev->iboe.nb_inet6.notifier_call = NULL;
+        }
+#endif
         flush_workqueue(wq);
 
-err_sriov:
         mlx4_ib_close_sriov(ibdev);
 
 err_mad:
@@ -2039,6 +2215,19 @@ static void mlx4_ib_remove(struct mlx4_dev *dev, void *ibdev_ptr)
                 kfree(ibdev->ib_uc_qpns_bitmap);
         }
 
+        if (ibdev->iboe.nb_inet.notifier_call) {
+                if (unregister_inetaddr_notifier(&ibdev->iboe.nb_inet))
+                        pr_warn("failure unregistering notifier\n");
+                ibdev->iboe.nb_inet.notifier_call = NULL;
+        }
+#if IS_ENABLED(CONFIG_IPV6)
+        if (ibdev->iboe.nb_inet6.notifier_call) {
+                if (unregister_inet6addr_notifier(&ibdev->iboe.nb_inet6))
+                        pr_warn("failure unregistering notifier\n");
+                ibdev->iboe.nb_inet6.notifier_call = NULL;
+        }
+#endif
+
         iounmap(ibdev->uar_map);
         for (p = 0; p < ibdev->num_ports; ++p)
                 if (ibdev->counters[p] != -1)
diff --git a/drivers/infiniband/hw/mlx4/mlx4_ib.h b/drivers/infiniband/hw/mlx4/mlx4_ib.h
index 837f9aa3d2a2..a230683af940 100644
--- a/drivers/infiniband/hw/mlx4/mlx4_ib.h
+++ b/drivers/infiniband/hw/mlx4/mlx4_ib.h
@@ -432,7 +432,10 @@ struct mlx4_ib_sriov {
 struct mlx4_ib_iboe {
         spinlock_t              lock;
         struct net_device      *netdevs[MLX4_MAX_PORTS];
+        struct net_device      *masters[MLX4_MAX_PORTS];
         struct notifier_block   nb;
+        struct notifier_block   nb_inet;
+        struct notifier_block   nb_inet6;
         union ib_gid            gid_table[MLX4_MAX_PORTS][128];
 };
 
@@ -683,9 +686,6 @@ int __mlx4_ib_query_pkey(struct ib_device *ibdev, u8 port, u16 index,
 int __mlx4_ib_query_gid(struct ib_device *ibdev, u8 port, int index,
                         union ib_gid *gid, int netw_view);
 
-int mlx4_ib_resolve_grh(struct mlx4_ib_dev *dev, const struct ib_ah_attr *ah_attr,
-                        u8 *mac, int *is_mcast, u8 port);
-
 static inline bool mlx4_ib_ah_grh_present(struct mlx4_ib_ah *ah)
 {
         u8 port = be32_to_cpu(ah->av.ib.port_pd) >> 24 & 3;
diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c
index 387fbf274151..d8f4d1fe8494 100644
--- a/drivers/infiniband/hw/mlx4/qp.c
+++ b/drivers/infiniband/hw/mlx4/qp.c
@@ -90,6 +90,21 @@ enum {
         MLX4_RAW_QP_MSGMAX      = 31,
 };
 
+#ifndef ETH_ALEN
+#define ETH_ALEN        6
+#endif
+static inline u64 mlx4_mac_to_u64(u8 *addr)
+{
+        u64 mac = 0;
+        int i;
+
+        for (i = 0; i < ETH_ALEN; i++) {
+                mac <<= 8;
+                mac |= addr[i];
+        }
+        return mac;
+}
+
 static const __be32 mlx4_ib_opcode[] = {
         [IB_WR_SEND]                            = cpu_to_be32(MLX4_OPCODE_SEND),
         [IB_WR_LSO]                             = cpu_to_be32(MLX4_OPCODE_LSO),
@@ -1171,16 +1186,15 @@ static void mlx4_set_sched(struct mlx4_qp_path *path, u8 port)
         path->sched_queue = (path->sched_queue & 0xbf) | ((port - 1) << 6);
 }
 
-static int mlx4_set_path(struct mlx4_ib_dev *dev, const struct ib_ah_attr *ah,
-                         struct mlx4_qp_path *path, u8 port)
+static int _mlx4_set_path(struct mlx4_ib_dev *dev, const struct ib_ah_attr *ah,
+                          u64 smac, u16 vlan_tag, struct mlx4_qp_path *path,
+                          u8 port)
 {
-        int err;
         int is_eth = rdma_port_get_link_layer(&dev->ib_dev, port) ==
                 IB_LINK_LAYER_ETHERNET;
-        u8 mac[6];
-        int is_mcast;
-        u16 vlan_tag;
         int vidx;
+        int smac_index;
+
 
         path->grh_mylmc     = ah->src_path_bits & 0x7f;
         path->rlid          = cpu_to_be16(ah->dlid);
@@ -1215,22 +1229,27 @@ static int mlx4_set_path(struct mlx4_ib_dev *dev, const struct ib_ah_attr *ah,
                 if (!(ah->ah_flags & IB_AH_GRH))
                         return -1;
 
-                err = mlx4_ib_resolve_grh(dev, ah, mac, &is_mcast, port);
-                if (err)
-                        return err;
-
-                memcpy(path->dmac, mac, 6);
+                memcpy(path->dmac, ah->dmac, ETH_ALEN);
                 path->ackto = MLX4_IB_LINK_TYPE_ETH;
-                /* use index 0 into MAC table for IBoE */
-                path->grh_mylmc &= 0x80;
+                /* find the index  into MAC table for IBoE */
+                if (!is_zero_ether_addr((const u8 *)&smac)) {
+                        if (mlx4_find_cached_mac(dev->dev, port, smac,
+                                                 &smac_index))
+                                return -ENOENT;
+                } else {
+                        smac_index = 0;
+                }
 
-                vlan_tag = rdma_get_vlan_id(&dev->iboe.gid_table[port - 1][ah->grh.sgid_index]);
+                path->grh_mylmc &= 0x80 | smac_index;
+
+                path->feup |= MLX4_FEUP_FORCE_ETH_UP;
                 if (vlan_tag < 0x1000) {
                         if (mlx4_find_cached_vlan(dev->dev, port, vlan_tag, &vidx))
                                 return -ENOENT;
 
                         path->vlan_index = vidx;
                         path->fl = 1 << 6;
+                        path->feup |= MLX4_FVL_FORCE_ETH_VLAN;
                 }
         } else
                 path->sched_queue = MLX4_IB_DEFAULT_SCHED_QUEUE |
@@ -1239,6 +1258,28 @@ static int mlx4_set_path(struct mlx4_ib_dev *dev, const struct ib_ah_attr *ah,
         return 0;
 }
 
+static int mlx4_set_path(struct mlx4_ib_dev *dev, const struct ib_qp_attr *qp,
+                         enum ib_qp_attr_mask qp_attr_mask,
+                         struct mlx4_qp_path *path, u8 port)
+{
+        return _mlx4_set_path(dev, &qp->ah_attr,
+                              mlx4_mac_to_u64((u8 *)qp->smac),
+                              (qp_attr_mask & IB_QP_VID) ? qp->vlan_id : 0xffff,
+                              path, port);
+}
+
+static int mlx4_set_alt_path(struct mlx4_ib_dev *dev,
+                             const struct ib_qp_attr *qp,
+                             enum ib_qp_attr_mask qp_attr_mask,
+                             struct mlx4_qp_path *path, u8 port)
+{
+        return _mlx4_set_path(dev, &qp->alt_ah_attr,
+                              mlx4_mac_to_u64((u8 *)qp->alt_smac),
+                              (qp_attr_mask & IB_QP_ALT_VID) ?
+                              qp->alt_vlan_id : 0xffff,
+                              path, port);
+}
+
 static void update_mcg_macs(struct mlx4_ib_dev *dev, struct mlx4_ib_qp *qp)
 {
         struct mlx4_ib_gid_entry *ge, *tmp;
@@ -1362,7 +1403,7 @@ static int __mlx4_ib_modify_qp(struct ib_qp *ibqp,
         }
 
         if (attr_mask & IB_QP_AV) {
-                if (mlx4_set_path(dev, &attr->ah_attr, &context->pri_path,
+                if (mlx4_set_path(dev, attr, attr_mask, &context->pri_path,
                                   attr_mask & IB_QP_PORT ?
                                   attr->port_num : qp->port))
                         goto out;
@@ -1385,8 +1426,8 @@ static int __mlx4_ib_modify_qp(struct ib_qp *ibqp,
                     dev->dev->caps.pkey_table_len[attr->alt_port_num])
                         goto out;
 
-                if (mlx4_set_path(dev, &attr->alt_ah_attr, &context->alt_path,
-                                  attr->alt_port_num))
+                if (mlx4_set_alt_path(dev, attr, attr_mask, &context->alt_path,
+                                      attr->alt_port_num))
                         goto out;
 
                 context->alt_path.pkey_index = attr->alt_pkey_index;
@@ -1497,6 +1538,17 @@ static int __mlx4_ib_modify_qp(struct ib_qp *ibqp,
                 context->pri_path.ackto = (context->pri_path.ackto & 0xf8) |
                                         MLX4_IB_LINK_TYPE_ETH;
 
+        if (ibqp->qp_type == IB_QPT_UD && (new_state == IB_QPS_RTR)) {
+                int is_eth = rdma_port_get_link_layer(
+                                &dev->ib_dev, qp->port) ==
+                                IB_LINK_LAYER_ETHERNET;
+                if (is_eth) {
+                        context->pri_path.ackto = MLX4_IB_LINK_TYPE_ETH;
+                        optpar |= MLX4_QP_OPTPAR_PRIMARY_ADDR_PATH;
+                }
+        }
+
+
         if (cur_state == IB_QPS_RTS && new_state == IB_QPS_SQD  &&
             attr_mask & IB_QP_EN_SQD_ASYNC_NOTIFY && attr->en_sqd_async_notify)
                 sqd_event = 1;
@@ -1599,13 +1651,21 @@ int mlx4_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
         struct mlx4_ib_qp *qp = to_mqp(ibqp);
         enum ib_qp_state cur_state, new_state;
         int err = -EINVAL;
-
+        int ll;
         mutex_lock(&qp->mutex);
 
         cur_state = attr_mask & IB_QP_CUR_STATE ? attr->cur_qp_state : qp->state;
         new_state = attr_mask & IB_QP_STATE ? attr->qp_state : cur_state;
 
-        if (!ib_modify_qp_is_ok(cur_state, new_state, ibqp->qp_type, attr_mask)) {
+        if (cur_state == new_state && cur_state == IB_QPS_RESET) {
+                ll = IB_LINK_LAYER_UNSPECIFIED;
+        } else {
+                int port = attr_mask & IB_QP_PORT ? attr->port_num : qp->port;
+                ll = rdma_port_get_link_layer(&dev->ib_dev, port);
+        }
+
+        if (!ib_modify_qp_is_ok(cur_state, new_state, ibqp->qp_type,
+                                attr_mask, ll)) {
                 pr_debug("qpn 0x%x: invalid attribute mask specified "
                          "for transition %d to %d. qp_type %d,"
                          " attr_mask 0x%x\n",
@@ -1822,8 +1882,10 @@ static int build_mlx_header(struct mlx4_ib_sqp *sqp, struct ib_send_wr *wr,
                                 return err;
                 }
 
-                vlan = rdma_get_vlan_id(&sgid);
-                is_vlan = vlan < 0x1000;
+                if (ah->av.eth.vlan != 0xffff) {
+                        vlan = be16_to_cpu(ah->av.eth.vlan) & 0x0fff;
+                        is_vlan = 1;
+                }
         }
         ib_ud_header_init(send_size, !is_eth, is_eth, is_vlan, is_grh, 0, &sqp->ud_header);
 
diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c
index 70dd77085db6..ae37fb9bf262 100644
--- a/drivers/infiniband/hw/mlx5/qp.c
+++ b/drivers/infiniband/hw/mlx5/qp.c
@@ -1664,7 +1664,8 @@ int mlx5_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
         new_state = attr_mask & IB_QP_STATE ? attr->qp_state : cur_state;
 
         if (ibqp->qp_type != MLX5_IB_QPT_REG_UMR &&
-            !ib_modify_qp_is_ok(cur_state, new_state, ibqp->qp_type, attr_mask))
+            !ib_modify_qp_is_ok(cur_state, new_state, ibqp->qp_type, attr_mask,
+                                IB_LINK_LAYER_UNSPECIFIED))
                 goto out;
 
         if ((attr_mask & IB_QP_PORT) &&
diff --git a/drivers/infiniband/hw/mthca/mthca_qp.c b/drivers/infiniband/hw/mthca/mthca_qp.c
index 26a684536109..e354b2f04ad9 100644
--- a/drivers/infiniband/hw/mthca/mthca_qp.c
+++ b/drivers/infiniband/hw/mthca/mthca_qp.c
@@ -860,7 +860,8 @@ int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask,
 
         new_state = attr_mask & IB_QP_STATE ? attr->qp_state : cur_state;
 
-        if (!ib_modify_qp_is_ok(cur_state, new_state, ibqp->qp_type, attr_mask)) {
+        if (!ib_modify_qp_is_ok(cur_state, new_state, ibqp->qp_type, attr_mask,
+                                IB_LINK_LAYER_UNSPECIFIED)) {
                 mthca_dbg(dev, "Bad QP transition (transport %d) "
                           "%d->%d with attr 0x%08x\n",
                           qp->transport, cur_state, new_state,
diff --git a/drivers/infiniband/hw/ocrdma/Kconfig b/drivers/infiniband/hw/ocrdma/Kconfig
index b5b6056c8518..c0cddc0192d1 100644
--- a/drivers/infiniband/hw/ocrdma/Kconfig
+++ b/drivers/infiniband/hw/ocrdma/Kconfig
@@ -1,6 +1,6 @@
 config INFINIBAND_OCRDMA
         tristate "Emulex One Connect HCA support"
-        depends on ETHERNET && NETDEVICES && PCI && (IPV6 || IPV6=n)
+        depends on ETHERNET && NETDEVICES && PCI && INET && (IPV6 || IPV6=n)
         select NET_VENDOR_EMULEX
         select BE2NET
         ---help---
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma.h b/drivers/infiniband/hw/ocrdma/ocrdma.h
index 294dd27b601e..7c001b97b23f 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma.h
+++ b/drivers/infiniband/hw/ocrdma/ocrdma.h
@@ -423,5 +423,17 @@ static inline int is_cqe_wr_imm(struct ocrdma_cqe *cqe)
                 OCRDMA_CQE_WRITE_IMM) ? 1 : 0;
 }
 
+static inline int ocrdma_resolve_dmac(struct ocrdma_dev *dev,
+                struct ib_ah_attr *ah_attr, u8 *mac_addr)
+{
+        struct in6_addr in6;
+
+        memcpy(&in6, ah_attr->grh.dgid.raw, sizeof(in6));
+        if (rdma_is_multicast_addr(&in6))
+                rdma_get_mcast_mac(&in6, mac_addr);
+        else
+                memcpy(mac_addr, ah_attr->dmac, ETH_ALEN);
+        return 0;
+}
 
 #endif
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_ah.c b/drivers/infiniband/hw/ocrdma/ocrdma_ah.c
index 69da5dd1ca8a..34071143006e 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_ah.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_ah.c
@@ -49,7 +49,7 @@ static inline int set_av_attr(struct ocrdma_dev *dev, struct ocrdma_ah *ah,
 
         ah->sgid_index = attr->grh.sgid_index;
 
-        vlan_tag = rdma_get_vlan_id(&attr->grh.dgid);
+        vlan_tag = attr->vlan_id;
         if (!vlan_tag || (vlan_tag > 0xFFF))
                 vlan_tag = dev->pvid;
         if (vlan_tag && (vlan_tag < 0x1000)) {
@@ -64,7 +64,8 @@ static inline int set_av_attr(struct ocrdma_dev *dev, struct ocrdma_ah *ah,
                 eth_sz = sizeof(struct ocrdma_eth_basic);
         }
         memcpy(&eth.smac[0], &dev->nic_info.mac_addr[0], ETH_ALEN);
-        status = ocrdma_resolve_dgid(dev, &attr->grh.dgid, &eth.dmac[0]);
+        memcpy(&eth.dmac[0], attr->dmac, ETH_ALEN);
+        status = ocrdma_resolve_dmac(dev, attr, &eth.dmac[0]);
         if (status)
                 return status;
         status = ocrdma_query_gid(&dev->ibdev, 1, attr->grh.sgid_index,
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
index 56bf32fcb62c..1664d648cbfc 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
@@ -2076,23 +2076,6 @@ mbx_err:
         return status;
 }
 
-int ocrdma_resolve_dgid(struct ocrdma_dev *dev, union ib_gid *dgid,
-                        u8 *mac_addr)
-{
-        struct in6_addr in6;
-
-        memcpy(&in6, dgid, sizeof in6);
-        if (rdma_is_multicast_addr(&in6)) {
-                rdma_get_mcast_mac(&in6, mac_addr);
-        } else if (rdma_link_local_addr(&in6)) {
-                rdma_get_ll_mac(&in6, mac_addr);
-        } else {
-                pr_err("%s() fail to resolve mac_addr.\n", __func__);
-                return -EINVAL;
-        }
-        return 0;
-}
-
 static int ocrdma_set_av_params(struct ocrdma_qp *qp,
                                 struct ocrdma_modify_qp *cmd,
                                 struct ib_qp_attr *attrs)
@@ -2126,14 +2109,14 @@ static int ocrdma_set_av_params(struct ocrdma_qp *qp,
 
         qp->sgid_idx = ah_attr->grh.sgid_index;
         memcpy(&cmd->params.sgid[0], &sgid.raw[0], sizeof(cmd->params.sgid));
-        ocrdma_resolve_dgid(qp->dev, &ah_attr->grh.dgid, &mac_addr[0]);
+        ocrdma_resolve_dmac(qp->dev, ah_attr, &mac_addr[0]);
         cmd->params.dmac_b0_to_b3 = mac_addr[0] | (mac_addr[1] << 8) |
                                 (mac_addr[2] << 16) | (mac_addr[3] << 24);
         /* convert them to LE format. */
         ocrdma_cpu_to_le32(&cmd->params.dgid[0], sizeof(cmd->params.dgid));
         ocrdma_cpu_to_le32(&cmd->params.sgid[0], sizeof(cmd->params.sgid));
         cmd->params.vlan_dmac_b4_to_b5 = mac_addr[4] | (mac_addr[5] << 8);
-        vlan_id = rdma_get_vlan_id(&sgid);
+        vlan_id = ah_attr->vlan_id;
         if (vlan_id && (vlan_id < 0x1000)) {
                 cmd->params.vlan_dmac_b4_to_b5 |=
                     vlan_id << OCRDMA_QP_PARAMS_VLAN_SHIFT;
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.h b/drivers/infiniband/hw/ocrdma/ocrdma_hw.h
index f2a89d4cc7c4..82fe332ae6c6 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.h
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.h
@@ -94,7 +94,6 @@ void ocrdma_ring_cq_db(struct ocrdma_dev *, u16 cq_id, bool armed,
 int ocrdma_mbx_get_link_speed(struct ocrdma_dev *dev, u8 *lnk_speed);
 int ocrdma_query_config(struct ocrdma_dev *,
                         struct ocrdma_mbx_query_config *config);
-int ocrdma_resolve_dgid(struct ocrdma_dev *, union ib_gid *dgid, u8 *mac_addr);
 
 int ocrdma_mbx_alloc_pd(struct ocrdma_dev *, struct ocrdma_pd *);
 int ocrdma_mbx_dealloc_pd(struct ocrdma_dev *, struct ocrdma_pd *);
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_main.c b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
index 91443bcb9e0e..2ca86ca818bd 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_main.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
@@ -67,46 +67,24 @@ void ocrdma_get_guid(struct ocrdma_dev *dev, u8 *guid)
         guid[7] = mac_addr[5];
 }
 
-static void ocrdma_build_sgid_mac(union ib_gid *sgid, unsigned char *mac_addr,
-                                  bool is_vlan, u16 vlan_id)
-{
-        sgid->global.subnet_prefix = cpu_to_be64(0xfe80000000000000LL);
-        sgid->raw[8] = mac_addr[0] ^ 2;
-        sgid->raw[9] = mac_addr[1];
-        sgid->raw[10] = mac_addr[2];
-        if (is_vlan) {
-                sgid->raw[11] = vlan_id >> 8;
-                sgid->raw[12] = vlan_id & 0xff;
-        } else {
-                sgid->raw[11] = 0xff;
-                sgid->raw[12] = 0xfe;
-        }
-        sgid->raw[13] = mac_addr[3];
-        sgid->raw[14] = mac_addr[4];
-        sgid->raw[15] = mac_addr[5];
-}
-
-static bool ocrdma_add_sgid(struct ocrdma_dev *dev, unsigned char *mac_addr,
-                            bool is_vlan, u16 vlan_id)
+static bool ocrdma_add_sgid(struct ocrdma_dev *dev, union ib_gid *new_sgid)
 {
         int i;
-        union ib_gid new_sgid;
         unsigned long flags;
 
         memset(&ocrdma_zero_sgid, 0, sizeof(union ib_gid));
 
-        ocrdma_build_sgid_mac(&new_sgid, mac_addr, is_vlan, vlan_id);
 
         spin_lock_irqsave(&dev->sgid_lock, flags);
         for (i = 0; i < OCRDMA_MAX_SGID; i++) {
                 if (!memcmp(&dev->sgid_tbl[i], &ocrdma_zero_sgid,
                             sizeof(union ib_gid))) {
                         /* found free entry */
-                        memcpy(&dev->sgid_tbl[i], &new_sgid,
+                        memcpy(&dev->sgid_tbl[i], new_sgid,
                                sizeof(union ib_gid));
                         spin_unlock_irqrestore(&dev->sgid_lock, flags);
                         return true;
-                } else if (!memcmp(&dev->sgid_tbl[i], &new_sgid,
+                } else if (!memcmp(&dev->sgid_tbl[i], new_sgid,
                                    sizeof(union ib_gid))) {
                         /* entry already present, no addition is required. */
                         spin_unlock_irqrestore(&dev->sgid_lock, flags);
@@ -117,20 +95,17 @@ static bool ocrdma_add_sgid(struct ocrdma_dev *dev, unsigned char *mac_addr,
         return false;
 }
 
-static bool ocrdma_del_sgid(struct ocrdma_dev *dev, unsigned char *mac_addr,
-                            bool is_vlan, u16 vlan_id)
+static bool ocrdma_del_sgid(struct ocrdma_dev *dev, union ib_gid *sgid)
 {
         int found = false;
         int i;
-        union ib_gid sgid;
         unsigned long flags;
 
-        ocrdma_build_sgid_mac(&sgid, mac_addr, is_vlan, vlan_id);
 
         spin_lock_irqsave(&dev->sgid_lock, flags);
         /* first is default sgid, which cannot be deleted. */
         for (i = 1; i < OCRDMA_MAX_SGID; i++) {
-                if (!memcmp(&dev->sgid_tbl[i], &sgid, sizeof(union ib_gid))) {
+                if (!memcmp(&dev->sgid_tbl[i], sgid, sizeof(union ib_gid))) {
                         /* found matching entry */
                         memset(&dev->sgid_tbl[i], 0, sizeof(union ib_gid));
                         found = true;
@@ -141,75 +116,18 @@ static bool ocrdma_del_sgid(struct ocrdma_dev *dev, unsigned char *mac_addr,
         return found;
 }
 
-static void ocrdma_add_default_sgid(struct ocrdma_dev *dev)
-{
-        /* GID Index 0 - Invariant manufacturer-assigned EUI-64 */
-        union ib_gid *sgid = &dev->sgid_tbl[0];
-
-        sgid->global.subnet_prefix = cpu_to_be64(0xfe80000000000000LL);
-        ocrdma_get_guid(dev, &sgid->raw[8]);
-}
-
-#if IS_ENABLED(CONFIG_VLAN_8021Q)
-static void ocrdma_add_vlan_sgids(struct ocrdma_dev *dev)
-{
-        struct net_device *netdev, *tmp;
-        u16 vlan_id;
-        bool is_vlan;
-
-        netdev = dev->nic_info.netdev;
-
-        rcu_read_lock();
-        for_each_netdev_rcu(&init_net, tmp) {
-                if (netdev == tmp || vlan_dev_real_dev(tmp) == netdev) {
-                        if (!netif_running(tmp) || !netif_oper_up(tmp))
-                                continue;
-                        if (netdev != tmp) {
-                                vlan_id = vlan_dev_vlan_id(tmp);
-                                is_vlan = true;
-                        } else {
-                                is_vlan = false;
-                                vlan_id = 0;
-                                tmp = netdev;
-                        }
-                        ocrdma_add_sgid(dev, tmp->dev_addr, is_vlan, vlan_id);
-                }
-        }
-        rcu_read_unlock();
-}
-#else
-static void ocrdma_add_vlan_sgids(struct ocrdma_dev *dev)
-{
-
-}
-#endif /* VLAN */
-
-static int ocrdma_build_sgid_tbl(struct ocrdma_dev *dev)
+static int ocrdma_addr_event(unsigned long event, struct net_device *netdev,
+                             union ib_gid *gid)
 {
-        ocrdma_add_default_sgid(dev);
-        ocrdma_add_vlan_sgids(dev);
-        return 0;
-}
-
-#if IS_ENABLED(CONFIG_IPV6)
-
-static int ocrdma_inet6addr_event(struct notifier_block *notifier,
-                                  unsigned long event, void *ptr)
-{
-        struct inet6_ifaddr *ifa = (struct inet6_ifaddr *)ptr;
-        struct net_device *netdev = ifa->idev->dev;
         struct ib_event gid_event;
         struct ocrdma_dev *dev;
         bool found = false;
         bool updated = false;
         bool is_vlan = false;
-        u16 vid = 0;
 
         is_vlan = netdev->priv_flags & IFF_802_1Q_VLAN;
-        if (is_vlan) {
-                vid = vlan_dev_vlan_id(netdev);
+        if (is_vlan)
                 netdev = vlan_dev_real_dev(netdev);
-        }
 
         rcu_read_lock();
         list_for_each_entry_rcu(dev, &ocrdma_dev_list, entry) {
@@ -222,16 +140,14 @@ static int ocrdma_inet6addr_event(struct notifier_block *notifier,
 
         if (!found)
                 return NOTIFY_DONE;
-        if (!rdma_link_local_addr((struct in6_addr *)&ifa->addr))
-                return NOTIFY_DONE;
 
         mutex_lock(&dev->dev_lock);
         switch (event) {
         case NETDEV_UP:
-                updated = ocrdma_add_sgid(dev, netdev->dev_addr, is_vlan, vid);
+                updated = ocrdma_add_sgid(dev, gid);
                 break;
         case NETDEV_DOWN:
-                updated = ocrdma_del_sgid(dev, netdev->dev_addr, is_vlan, vid);
+                updated = ocrdma_del_sgid(dev, gid);
                 break;
         default:
                 break;
@@ -247,6 +163,32 @@ static int ocrdma_inet6addr_event(struct notifier_block *notifier,
         return NOTIFY_OK;
 }
 
+static int ocrdma_inetaddr_event(struct notifier_block *notifier,
+                                  unsigned long event, void *ptr)
+{
+        struct in_ifaddr *ifa = ptr;
+        union ib_gid gid;
+        struct net_device *netdev = ifa->ifa_dev->dev;
+
+        ipv6_addr_set_v4mapped(ifa->ifa_address, (struct in6_addr *)&gid);
+        return ocrdma_addr_event(event, netdev, &gid);
+}
+
+static struct notifier_block ocrdma_inetaddr_notifier = {
+        .notifier_call = ocrdma_inetaddr_event
+};
+
+#if IS_ENABLED(CONFIG_IPV6)
+
+static int ocrdma_inet6addr_event(struct notifier_block *notifier,
+                                  unsigned long event, void *ptr)
+{
+        struct inet6_ifaddr *ifa = (struct inet6_ifaddr *)ptr;
+        union  ib_gid *gid = (union ib_gid *)&ifa->addr;
+        struct net_device *netdev = ifa->idev->dev;
+        return ocrdma_addr_event(event, netdev, gid);
+}
+
 static struct notifier_block ocrdma_inet6addr_notifier = {
         .notifier_call = ocrdma_inet6addr_event
 };
@@ -423,10 +365,6 @@ static struct ocrdma_dev *ocrdma_add(struct be_dev_info *dev_info)
         if (status)
                 goto alloc_err;
 
-        status = ocrdma_build_sgid_tbl(dev);
-        if (status)
-                goto alloc_err;
-
         status = ocrdma_register_device(dev);
         if (status)
                 goto alloc_err;
@@ -553,6 +491,10 @@ static int __init ocrdma_init_module(void)
 {
         int status;
 
+        status = register_inetaddr_notifier(&ocrdma_inetaddr_notifier);
+        if (status)
+                return status;
+
 #if IS_ENABLED(CONFIG_IPV6)
         status = register_inet6addr_notifier(&ocrdma_inet6addr_notifier);
         if (status)
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index 7686dceadd29..aa92f40c9d50 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -1326,7 +1326,8 @@ int ocrdma_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
                 new_qps = old_qps;
         spin_unlock_irqrestore(&qp->q_lock, flags);
 
-        if (!ib_modify_qp_is_ok(old_qps, new_qps, ibqp->qp_type, attr_mask)) {
+        if (!ib_modify_qp_is_ok(old_qps, new_qps, ibqp->qp_type, attr_mask,
+                                IB_LINK_LAYER_ETHERNET)) {
                 pr_err("%s(%d) invalid attribute mask=0x%x specified for\n"
                        "qpn=0x%x of type=0x%x old_qps=0x%x, new_qps=0x%x\n",
                        __func__, dev->id, attr_mask, qp->id, ibqp->qp_type,
diff --git a/drivers/infiniband/hw/qib/qib_qp.c b/drivers/infiniband/hw/qib/qib_qp.c
index 3cca55b51e54..0cad0c40d742 100644
--- a/drivers/infiniband/hw/qib/qib_qp.c
+++ b/drivers/infiniband/hw/qib/qib_qp.c
@@ -585,7 +585,7 @@ int qib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
         new_state = attr_mask & IB_QP_STATE ? attr->qp_state : cur_state;
 
         if (!ib_modify_qp_is_ok(cur_state, new_state, ibqp->qp_type,
-                                attr_mask))
+                                attr_mask, IB_LINK_LAYER_UNSPECIFIED))
                 goto inval;
 
         if (attr_mask & IB_QP_AV) {