bnx2x, cnic: Disable iSCSI if DCBX negotiation is successful

With current bnx2x firmware 6.2.9, iSCSI is not supported in DCB
network, so we need to disable it.  Add cnic command to disconnect
iSCSI connections and prevent future connections when DCBX negotiation
succeeds.

Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 22 insertions, 0 deletions

diff --git a/drivers/net/bnx2x/bnx2x_dcb.c b/drivers/net/bnx2x/bnx2x_dcb.c
index 9a24d79c71d9..1214907d00d9 100644
--- a/drivers/net/bnx2x/bnx2x_dcb.c
+++ b/drivers/net/bnx2x/bnx2x_dcb.c
@@ -571,6 +571,28 @@ void bnx2x_dcbx_set_params(struct bnx2x *bp, u32 state)
 {
         switch (state) {
         case BNX2X_DCBX_STATE_NEG_RECEIVED:
+#ifdef BCM_CNIC
+                if (bp->state != BNX2X_STATE_OPENING_WAIT4_LOAD) {
+                        struct cnic_ops *c_ops;
+                        struct cnic_eth_dev *cp = &bp->cnic_eth_dev;
+                        bp->flags |= NO_ISCSI_OOO_FLAG | NO_ISCSI_FLAG;
+                        cp->drv_state |= CNIC_DRV_STATE_NO_ISCSI_OOO;
+                        cp->drv_state |= CNIC_DRV_STATE_NO_ISCSI;
+
+                        rcu_read_lock();
+                        c_ops = rcu_dereference(bp->cnic_ops);
+                        if (c_ops) {
+                                bnx2x_cnic_notify(bp, CNIC_CTL_STOP_ISCSI_CMD);
+                                rcu_read_unlock();
+                                return;
+                        }
+                        rcu_read_unlock();
+                }
+
+                /* fall through if no CNIC initialized  */
+        case BNX2X_DCBX_STATE_ISCSI_STOPPED:
+#endif
+
                 {
                         DP(NETIF_MSG_LINK, "BNX2X_DCBX_STATE_NEG_RECEIVED\n");
 #ifdef BCM_DCBNL