Commit 97874961 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller

Revert "r8169: remove unneeded mmiowb barriers"

This reverts commit bd7153bd.

There doesn't seem to be anything wrong with this patch,
it's just reverted to get a stable baseline again.
Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ccc8ca9b
...@@ -1286,11 +1286,13 @@ static u16 rtl_get_events(struct rtl8169_private *tp) ...@@ -1286,11 +1286,13 @@ static u16 rtl_get_events(struct rtl8169_private *tp)
static void rtl_ack_events(struct rtl8169_private *tp, u16 bits) static void rtl_ack_events(struct rtl8169_private *tp, u16 bits)
{ {
RTL_W16(tp, IntrStatus, bits); RTL_W16(tp, IntrStatus, bits);
mmiowb();
} }
static void rtl_irq_disable(struct rtl8169_private *tp) static void rtl_irq_disable(struct rtl8169_private *tp)
{ {
RTL_W16(tp, IntrMask, 0); RTL_W16(tp, IntrMask, 0);
mmiowb();
} }
#define RTL_EVENT_NAPI_RX (RxOK | RxErr) #define RTL_EVENT_NAPI_RX (RxOK | RxErr)
...@@ -6130,8 +6132,10 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb, ...@@ -6130,8 +6132,10 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,
if (unlikely(stop_queue)) if (unlikely(stop_queue))
netif_stop_queue(dev); netif_stop_queue(dev);
if (__netdev_sent_queue(dev, skb->len, skb->xmit_more)) if (__netdev_sent_queue(dev, skb->len, skb->xmit_more)) {
RTL_W8(tp, TxPoll, NPQ); RTL_W8(tp, TxPoll, NPQ);
mmiowb();
}
if (unlikely(stop_queue)) { if (unlikely(stop_queue)) {
/* Sync with rtl_tx: /* Sync with rtl_tx:
...@@ -6483,7 +6487,9 @@ static int rtl8169_poll(struct napi_struct *napi, int budget) ...@@ -6483,7 +6487,9 @@ static int rtl8169_poll(struct napi_struct *napi, int budget)
if (work_done < budget) { if (work_done < budget) {
napi_complete_done(napi, work_done); napi_complete_done(napi, work_done);
rtl_irq_enable(tp); rtl_irq_enable(tp);
mmiowb();
} }
return work_done; return work_done;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment