From patchwork Fri Aug 3 01:24:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ike Panhc X-Patchwork-Id: 174829 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 2A9132C0040 for ; Fri, 3 Aug 2012 11:25:08 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1Sx6dQ-0001PI-Mr; Fri, 03 Aug 2012 01:25:00 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1Sx6dO-0001P4-JM for kernel-team@lists.ubuntu.com; Fri, 03 Aug 2012 01:24:58 +0000 Received: from 220-134-16-35.hinet-ip.hinet.net ([220.134.16.35] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1Sx6dN-0006Zo-IS for kernel-team@lists.ubuntu.com; Fri, 03 Aug 2012 01:24:58 +0000 From: Ike Panhc To: kernel-team@lists.ubuntu.com Subject: [PATCH 08/14] UBUNTU: SAUCE: net: calxedaxgmac: add write barriers around setting owner bit Date: Fri, 3 Aug 2012 09:24:52 +0800 Message-Id: <1343957092-5528-1-git-send-email-ike.pan@canonical.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1343956968-5248-1-git-send-email-ike.pan@canonical.com> References: <1343956968-5248-1-git-send-email-ike.pan@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com From: Rob Herring BugLink: http://launchpad.net/bugs/1008345 Signed-off-by: Rob Herring Signed-off-by: Ike Panhc --- drivers/net/ethernet/calxeda/xgmac.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/calxeda/xgmac.c b/drivers/net/ethernet/calxeda/xgmac.c index cd64c6b..8f43dc4 100644 --- a/drivers/net/ethernet/calxeda/xgmac.c +++ b/drivers/net/ethernet/calxeda/xgmac.c @@ -332,7 +332,7 @@ #define DESC_BUFFER2_SZ_OFFSET 16 struct xgmac_dma_desc { - __le32 flags; + volatile __le32 flags; __le32 buf_size; __le32 buf1_addr; /* Buffer 1 Address Pointer */ __le32 buf2_addr; /* Buffer 2 Address Pointer */ @@ -451,15 +451,20 @@ static inline int desc_get_owner(struct xgmac_dma_desc *p) static inline void desc_set_rx_owner(struct xgmac_dma_desc *p) { /* Clear all fields and set the owner */ + wmb(); p->flags = cpu_to_le32(DESC_OWN); + wmb(); } static inline void desc_set_tx_owner(struct xgmac_dma_desc *p, u32 flags) { - u32 tmpflags = le32_to_cpu(p->flags); + u32 tmpflags; + wmb(); + tmpflags = le32_to_cpu(p->flags); tmpflags &= TXDESC_END_RING; tmpflags |= flags | DESC_OWN; p->flags = cpu_to_le32(tmpflags); + wmb(); } static inline int desc_get_tx_ls(struct xgmac_dma_desc *p)