lkml.org 
[lkml]   [2013]   [Apr]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 147/171 ] sky2: Receive Overflows not counted
    3.6.11.2 stable review patch.
    If anyone has any objections, please let me know.

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

    From: Mirko Lindner <mlindner@marvell.com>

    [ Upstream commit 9cfe8b156c21cf340b3a10ecb3022fbbc1c39185 ]

    The sky2 driver doesn't count the Receive Overflows because the MAC
    interrupt for this event is not set in the MAC's interrupt mask.
    The MAC's interrupt mask is set only for Transmit FIFO Underruns.

    Fix: The correct setting should be (GM_IS_TX_FF_UR | GM_IS_RX_FF_OR)
    Otherwise the Receive Overflow event will not generate any interrupt.
    The Receive Overflow interrupt is handled correctly

    Signed-off-by: Mirko Lindner <mlindner@marvell.com>
    Acked-by: Stephen Hemminger <stephen@networkplumber.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
    ---
    drivers/net/ethernet/marvell/sky2.h | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/net/ethernet/marvell/sky2.h b/drivers/net/ethernet/marvell/sky2.h
    index 615ac63..ec6dcd8 100644
    --- a/drivers/net/ethernet/marvell/sky2.h
    +++ b/drivers/net/ethernet/marvell/sky2.h
    @@ -2074,7 +2074,7 @@ enum {
    GM_IS_RX_FF_OR = 1<<1, /* Receive FIFO Overrun */
    GM_IS_RX_COMPL = 1<<0, /* Frame Reception Complete */

    -#define GMAC_DEF_MSK GM_IS_TX_FF_UR
    +#define GMAC_DEF_MSK (GM_IS_TX_FF_UR | GM_IS_RX_FF_OR)
    };

    /* GMAC_LINK_CTRL 16 bit GMAC Link Control Reg (YUKON only) */
    --
    1.7.10.4



    \
     
     \ /
      Last update: 2013-04-12 00:01    [W:6.090 / U:0.240 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site