Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
[linux-2.6.git] / drivers / net / cxgb3 / sge.c
index 9b434461c4f1b615f840c349e114b22fe6854042..78e265b484b64c20baf6d3ab951b3db176415d76 100644 (file)
@@ -481,6 +481,7 @@ static inline void ring_fl_db(struct adapter *adap, struct sge_fl *q)
 {
        if (q->pend_cred >= q->credits / 4) {
                q->pend_cred = 0;
+               wmb();
                t3_write_reg(adap, A_SG_KDOORBELL, V_EGRCNTX(q->cntxt_id));
        }
 }
@@ -2287,11 +2288,14 @@ static int process_responses(struct adapter *adap, struct sge_qset *qs,
        while (likely(budget_left && is_new_response(r, q))) {
                int packet_complete, eth, ethpad = 2, lro = qs->lro_enabled;
                struct sk_buff *skb = NULL;
-               u32 len, flags = ntohl(r->flags);
-               __be32 rss_hi = *(const __be32 *)r,
-                      rss_lo = r->rss_hdr.rss_hash_val;
+               u32 len, flags;
+               __be32 rss_hi, rss_lo;
 
+               rmb();
                eth = r->rss_hdr.opcode == CPL_RX_PKT;
+               rss_hi = *(const __be32 *)r;
+               rss_lo = r->rss_hdr.rss_hash_val;
+               flags = ntohl(r->flags);
 
                if (unlikely(flags & F_RSPD_ASYNC_NOTIF)) {
                        skb = alloc_skb(AN_PKT_SIZE, GFP_ATOMIC);
@@ -2502,7 +2506,10 @@ static int process_pure_responses(struct adapter *adap, struct sge_qset *qs,
                        refill_rspq(adap, q, q->credits);
                        q->credits = 0;
                }
-       } while (is_new_response(r, q) && is_pure_response(r));
+               if (!is_new_response(r, q))
+                       break;
+               rmb();
+       } while (is_pure_response(r));
 
        if (sleeping)
                check_ring_db(adap, qs, sleeping);
@@ -2536,6 +2543,7 @@ static inline int handle_responses(struct adapter *adap, struct sge_rspq *q)
 
        if (!is_new_response(r, q))
                return -1;
+       rmb();
        if (is_pure_response(r) && process_pure_responses(adap, qs, r) == 0) {
                t3_write_reg(adap, A_SG_GTS, V_RSPQ(q->cntxt_id) |
                             V_NEWTIMER(q->holdoff_tmr) | V_NEWINDEX(q->cidx));