From patchwork Fri May 13 11:59:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 621965 X-Patchwork-Delegate: davem@davemloft.net 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.180.67]) by ozlabs.org (Postfix) with ESMTP id 3r5pRN2KcMz9t7G for ; Fri, 13 May 2016 22:03:44 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753058AbcEMMDn (ORCPT ); Fri, 13 May 2016 08:03:43 -0400 Received: from mx0b-0016f401.pphosted.com ([67.231.156.173]:51075 "EHLO mx0b-0016f401.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752042AbcEMMDl (ORCPT ); Fri, 13 May 2016 08:03:41 -0400 Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id u4DC2KjW026764; Fri, 13 May 2016 05:03:17 -0700 Received: from sc-exch02.marvell.com ([199.233.58.182]) by mx0b-0016f401.pphosted.com with ESMTP id 22ve9b6q69-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Fri, 13 May 2016 05:03:17 -0700 Received: from SC-EXCH02.marvell.com (10.93.176.82) by SC-EXCH02.marvell.com (10.93.176.82) with Microsoft SMTP Server (TLS) id 15.0.1104.5; Fri, 13 May 2016 05:03:15 -0700 Received: from maili.marvell.com (10.93.176.43) by SC-EXCH02.marvell.com (10.93.176.82) with Microsoft SMTP Server id 15.0.1104.5 via Frontend Transport; Fri, 13 May 2016 05:03:15 -0700 Received: from xhacker.marvell.com (unknown [10.37.131.11]) by maili.marvell.com (Postfix) with ESMTP id B0DF83F703F; Fri, 13 May 2016 05:03:14 -0700 (PDT) From: Jisheng Zhang To: , CC: , , , Jisheng Zhang Subject: [PATCH 2/2] net: mv643xx_eth: use dma_wmb/rmb where appropriate Date: Fri, 13 May 2016 19:59:20 +0800 Message-ID: <1463140760-7128-3-git-send-email-jszhang@marvell.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1463140760-7128-1-git-send-email-jszhang@marvell.com> References: <1463140760-7128-1-git-send-email-jszhang@marvell.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-05-13_05:, , signatures=0 X-Proofpoint-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1604210000 definitions=main-1605130164 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Update the mv643xx_eth driver to use the dma_rmb/wmb calls instead of the full barriers in order to improve performance. Signed-off-by: Jisheng Zhang --- drivers/net/ethernet/marvell/mv643xx_eth.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c index c6d8124..13b71e3 100644 --- a/drivers/net/ethernet/marvell/mv643xx_eth.c +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c @@ -536,7 +536,7 @@ static int rxq_process(struct rx_queue *rxq, int budget) cmd_sts = rx_desc->cmd_sts; if (cmd_sts & BUFFER_OWNED_BY_DMA) break; - rmb(); + dma_rmb(); skb = rxq->rx_skb[rxq->rx_curr_desc]; rxq->rx_skb[rxq->rx_curr_desc] = NULL; @@ -647,9 +647,9 @@ static int rxq_refill(struct rx_queue *rxq, int budget) DMA_FROM_DEVICE); rx_desc->buf_size = size; rxq->rx_skb[rx] = skb; - wmb(); + dma_wmb(); rx_desc->cmd_sts = BUFFER_OWNED_BY_DMA | RX_ENABLE_INTERRUPT; - wmb(); + dma_wmb(); /* * The hardware automatically prepends 2 bytes of @@ -889,7 +889,7 @@ static int txq_submit_tso(struct tx_queue *txq, struct sk_buff *skb, skb_tx_timestamp(skb); /* ensure all other descriptors are written before first cmd_sts */ - wmb(); + dma_wmb(); first_tx_desc->cmd_sts = first_cmd_sts; /* clear TX_END status */ @@ -994,7 +994,7 @@ static int txq_submit_skb(struct tx_queue *txq, struct sk_buff *skb, skb_tx_timestamp(skb); /* ensure all other descriptors are written before first cmd_sts */ - wmb(); + dma_wmb(); desc->cmd_sts = cmd_sts; /* clear TX_END status */