From patchwork Thu Oct 30 07:53:27 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brice Goglin X-Patchwork-Id: 6452 X-Patchwork-Delegate: jgarzik@pobox.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id C12A3DDDF5 for ; Thu, 30 Oct 2008 18:51:42 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753064AbYJ3Hvk (ORCPT ); Thu, 30 Oct 2008 03:51:40 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752825AbYJ3Hvk (ORCPT ); Thu, 30 Oct 2008 03:51:40 -0400 Received: from mailbox2.myri.com ([64.172.73.26]:1880 "EHLO myri.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752768AbYJ3Hvj (ORCPT ); Thu, 30 Oct 2008 03:51:39 -0400 Received: from [172.31.134.203] (brice-ovpn.sw.myri.com [172.31.134.203]) by myri.com (8.13.7+Sun/8.13.7) with ESMTP id m9U7pSxN028557; Thu, 30 Oct 2008 00:51:31 -0700 (PDT) Message-ID: <490967F7.4030608@myri.com> Date: Thu, 30 Oct 2008 08:53:27 +0100 From: Brice Goglin User-Agent: Mozilla-Thunderbird 2.0.0.17 (X11/20081018) MIME-Version: 1.0 To: Jeff Garzik CC: netdev@vger.kernel.org Subject: [PATCH 2.6.28] myri10ge: fix stop/go mmio ordering X-Enigmail-Version: 0.95.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use mmiowb() to ensure "stop" and "go" commands are sent in order on ia64. Signed-off-by: Brice Goglin --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- linux-git/drivers/net/myri10ge/myri10ge.c 2008-10-30 08:15:37.000000000 +0100 +++ linux-tmp/drivers/net/myri10ge/myri10ge.c 2008-10-30 08:17:54.000000000 +0100 @@ -75,7 +75,7 @@ #include "myri10ge_mcp.h" #include "myri10ge_mcp_gen_header.h" -#define MYRI10GE_VERSION_STR "1.4.3-1.374" +#define MYRI10GE_VERSION_STR "1.4.3-1.375" MODULE_DESCRIPTION("Myricom 10G driver (10GbE)"); MODULE_AUTHOR("Maintainer: help@myri.com"); @@ -1393,6 +1393,7 @@ if (tx->req == tx->done) { tx->queue_active = 0; put_be32(htonl(1), tx->send_stop); + mmiowb(); } __netif_tx_unlock(dev_queue); } @@ -2864,6 +2865,7 @@ if ((mgp->dev->real_num_tx_queues > 1) && tx->queue_active == 0) { tx->queue_active = 1; put_be32(htonl(1), tx->send_go); + mmiowb(); } tx->pkt_start++; if ((avail - count) < MXGEFW_MAX_SEND_DESC) {