]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
bnx2x: removed code re-checking memory base after device open
authorMintz Yuval <yuvalmin@broadcom.com>
Wed, 15 Feb 2012 02:10:31 +0000 (02:10 +0000)
committerJoe Jin <joe.jin@oracle.com>
Wed, 16 May 2012 14:48:04 +0000 (22:48 +0800)
(cherry picked from commit 04f2d51313938d004983652ea6162d4940d83a04)
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>
Signed-off-by: Joe Jin <joe.jin@oracle.com>
drivers/net/bnx2x/bnx2x_main.c

index 6d70e16ddf0ddecde063162bafcfdf8c8ae0cd8b..2b3ec2e15bc3a46dfd59d309b40e3a3e5f4fa521 100644 (file)
@@ -11279,17 +11279,6 @@ static void bnx2x_eeh_recover(struct bnx2x *bp)
 
        mutex_init(&bp->port.phy_mutex);
 
-       bp->common.shmem_base = REG_RD(bp, MISC_REG_SHARED_MEM_ADDR);
-       bp->link_params.shmem_base = bp->common.shmem_base;
-       BNX2X_DEV_INFO("shmem offset is 0x%x\n", bp->common.shmem_base);
-
-       if (!bp->common.shmem_base ||
-           (bp->common.shmem_base < 0xA0000) ||
-           (bp->common.shmem_base >= 0xC0000)) {
-               BNX2X_DEV_INFO("MCP not active\n");
-               bp->flags |= NO_MCP_FLAG;
-               return;
-       }
 
        val = SHMEM_RD(bp, validity_map[BP_PORT(bp)]);
        if ((val & (SHR_MEM_VALIDITY_DEV_INFO | SHR_MEM_VALIDITY_MB))