/* Control plane version in which OCTEP_CTRL_NET_H2F_CMD was added */
 static const u32 octep_ctrl_net_h2f_cmd_versions[OCTEP_CTRL_NET_H2F_CMD_MAX] = {
-       [OCTEP_CTRL_NET_H2F_CMD_INVALID ... OCTEP_CTRL_NET_H2F_CMD_GET_INFO] =
+       [OCTEP_CTRL_NET_H2F_CMD_INVALID ... OCTEP_CTRL_NET_H2F_CMD_DEV_REMOVE] =
         OCTEP_CP_VERSION(1, 0, 0)
 };
 
        return 0;
 }
 
+int octep_ctrl_net_dev_remove(struct octep_device *oct, int vfid)
+{
+       struct octep_ctrl_net_wait_data d = {};
+       struct octep_ctrl_net_h2f_req *req;
+
+       req = &d.data.req;
+       dev_dbg(&oct->pdev->dev, "Sending dev_unload msg to fw\n");
+       init_send_req(&d.msg, req, sizeof(int), vfid);
+       req->hdr.s.cmd = OCTEP_CTRL_NET_H2F_CMD_DEV_REMOVE;
+
+       return octep_send_mbox_req(oct, &d, false);
+}
 int octep_ctrl_net_uninit(struct octep_device *oct)
 {
        struct octep_ctrl_net_wait_data *pos, *n;
 
+       octep_ctrl_net_dev_remove(oct, OCTEP_CTRL_NET_INVALID_VFID);
+
        list_for_each_entry_safe(pos, n, &oct->ctrl_req_wait_list, list)
                pos->done = 1;
 
 
        OCTEP_CTRL_NET_H2F_CMD_RX_STATE,
        OCTEP_CTRL_NET_H2F_CMD_LINK_INFO,
        OCTEP_CTRL_NET_H2F_CMD_GET_INFO,
+       OCTEP_CTRL_NET_H2F_CMD_DEV_REMOVE,
        OCTEP_CTRL_NET_H2F_CMD_MAX
 };
 
 int octep_ctrl_net_get_info(struct octep_device *oct, int vfid,
                            struct octep_fw_info *info);
 
+/**
+ * octep_ctrl_net_dev_remove() - Indicate to firmware that a device unload has happened.
+ *
+ * @oct: non-null pointer to struct octep_device.
+ * @vfid: Index of virtual function.
+ *
+ * return value: 0 on success, -errno on failure.
+ */
+int octep_ctrl_net_dev_remove(struct octep_device *oct, int vfid);
+
 /**
  * octep_ctrl_net_uninit() - Uninitialize data for ctrl net.
  *