fm10k: ensure we process SM mbx when processing VF mbx

When we process VF mailboxes, the driver is likely going to also queue
up messages to the switch manager. This process merely queues up the
FIFO, but doesn't actually begin the transmission process. Because we
hold the mailbox lock during this VF processing, the PF<->SM mailbox is
not getting processed at this time. Ensure that we actually process the
PF<->SM mailbox in between each PF<->VF mailbox.

This should ensure prompt transmission of the messages queued up after
each VF message is received and handled.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Krishneil Singh <krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_iov.c b/drivers/net/ethernet/intel/fm10k/fm10k_iov.c
index 5f4dac0d36ef1511e7587c53d1ec2800b5d5c814..2ec49116fe91049bc6ff0e00b1a537c6f5d445a6 100644 (file)
--- a/drivers/net/ethernet/intel/fm10k/fm10k_iov.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_iov.c
@@ -126,6 +126,9 @@ s32 fm10k_iov_mbx(struct fm10k_intfc *interface)
                struct fm10k_mbx_info *mbx = &vf_info->mbx;
                u16 glort = vf_info->glort;
 
+               /* process the SM mailbox first to drain outgoing messages */
+               hw->mbx.ops.process(hw, &hw->mbx);
+
                /* verify port mapping is valid, if not reset port */
                if (vf_info->vf_flags && !fm10k_glort_valid_pf(hw, glort))
                        hw->iov.ops.reset_lport(hw, vf_info);