Skip to content

Commit

Permalink
r8169: change wmb to smb_wmb in rtl8169_start_xmit
Browse files Browse the repository at this point in the history
A barrier is needed here to ensure that rtl_tx sees the descriptor
changes (DescOwn set) before the updated tp->cur_tx value. Else it may
wrongly assume that the transfer has been finished already. For this
purpose smp_wmb() is sufficient.

No separate barrier is needed for ordering the descriptor changes
with the MMIO doorbell write. The needed barrier is included in
the non-relaxed writel() used by rtl8169_doorbell().

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Heiner Kallweit authored and David S. Miller committed Apr 20, 2020
1 parent 82ebc88 commit 794867e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/net/ethernet/realtek/r8169_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -4249,8 +4249,8 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,

txd_first->opts1 |= cpu_to_le32(DescOwn | FirstFrag);

/* Force all memory writes to complete before notifying device */
wmb();
/* rtl_tx needs to see descriptor changes before updated tp->cur_tx */
smp_wmb();

tp->cur_tx += frags + 1;

Expand Down

0 comments on commit 794867e

Please sign in to comment.