bnx2x: Prevent VF race

The mail box containing the Vf-Pf messages is susceptible
to a race - it's possible for 2 flows to try and write commands,
causing one to override the other's message.
Use a mutex to synchronize the access, preventing said race.

Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Yuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: Ariel Elior <ariele@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
index ad7ad1dae1e7..db63d8655fca 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
@@ -2388,8 +2388,8 @@ int bnx2x_iov_eq_sp_event(struct bnx2x *bp, union event_ring_elem *elem)
                 goto get_vf;
         case EVENT_RING_OPCODE_MALICIOUS_VF:
                 abs_vfid = elem->message.data.malicious_vf_event.vf_id;
-                DP(BNX2X_MSG_IOV, "Got VF MALICIOUS notification abs_vfid=%d\n",
-                   abs_vfid);
+                DP(BNX2X_MSG_IOV, "Got VF MALICIOUS notification abs_vfid=%d err_id=0x%x\n",
+                   abs_vfid, elem->message.data.malicious_vf_event.err_id);
                 goto get_vf;
         default:
                 return 1;
@@ -2446,8 +2446,8 @@ get_vf:
                 /* Do nothing for now */
                 break;
         case EVENT_RING_OPCODE_MALICIOUS_VF:
-                DP(BNX2X_MSG_IOV, "got VF [%d] MALICIOUS notification\n",
-                   vf->abs_vfid);
+                DP(BNX2X_MSG_IOV, "Got VF MALICIOUS notification abs_vfid=%d error id %x\n",
+                   abs_vfid, elem->message.data.malicious_vf_event.err_id);
                 /* Do nothing for now */
                 break;
         }
@@ -3417,10 +3417,10 @@ enum sample_bulletin_result bnx2x_sample_bulletin(struct bnx2x *bp)
         return PFVF_BULLETIN_UPDATED;
 }
 
-void bnx2x_vf_map_doorbells(struct bnx2x *bp)
+void __iomem *bnx2x_vf_doorbells(struct bnx2x *bp)
 {
         /* vf doorbells are embedded within the regview */
-        bp->doorbells = bp->regview + PXP_VF_ADDR_DB_START;
+        return bp->regview + PXP_VF_ADDR_DB_START;
 }
 
 int bnx2x_vf_pci_alloc(struct bnx2x *bp)