From patchwork Mon Apr 2 19:06:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 10320245 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 96B6D60116 for ; Mon, 2 Apr 2018 19:08:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8662028A4C for ; Mon, 2 Apr 2018 19:08:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7AFB928A95; Mon, 2 Apr 2018 19:08:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DC62028A4C for ; Mon, 2 Apr 2018 19:08:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=FsSJTYe2qlKR40QzrRgJeYmyxS32caiFgoscOBKO2O4=; b=gYVklJ3lhMl8vd 4foaUx2U0+DeZgDMMpUsNP/9bxNlaeRlee6M4AN/YN8aoACEf+zDGwwXO0AfIVlon62OwwRd+sQyP 0l4UPIsxNLi+8Tgd1enzLH2v3TlCG1nwqL0Sallz3PblU7GxoguyiAg+RF1lQz0wazpM9bFX5tdQh oOzhmAO9tGSYPmZC2yjbO7dTdLCCUgM+DPjeOoo0wB/kKG+Qm7pnLR2vVl1asqziA2d6ydRzcbnLv Ba6B6LvgzH+oI0gQydqUJv87N68x88khtJwoY5N/RID75v4f4fLfC3NDWRa48/QpyrZqEjWn1Cn4h INZdeGtLzDx8Cw5dTDaQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1f34ov-0003p4-Qc; Mon, 02 Apr 2018 19:08:45 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f34n1-0002j9-0t for linux-arm-kernel@lists.infradead.org; Mon, 02 Apr 2018 19:06:50 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id D73556081C; Mon, 2 Apr 2018 19:06:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1522695999; bh=OZOgP/V6Ahpz6TTuC8Dm4qPwjHcis0N8DDJlHP4en5c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IlQFPYUEre+wMLkduXD4UhlTCI4uX7hywl523uvRRQCYSiei767BOq/Rl7B4pK6gp KOZRMWwB4OoepzoxMAgsAFcodO6jKyaogaUedF5YEamR0vpm8dlVNbPnVp+1fOQnKf 6D8LKZmT303EUZ+T8d3Vepi2EwanUb3OxuKiVBcQ= Received: from drakthul.qualcomm.com (global_nat1_iad_fw.qualcomm.com [129.46.232.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: okaya@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 83BAA60817; Mon, 2 Apr 2018 19:06:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1522695999; bh=OZOgP/V6Ahpz6TTuC8Dm4qPwjHcis0N8DDJlHP4en5c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IlQFPYUEre+wMLkduXD4UhlTCI4uX7hywl523uvRRQCYSiei767BOq/Rl7B4pK6gp KOZRMWwB4OoepzoxMAgsAFcodO6jKyaogaUedF5YEamR0vpm8dlVNbPnVp+1fOQnKf 6D8LKZmT303EUZ+T8d3Vepi2EwanUb3OxuKiVBcQ= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 83BAA60817 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=okaya@codeaurora.org From: Sinan Kaya To: jeffrey.t.kirsher@intel.com Subject: [PATCH v8 2/7] ixgbe: eliminate duplicate barriers on weakly-ordered archs Date: Mon, 2 Apr 2018 15:06:25 -0400 Message-Id: <1522695990-31082-3-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1522695990-31082-1-git-send-email-okaya@codeaurora.org> References: <1522695990-31082-1-git-send-email-okaya@codeaurora.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180402_120647_157477_1113B2E7 X-CRM114-Status: GOOD ( 13.79 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: sulrich@codeaurora.org, netdev@vger.kernel.org, timur@codeaurora.org, linux-kernel@vger.kernel.org, Sinan Kaya , intel-wired-lan@lists.osuosl.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP memory-barriers.txt has been updated as follows: "When using writel(), a prior wmb() is not needed to guarantee that the cache coherent memory writes have completed before writing to the MMIO region." Remove old IA-64 comments in the code along with unneeded wmb() in front of writel(). There are places in the code where wmb() has been used as a double barrier for CPU and IO in place of smp_wmb() and wmb() as an optimization. For such places, keep the wmb() but replace the following writel() with writel_relaxed() to have a sequence as wmb() writel_relaxed() mmio_wb() Signed-off-by: Sinan Kaya --- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index afadba9..c17924b 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -1696,12 +1696,6 @@ void ixgbe_alloc_rx_buffers(struct ixgbe_ring *rx_ring, u16 cleaned_count) /* update next to alloc since we have filled the ring */ rx_ring->next_to_alloc = i; - /* Force memory writes to complete before letting h/w - * know there are new descriptors to fetch. (Only - * applicable for weak-ordered memory model archs, - * such as IA-64). - */ - wmb(); writel(i, rx_ring->tail); } } @@ -2467,10 +2461,6 @@ static int ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector, if (xdp_xmit) { struct ixgbe_ring *ring = adapter->xdp_ring[smp_processor_id()]; - /* Force memory writes to complete before letting h/w - * know there are new descriptors to fetch. - */ - wmb(); writel(ring->next_to_use, ring->tail); xdp_do_flush_map(); @@ -8080,12 +8070,7 @@ static int ixgbe_tx_map(struct ixgbe_ring *tx_ring, /* set the timestamp */ first->time_stamp = jiffies; - /* - * Force memory writes to complete before letting h/w know there - * are new descriptors to fetch. (Only applicable for weak-ordered - * memory model archs, such as IA-64). - * - * We also need this memory barrier to make certain all of the + /* We need this memory barrier to make certain all of the * status bits have been updated before next_to_watch is written. */ wmb(); @@ -8102,7 +8087,7 @@ static int ixgbe_tx_map(struct ixgbe_ring *tx_ring, ixgbe_maybe_stop_tx(tx_ring, DESC_NEEDED); if (netif_xmit_stopped(txring_txq(tx_ring)) || !skb->xmit_more) { - writel(i, tx_ring->tail); + writel_relaxed(i, tx_ring->tail); /* we need this if more than one processor can write to our tail * at a time, it synchronizes IO on IA64/Altix systems @@ -10034,10 +10019,6 @@ static void ixgbe_xdp_flush(struct net_device *dev) if (unlikely(!ring)) return; - /* Force memory writes to complete before letting h/w know there - * are new descriptors to fetch. - */ - wmb(); writel(ring->next_to_use, ring->tail); return;