lkml.org 
[lkml]   [2012]   [Dec]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 14/20] bnx2x: remove redundant warning log
    Date
    3.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    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
    @@ -9131,10 +9131,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));
    + }
    }
    }




    \
     
     \ /
      Last update: 2012-12-07 11:21    [W:2.732 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site