lkml.org 
[lkml]   [2013]   [Jan]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 044/222] Revert "8139cp: revert "set ring address before enabling receiver""
    Date
    3.5.7.3 -stable review patch.  If anyone has any objections, please let me know.

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

    From: "David S. Miller" <davem@davemloft.net>

    commit 071e3ef4a94a021b16a2912f3885c86f4ff36b49 upstream.

    This reverts commit b26623dab7eeb1e9f5898c7a49458789dd492f20.

    This reverts the revert, in net-next we'll try another scheme
    to fix this bug using patches from David Woodhouse.

    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
    ---
    drivers/net/ethernet/realtek/8139cp.c | 22 +++++++++++-----------
    1 file changed, 11 insertions(+), 11 deletions(-)

    diff --git a/drivers/net/ethernet/realtek/8139cp.c b/drivers/net/ethernet/realtek/8139cp.c
    index a2679d8..995d0cf 100644
    --- a/drivers/net/ethernet/realtek/8139cp.c
    +++ b/drivers/net/ethernet/realtek/8139cp.c
    @@ -979,6 +979,17 @@ static void cp_init_hw (struct cp_private *cp)
    cpw32_f (MAC0 + 0, le32_to_cpu (*(__le32 *) (dev->dev_addr + 0)));
    cpw32_f (MAC0 + 4, le32_to_cpu (*(__le32 *) (dev->dev_addr + 4)));

    + cpw32_f(HiTxRingAddr, 0);
    + cpw32_f(HiTxRingAddr + 4, 0);
    +
    + ring_dma = cp->ring_dma;
    + cpw32_f(RxRingAddr, ring_dma & 0xffffffff);
    + cpw32_f(RxRingAddr + 4, (ring_dma >> 16) >> 16);
    +
    + ring_dma += sizeof(struct cp_desc) * CP_RX_RING_SIZE;
    + cpw32_f(TxRingAddr, ring_dma & 0xffffffff);
    + cpw32_f(TxRingAddr + 4, (ring_dma >> 16) >> 16);
    +
    cp_start_hw(cp);
    cpw8(TxThresh, 0x06); /* XXX convert magic num to a constant */

    @@ -992,17 +1003,6 @@ static void cp_init_hw (struct cp_private *cp)

    cpw8(Config5, cpr8(Config5) & PMEStatus);

    - cpw32_f(HiTxRingAddr, 0);
    - cpw32_f(HiTxRingAddr + 4, 0);
    -
    - ring_dma = cp->ring_dma;
    - cpw32_f(RxRingAddr, ring_dma & 0xffffffff);
    - cpw32_f(RxRingAddr + 4, (ring_dma >> 16) >> 16);
    -
    - ring_dma += sizeof(struct cp_desc) * CP_RX_RING_SIZE;
    - cpw32_f(TxRingAddr, ring_dma & 0xffffffff);
    - cpw32_f(TxRingAddr + 4, (ring_dma >> 16) >> 16);
    -
    cpw16(MultiIntr, 0);

    cpw8_f(Cfg9346, Cfg9346_Lock);
    --
    1.7.9.5


    \
     
     \ /
      Last update: 2013-01-16 17:44    [W:4.072 / U:0.184 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site