octeon_ep: support firmware notifications for VFs

Notifications from firmware to vf has to pass through PF
control mbox and via PF-VF mailboxes. The notifications have to
be parsed out from the control mbox and passed to the
PF-VF mailbox in order to reach the corresponding VF.
Version compatibility should also be checked before messages
are passed to the mailboxes.

Signed-off-by: Shinas Rasheed <srasheed@marvell.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.c b/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.c
index 9dff2166dbb7ed4395e39a71e9e110529db674a5..01b7be154c38751e74fec14e61c944dfbdfb7b28 100644 (file)
--- a/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.c
+++ b/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.c
@@ -13,6 +13,7 @@
 #include "octep_config.h"
 #include "octep_main.h"
 #include "octep_ctrl_net.h"
+#include "octep_pfvf_mbox.h"
 
 /* Control plane version */
 #define OCTEP_CP_VERSION_CURRENT       OCTEP_CP_VERSION(1, 0, 0)
@@ -329,6 +330,11 @@ static int process_mbox_notify(struct octep_device *oct,
            octep_ctrl_net_f2h_cmd_versions[cmd] < OCTEP_CP_VERSION_CURRENT)
                return -EOPNOTSUPP;
 
+       if (msg->hdr.s.is_vf) {
+               octep_pfvf_notify(oct, msg);
+               return 0;
+       }
+
        switch (cmd) {
        case OCTEP_CTRL_NET_F2H_CMD_LINK_STATUS:
                if (netif_running(netdev)) {

diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_pfvf_mbox.c b/drivers/net/ethernet/marvell/octeon_ep/octep_pfvf_mbox.c
index dbb5b8f4ef3066cf564fa69f9707262c93f83608..2e2c3be8a0b429c70500f38d9ea8c53a01c26c7a 100644 (file)
--- a/drivers/net/ethernet/marvell/octeon_ep/octep_pfvf_mbox.c
+++ b/drivers/net/ethernet/marvell/octeon_ep/octep_pfvf_mbox.c
@@ -21,6 +21,15 @@
 #include "octep_pfvf_mbox.h"
 #include "octep_ctrl_net.h"
 
+/* When a new command is implemented, the below table should be updated
+ * with new command and it's version info.
+ */
+static u32 pfvf_cmd_versions[OCTEP_PFVF_MBOX_CMD_MAX] = {
+       [0 ... OCTEP_PFVF_MBOX_CMD_DEV_REMOVE] = OCTEP_PFVF_MBOX_VERSION_V1,
+       [OCTEP_PFVF_MBOX_CMD_GET_FW_INFO ... OCTEP_PFVF_MBOX_NOTIF_LINK_STATUS] =
+               OCTEP_PFVF_MBOX_VERSION_V2
+};
+
 static void octep_pfvf_validate_version(struct octep_device *oct,  u32 vf_id,
                                        union octep_pfvf_mbox_word cmd,
                                        union octep_pfvf_mbox_word *rsp)
@@ -87,6 +96,34 @@ static void octep_pfvf_set_rx_state(struct octep_device *oct, u32 vf_id,
        rsp->s_link_state.type = OCTEP_PFVF_MBOX_TYPE_RSP_ACK;
 }
 
+static int octep_send_notification(struct octep_device *oct, u32 vf_id,
+                                  union octep_pfvf_mbox_word cmd)
+{
+       u32 max_rings_per_vf, vf_mbox_queue;
+       struct octep_mbox *mbox;
+
+       /* check if VF PF Mailbox is compatible for this notification */
+       if (pfvf_cmd_versions[cmd.s.opcode] > oct->vf_info[vf_id].mbox_version) {
+               dev_dbg(&oct->pdev->dev, "VF Mbox doesn't support Notification:%d on VF ver:%d\n",
+                       cmd.s.opcode, oct->vf_info[vf_id].mbox_version);
+               return -EOPNOTSUPP;
+       }
+
+       max_rings_per_vf = CFG_GET_MAX_RPVF(oct->conf);
+       vf_mbox_queue = vf_id * max_rings_per_vf;
+       if (!oct->mbox[vf_mbox_queue]) {
+               dev_err(&oct->pdev->dev, "Notif obtained for bad mbox vf %d\n", vf_id);
+               return -EINVAL;
+       }
+       mbox = oct->mbox[vf_mbox_queue];
+
+       mutex_lock(&mbox->lock);
+       writeq(cmd.u64, mbox->pf_vf_data_reg);
+       mutex_unlock(&mbox->lock);
+
+       return 0;
+}
+
 static void octep_pfvf_set_mtu(struct octep_device *oct, u32 vf_id,
                               union octep_pfvf_mbox_word cmd,
                               union octep_pfvf_mbox_word *rsp)
@@ -326,6 +363,27 @@ static void octep_pfvf_pf_get_data(struct octep_device *oct,
        }
 }
 
+void octep_pfvf_notify(struct octep_device *oct, struct octep_ctrl_mbox_msg *msg)
+{
+       union octep_pfvf_mbox_word notif = { 0 };
+       struct octep_ctrl_net_f2h_req *req;
+
+       req = (struct octep_ctrl_net_f2h_req *)msg->sg_list[0].msg;
+       switch (req->hdr.s.cmd) {
+       case OCTEP_CTRL_NET_F2H_CMD_LINK_STATUS:
+               notif.s_link_status.opcode = OCTEP_PFVF_MBOX_NOTIF_LINK_STATUS;
+               notif.s_link_status.status = req->link.state;
+               break;
+       default:
+               pr_info("Unknown mbox notif for vf: %u\n",
+                       req->hdr.s.cmd);
+               return;
+       }
+
+       notif.s.type = OCTEP_PFVF_MBOX_TYPE_CMD;
+       octep_send_notification(oct, msg->hdr.s.vf_idx, notif);
+}
+
 void octep_pfvf_mbox_work(struct work_struct *work)
 {
        struct octep_pfvf_mbox_wk *wk = container_of(work, struct octep_pfvf_mbox_wk, work);

diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_pfvf_mbox.h b/drivers/net/ethernet/marvell/octeon_ep/octep_pfvf_mbox.h
index c18a9f26fc314c9d9660a4cf77066cfed0871987..0dc6eead292a383723a62a3521c87409f2ce5032 100644 (file)
--- a/drivers/net/ethernet/marvell/octeon_ep/octep_pfvf_mbox.h
+++ b/drivers/net/ethernet/marvell/octeon_ep/octep_pfvf_mbox.h
@@ -37,6 +37,7 @@ enum octep_pfvf_mbox_opcode {
        OCTEP_PFVF_MBOX_CMD_DEV_REMOVE,
        OCTEP_PFVF_MBOX_CMD_GET_FW_INFO,
        OCTEP_PFVF_MBOX_CMD_SET_OFFLOADS,
+       OCTEP_PFVF_MBOX_NOTIF_LINK_STATUS,
        OCTEP_PFVF_MBOX_CMD_MAX,
 };
 
@@ -162,4 +163,5 @@ union octep_pfvf_mbox_word {
 void octep_pfvf_mbox_work(struct work_struct *work);
 int octep_setup_pfvf_mbox(struct octep_device *oct);
 void octep_delete_pfvf_mbox(struct octep_device *oct);
+void octep_pfvf_notify(struct octep_device *oct, struct octep_ctrl_mbox_msg *msg);
 #endif