#include <linux/random.h>
 #include <net/ip6_checksum.h>
 #include <linux/bitops.h>
-
+#include <linux/qed/qede_roce.h>
 #include "qede.h"
 
 static char version[] =
        struct ethtool_drvinfo drvinfo;
        struct qede_dev *edev;
 
-       /* Currently only support name change */
-       if (event != NETDEV_CHANGENAME)
+       if (event != NETDEV_CHANGENAME && event != NETDEV_CHANGEADDR)
                goto done;
 
        /* Check whether this is a qede device */
                goto done;
        edev = netdev_priv(ndev);
 
-       /* Notify qed of the name change */
-       if (!edev->ops || !edev->ops->common)
-               goto done;
-       edev->ops->common->set_id(edev->cdev, edev->ndev->name,
-                                 "qede");
+       switch (event) {
+       case NETDEV_CHANGENAME:
+               /* Notify qed of the name change */
+               if (!edev->ops || !edev->ops->common)
+                       goto done;
+               edev->ops->common->set_id(edev->cdev, edev->ndev->name, "qede");
+               break;
+       case NETDEV_CHANGEADDR:
+               edev = netdev_priv(ndev);
+               qede_roce_event_changeaddr(edev);
+               break;
+       }
 
 done:
        return NOTIFY_DONE;
 
        qede_init_ndev(edev);
 
+       rc = qede_roce_dev_add(edev);
+       if (rc)
+               goto err3;
+
        rc = register_netdev(edev->ndev);
        if (rc) {
                DP_NOTICE(edev, "Cannot register net-device\n");
-               goto err3;
+               goto err4;
        }
 
        edev->ops->common->set_id(cdev, edev->ndev->name, DRV_MODULE_VERSION);
 
        return 0;
 
+err4:
+       qede_roce_dev_remove(edev);
 err3:
        free_netdev(edev->ndev);
 err2:
        DP_INFO(edev, "Starting qede_remove\n");
 
        cancel_delayed_work_sync(&edev->sp_task);
+
        unregister_netdev(ndev);
 
+       qede_roce_dev_remove(edev);
+
        edev->ops->common->set_power_state(cdev, PCI_D0);
 
        pci_set_drvdata(pdev, NULL);
 
        DP_INFO(edev, "Starting qede unload\n");
 
+       qede_roce_dev_event_close(edev);
        mutex_lock(&edev->qede_lock);
        edev->state = QEDE_STATE_CLOSED;
 
        /* Query whether link is already-up */
        memset(&link_output, 0, sizeof(link_output));
        edev->ops->common->get_link(edev->cdev, &link_output);
+       qede_roce_dev_event_open(edev);
        qede_link_update(edev, &link_output);
 
        DP_INFO(edev, "Ending successfully qede load\n");
 
