Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c2f5fa5 authored by Brice Goglin's avatar Brice Goglin Committed by Jeff Garzik
Browse files

myri10ge: fix stop/go ordering even more 



The doorbell writes may be seen out of order by the firmware if they
are in WC memory since the tx spin(un)lock does not flush WC writes.
Hence if the "stop" is written on a different CPU than the "go", it
is possible that the stop will arrive after the go unless we add an
explicit memory barrier (and mmiowb() is not enough).

It fixes transmit hangs in multi tx queue mode.

Signed-off-by: default avatarBrice Goglin <brice@myri.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent df02c6ff

drivers/net/myri10ge/myri10ge.c

+3 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ 
#include "myri10ge_mcp.h"

#include "myri10ge_mcp_gen_header.h"



#define MYRI10GE_VERSION_STR "1.4.3-1.375"

#define MYRI10GE_VERSION_STR "1.4.3-1.378"



MODULE_DESCRIPTION("Myricom 10G driver (10GbE)");

MODULE_AUTHOR("Maintainer: help@myri.com");
@@ -1393,6 +1393,7 @@ myri10ge_tx_done(struct myri10ge_slice_state *ss, int mcp_index) 
		if (tx->req == tx->done) {

			tx->queue_active = 0;

			put_be32(htonl(1), tx->send_stop);

			mb();

			mmiowb();

		}

		__netif_tx_unlock(dev_queue);
@@ -2865,6 +2866,7 @@ static int myri10ge_xmit(struct sk_buff *skb, struct net_device *dev) 
	if ((mgp->dev->real_num_tx_queues > 1) && tx->queue_active == 0) {

		tx->queue_active = 1;

		put_be32(htonl(1), tx->send_go);

		mb();

		mmiowb();

	}

	tx->pkt_start++;