]> Pileus Git - ~andy/linux/commitdiff
bnx2x: mark functions as loaded on shared memory
authorYuval Mintz <yuvalmin@broadcom.com>
Mon, 12 Mar 2012 08:53:11 +0000 (08:53 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 13 Mar 2012 00:10:49 +0000 (17:10 -0700)
This change enables the FW to make more accurate decisions regarding the
active functions.

Signed-off-by: Yuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

index f82dfff58243fd56d204157db29e1c3c62a68f9d..c11e50d328c429f9f897e9498f669f82b2ea8d4c 100644 (file)
@@ -2007,6 +2007,15 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
                bnx2x_cnic_notify(bp, CNIC_CTL_START_CMD);
 #endif
 
+       /* mark driver is loaded in shmem2 */
+       if (SHMEM2_HAS(bp, drv_capabilities_flag)) {
+               u32 val;
+               val = SHMEM2_RD(bp, drv_capabilities_flag[BP_FW_MB_IDX(bp)]);
+               SHMEM2_WR(bp, drv_capabilities_flag[BP_FW_MB_IDX(bp)],
+                         val | DRV_FLAGS_CAPABILITIES_LOADED_SUPPORTED |
+                         DRV_FLAGS_CAPABILITIES_LOADED_L2);
+       }
+
        /* Wait for all pending SP commands to complete */
        if (!bnx2x_wait_sp_comp(bp, ~0x0UL)) {
                BNX2X_ERR("Timeout waiting for SP elements to complete\n");
@@ -2060,6 +2069,14 @@ int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode)
        int i;
        bool global = false;
 
+       /* mark driver is unloaded in shmem2 */
+       if (SHMEM2_HAS(bp, drv_capabilities_flag)) {
+               u32 val;
+               val = SHMEM2_RD(bp, drv_capabilities_flag[BP_FW_MB_IDX(bp)]);
+               SHMEM2_WR(bp, drv_capabilities_flag[BP_FW_MB_IDX(bp)],
+                         val & ~DRV_FLAGS_CAPABILITIES_LOADED_L2);
+       }
+
        if ((bp->state == BNX2X_STATE_CLOSED) ||
            (bp->state == BNX2X_STATE_ERROR)) {
                /* We can get here if the driver has been unloaded