| From 4a25417c20fac00b3afd58ce27408f964d19e708 Mon Sep 17 00:00:00 2001 |
| From: Ariel Elior <ariele@broadcom.com> |
| Date: Thu, 22 Nov 2012 07:16:17 +0000 |
| Subject: bnx2x: remove redundant warning log |
| |
| From: Ariel Elior <ariele@broadcom.com> |
| |
| commit 4a25417c20fac00b3afd58ce27408f964d19e708 upstream. |
| |
| fix bug where a register which was only meant to be read in 578xx/57712 |
| devices causes a bogus error message to be logged when read from other |
| devices. |
| |
| Signed-off-by: Ariel Elior <ariele@broadcom.com> |
| Signed-off-by: Eilon Greenstein <eilong@broadcom.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: CAI Qian <caiqian@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 11 +++++++---- |
| 1 file changed, 7 insertions(+), 4 deletions(-) |
| |
| --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c |
| +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c |
| @@ -9545,10 +9545,13 @@ static int __devinit bnx2x_prev_unload_c |
| */ |
| static void __devinit bnx2x_prev_interrupted_dmae(struct bnx2x *bp) |
| { |
| - u32 val = REG_RD(bp, PGLUE_B_REG_PGLUE_B_INT_STS); |
| - if (val & PGLUE_B_PGLUE_B_INT_STS_REG_WAS_ERROR_ATTN) { |
| - BNX2X_ERR("was error bit was found to be set in pglueb upon startup. Clearing"); |
| - REG_WR(bp, PGLUE_B_REG_WAS_ERROR_PF_7_0_CLR, 1 << BP_FUNC(bp)); |
| + if (!CHIP_IS_E1x(bp)) { |
| + u32 val = REG_RD(bp, PGLUE_B_REG_PGLUE_B_INT_STS); |
| + if (val & PGLUE_B_PGLUE_B_INT_STS_REG_WAS_ERROR_ATTN) { |
| + BNX2X_ERR("was error bit was found to be set in pglueb upon startup. Clearing"); |
| + REG_WR(bp, PGLUE_B_REG_WAS_ERROR_PF_7_0_CLR, |
| + 1 << BP_FUNC(bp)); |
| + } |
| } |
| } |
| |
