From: Shmulik Ravid Date: Sun, 24 Jul 2011 03:57:04 +0000 (+0000) Subject: bnx2x: enable internal target-read for 57712 and up only X-Git-Tag: v2.6.39-400.9.0~423^2~19^2~11^2~588 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=faf1cf41b751574b8cefd41137bf66ba6b32413b;p=users%2Fjedix%2Flinux-maple.git bnx2x: enable internal target-read for 57712 and up only Signed-off-by: Dmitry Kravkov Signed-off-by: Shmulik Ravid Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller (cherry picked from commit 2189400b3c29a03360cbe2e3af3299eb5e2b950c) Signed-off-by: Joe Jin --- diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c index fc4511589ba23..32cb91084315a 100644 --- a/drivers/net/bnx2x/bnx2x_main.c +++ b/drivers/net/bnx2x/bnx2x_main.c @@ -10243,11 +10243,14 @@ static int __devinit bnx2x_init_dev(struct pci_dev *pdev, REG_WR(bp, PXP2_REG_PGL_ADDR_90_F0 + BP_PORT(bp)*16, 0); REG_WR(bp, PXP2_REG_PGL_ADDR_94_F0 + BP_PORT(bp)*16, 0); - /** + /* * Enable internal target-read (in case we are probed after PF FLR). - * Must be done prior to any BAR read access + * Must be done prior to any BAR read access. Only for 57712 and up */ - REG_WR(bp, PGLUE_B_REG_INTERNAL_PFID_ENABLE_TARGET_READ, 1); + if (board_type != BCM57710 && + board_type != BCM57711 && + board_type != BCM57711E) + REG_WR(bp, PGLUE_B_REG_INTERNAL_PFID_ENABLE_TARGET_READ, 1); /* Reset the load counter */ bnx2x_clear_load_cnt(bp);