--- /dev/null
+/* QLogic qedr NIC Driver
+ * Copyright (c) 2015-2016  QLogic Corporation
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and /or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#include <linux/pci.h>
+#include <linux/netdevice.h>
+#include <linux/list.h>
+#include <linux/mutex.h>
+#include <linux/qed/qede_roce.h>
+#include "qede.h"
+
+static struct qedr_driver *qedr_drv;
+static LIST_HEAD(qedr_dev_list);
+static DEFINE_MUTEX(qedr_dev_list_lock);
+
+bool qede_roce_supported(struct qede_dev *dev)
+{
+       return dev->dev_info.common.rdma_supported;
+}
+
+static void _qede_roce_dev_add(struct qede_dev *edev)
+{
+       if (!qedr_drv)
+               return;
+
+       edev->rdma_info.qedr_dev = qedr_drv->add(edev->cdev, edev->pdev,
+                                                edev->ndev);
+}
+
+static int qede_roce_create_wq(struct qede_dev *edev)
+{
+       INIT_LIST_HEAD(&edev->rdma_info.roce_event_list);
+       edev->rdma_info.roce_wq = create_singlethread_workqueue("roce_wq");
+       if (!edev->rdma_info.roce_wq) {
+               DP_NOTICE(edev, "qedr: Could not create workqueue\n");
+               return -ENOMEM;
+       }
+
+       return 0;
+}
+
+static void qede_roce_cleanup_event(struct qede_dev *edev)
+{
+       struct list_head *head = &edev->rdma_info.roce_event_list;
+       struct qede_roce_event_work *event_node;
+
+       flush_workqueue(edev->rdma_info.roce_wq);
+       while (!list_empty(head)) {
+               event_node = list_entry(head->next, struct qede_roce_event_work,
+                                       list);
+               cancel_work_sync(&event_node->work);
+               list_del(&event_node->list);
+               kfree(event_node);
+       }
+}
+
+static void qede_roce_destroy_wq(struct qede_dev *edev)
+{
+       qede_roce_cleanup_event(edev);
+       destroy_workqueue(edev->rdma_info.roce_wq);
+}
+
+int qede_roce_dev_add(struct qede_dev *edev)
+{
+       int rc = 0;
+
+       if (qede_roce_supported(edev)) {
+               rc = qede_roce_create_wq(edev);
+               if (rc)
+                       return rc;
+
+               INIT_LIST_HEAD(&edev->rdma_info.entry);
+               mutex_lock(&qedr_dev_list_lock);
+               list_add_tail(&edev->rdma_info.entry, &qedr_dev_list);
+               _qede_roce_dev_add(edev);
+               mutex_unlock(&qedr_dev_list_lock);
+       }
+
+       return rc;
+}
+
+static void _qede_roce_dev_remove(struct qede_dev *edev)
+{
+       if (qedr_drv && qedr_drv->remove && edev->rdma_info.qedr_dev)
+               qedr_drv->remove(edev->rdma_info.qedr_dev);
+       edev->rdma_info.qedr_dev = NULL;
+}
+
+void qede_roce_dev_remove(struct qede_dev *edev)
+{
+       if (!qede_roce_supported(edev))
+               return;
+
+       qede_roce_destroy_wq(edev);
+       mutex_lock(&qedr_dev_list_lock);
+       _qede_roce_dev_remove(edev);
+       list_del(&edev->rdma_info.entry);
+       mutex_unlock(&qedr_dev_list_lock);
+}
+
+static void _qede_roce_dev_open(struct qede_dev *edev)
+{
+       if (qedr_drv && edev->rdma_info.qedr_dev && qedr_drv->notify)
+               qedr_drv->notify(edev->rdma_info.qedr_dev, QEDE_UP);
+}
+
+static void qede_roce_dev_open(struct qede_dev *edev)
+{
+       if (!qede_roce_supported(edev))
+               return;
+
+       mutex_lock(&qedr_dev_list_lock);
+       _qede_roce_dev_open(edev);
+       mutex_unlock(&qedr_dev_list_lock);
+}
+
+static void _qede_roce_dev_close(struct qede_dev *edev)
+{
+       if (qedr_drv && edev->rdma_info.qedr_dev && qedr_drv->notify)
+               qedr_drv->notify(edev->rdma_info.qedr_dev, QEDE_DOWN);
+}
+
+static void qede_roce_dev_close(struct qede_dev *edev)
+{
+       if (!qede_roce_supported(edev))
+               return;
+
+       mutex_lock(&qedr_dev_list_lock);
+       _qede_roce_dev_close(edev);
+       mutex_unlock(&qedr_dev_list_lock);
+}
+
+static void qede_roce_dev_shutdown(struct qede_dev *edev)
+{
+       if (!qede_roce_supported(edev))
+               return;
+
+       mutex_lock(&qedr_dev_list_lock);
+       if (qedr_drv && edev->rdma_info.qedr_dev && qedr_drv->notify)
+               qedr_drv->notify(edev->rdma_info.qedr_dev, QEDE_CLOSE);
+       mutex_unlock(&qedr_dev_list_lock);
+}
+
+int qede_roce_register_driver(struct qedr_driver *drv)
+{
+       struct qede_dev *edev;
+       u8 qedr_counter = 0;
+
+       mutex_lock(&qedr_dev_list_lock);
+       if (qedr_drv) {
+               mutex_unlock(&qedr_dev_list_lock);
+               return -EINVAL;
+       }
+       qedr_drv = drv;
+
+       list_for_each_entry(edev, &qedr_dev_list, rdma_info.entry) {
+               struct net_device *ndev;
+
+               qedr_counter++;
+               _qede_roce_dev_add(edev);
+               ndev = edev->ndev;
+               if (netif_running(ndev) && netif_oper_up(ndev))
+                       _qede_roce_dev_open(edev);
+       }
+       mutex_unlock(&qedr_dev_list_lock);
+
+       DP_INFO(edev, "qedr: discovered and registered %d RoCE funcs\n",
+               qedr_counter);
+
+       return 0;
+}
+EXPORT_SYMBOL(qede_roce_register_driver);
+
+void qede_roce_unregister_driver(struct qedr_driver *drv)
+{
+       struct qede_dev *edev;
+
+       mutex_lock(&qedr_dev_list_lock);
+       list_for_each_entry(edev, &qedr_dev_list, rdma_info.entry) {
+               if (edev->rdma_info.qedr_dev)
+                       _qede_roce_dev_remove(edev);
+       }
+       qedr_drv = NULL;
+       mutex_unlock(&qedr_dev_list_lock);
+}
+EXPORT_SYMBOL(qede_roce_unregister_driver);
+
+static void qede_roce_changeaddr(struct qede_dev *edev)
+{
+       if (!qede_roce_supported(edev))
+               return;
+
+       if (qedr_drv && edev->rdma_info.qedr_dev && qedr_drv->notify)
+               qedr_drv->notify(edev->rdma_info.qedr_dev, QEDE_CHANGE_ADDR);
+}
+
+struct qede_roce_event_work *qede_roce_get_free_event_node(struct qede_dev
+                                                          *edev)
+{
+       struct qede_roce_event_work *event_node = NULL;
+       struct list_head *list_node = NULL;
+       bool found = false;
+
+       list_for_each(list_node, &edev->rdma_info.roce_event_list) {
+               event_node = list_entry(list_node, struct qede_roce_event_work,
+                                       list);
+               if (!work_pending(&event_node->work)) {
+                       found = true;
+                       break;
+               }
+       }
+
+       if (!found) {
+               event_node = kzalloc(sizeof(*event_node), GFP_KERNEL);
+               if (!event_node) {
+                       DP_NOTICE(edev,
+                                 "qedr: Could not allocate memory for roce work\n");
+                       return NULL;
+               }
+               list_add_tail(&event_node->list,
+                             &edev->rdma_info.roce_event_list);
+       }
+
+       return event_node;
+}
+
+static void qede_roce_handle_event(struct work_struct *work)
+{
+       struct qede_roce_event_work *event_node;
+       enum qede_roce_event event;
+       struct qede_dev *edev;
+
+       event_node = container_of(work, struct qede_roce_event_work, work);
+       event = event_node->event;
+       edev = event_node->ptr;
+
+       switch (event) {
+       case QEDE_UP:
+               qede_roce_dev_open(edev);
+               break;
+       case QEDE_DOWN:
+               qede_roce_dev_close(edev);
+               break;
+       case QEDE_CLOSE:
+               qede_roce_dev_shutdown(edev);
+               break;
+       case QEDE_CHANGE_ADDR:
+               qede_roce_changeaddr(edev);
+               break;
+       default:
+               DP_NOTICE(edev, "Invalid roce event %d", event);
+       }
+}
+
+static void qede_roce_add_event(struct qede_dev *edev,
+                               enum qede_roce_event event)
+{
+       struct qede_roce_event_work *event_node;
+
+       if (!edev->rdma_info.qedr_dev)
+               return;
+
+       event_node = qede_roce_get_free_event_node(edev);
+       if (!event_node)
+               return;
+
+       event_node->event = event;
+       event_node->ptr = edev;
+
+       INIT_WORK(&event_node->work, qede_roce_handle_event);
+       queue_work(edev->rdma_info.roce_wq, &event_node->work);
+}
+
+void qede_roce_dev_event_open(struct qede_dev *edev)
+{
+       qede_roce_add_event(edev, QEDE_UP);
+}
+
+void qede_roce_dev_event_close(struct qede_dev *edev)
+{
+       qede_roce_add_event(edev, QEDE_DOWN);
+}
+
+void qede_roce_event_changeaddr(struct qede_dev *edev)
+{
+       qede_roce_add_event(edev, QEDE_CHANGE_ADDR);
+}
 
--- /dev/null
+/* QLogic qedr NIC Driver
+ * Copyright (c) 2015-2016  QLogic Corporation
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and /or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#ifndef QEDE_ROCE_H
+#define QEDE_ROCE_H
+
+struct qedr_dev;
+struct qed_dev;
+struct qede_dev;
+
+enum qede_roce_event {
+       QEDE_UP,
+       QEDE_DOWN,
+       QEDE_CHANGE_ADDR,
+       QEDE_CLOSE
+};
+
+struct qede_roce_event_work {
+       struct list_head list;
+       struct work_struct work;
+       void *ptr;
+       enum qede_roce_event event;
+};
+
+struct qedr_driver {
+       unsigned char name[32];
+
+       struct qedr_dev* (*add)(struct qed_dev *, struct pci_dev *,
+                               struct net_device *);
+
+       void (*remove)(struct qedr_dev *);
+       void (*notify)(struct qedr_dev *, enum qede_roce_event);
+};
+
+/* APIs for RoCE driver to register callback handlers,
+ * which will be invoked when device is added, removed, ifup, ifdown
+ */
+int qede_roce_register_driver(struct qedr_driver *drv);
+void qede_roce_unregister_driver(struct qedr_driver *drv);
+
+bool qede_roce_supported(struct qede_dev *dev);
+
+#if IS_ENABLED(CONFIG_INFINIBAND_QEDR)
+int qede_roce_dev_add(struct qede_dev *dev);
+void qede_roce_dev_event_open(struct qede_dev *dev);
+void qede_roce_dev_event_close(struct qede_dev *dev);
+void qede_roce_dev_remove(struct qede_dev *dev);
+void qede_roce_event_changeaddr(struct qede_dev *qedr);
+#else
+static inline int qede_roce_dev_add(struct qede_dev *dev)
+{
+       return 0;
+}
+
+static inline void qede_roce_dev_event_open(struct qede_dev *dev) {}
+static inline void qede_roce_dev_event_close(struct qede_dev *dev) {}
+static inline void qede_roce_dev_remove(struct qede_dev *dev) {}
+static inline void qede_roce_event_changeaddr(struct qede_dev *qedr) {}
+#endif
+#endif