From patchwork Fri Mar 16 01:04:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 10285995 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 9A08560291 for ; Fri, 16 Mar 2018 01:07:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8F2F428BD3 for ; Fri, 16 Mar 2018 01:07:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 83FAC28CA3; Fri, 16 Mar 2018 01:07:30 +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 0116128BD3 for ; Fri, 16 Mar 2018 01:07:30 +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=0dfP/VmuGqs/GinFlmT9sEqMsWNoNHV0NnLZdZaGfvY=; b=u+IqkuxO4lqyJF bDh5njeg0s5XzcVCijgcBqLNHEUXyCOlBa34jLkLsKBVTbz+d2gOVAtLDVf/sez+cHebRJ16Ymjcb H/c4nFiT22ckjVs2loIX62j48iWJfBoXQzCCr6Oig/oPlmOGibS35c859WgXUiHc8EIp2vnKAym0r GfuJLTTNEYClOpyBAHIlD9b3TZ6OCWBRNYqDw5CYqiqB9F77hvI6ZwcQh1D+KRIzLy2bk9EYGkJJ2 eB9iXKvGjhxqOK/H2DZEjcOUxfWlroOjrZ3FVDN2W3VZtSdfxFNuKf5qyF1r99IflVuGWvR0axNun 4YLIeiNJD5iiJ/gUsGrQ==; 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 1ewdq8-0002s9-FH; Fri, 16 Mar 2018 01:07:24 +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 1ewdoD-0001aO-DC for linux-arm-kernel@lists.infradead.org; Fri, 16 Mar 2018 01:05:31 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id A2BF260C54; Fri, 16 Mar 2018 01:05:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1521162311; bh=Asj11Wot+S+z93TnO5JrteKYrW2uNOzwY1/X7WcpWYU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TlO06Ywv/HRqwFGpoYibSSEn+JmPKyf1qSAO4ukw9T5QxA69XIVJ1Yl7dvTi5tqmY MMAuKdphHU1ey+xTDhLkN5sAxdhpqyU20TBAjb6NACG3GTqjZtApILoFiNwQTd/bUZ FlKgrcPV6PYieHduEnBou8tw/ewvMvBLjFeqQg2I= 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 5BC2160FA9; Fri, 16 Mar 2018 01:05:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1521162310; bh=Asj11Wot+S+z93TnO5JrteKYrW2uNOzwY1/X7WcpWYU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NYIJhF9ip00aRfjQNEndVRpqQ6thK7HIU23d6iIOgjmAOnISwRWGtJaqYJPAhDSCs Ur3/rIASWOGXAo3jfnjvMhsIQME/iIxHro9dkuBY/A44o2Gi0Hdl6KlaVe2fjeDJMF En/E8CvdQrnMQvObYwOErQxxK/Za8fo2b7lU8IsM= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 5BC2160FA9 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: netdev@vger.kernel.org, timur@ocdeaurora.org, sulrich@ocdeaurora.org Subject: [PATCH v2 5/6] ixgbevf: keep writel() closer to wmb() Date: Thu, 15 Mar 2018 21:04:55 -0400 Message-Id: <1521162296-19729-6-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1521162296-19729-1-git-send-email-okaya@codeaurora.org> References: <1521162296-19729-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-20180315_180526_328321_E513E436 X-CRM114-Status: GOOD ( 11.78 ) 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: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Sinan Kaya , intel-wired-lan@lists.osuosl.org, Jeff Kirsher , 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 Remove ixgbevf_write_tail() in favor of moving writel() close to wmb(). Signed-off-by: Sinan Kaya --- drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 5 ----- drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h b/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h index f695242..11e893e 100644 --- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h +++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h @@ -244,11 +244,6 @@ static inline u16 ixgbevf_desc_unused(struct ixgbevf_ring *ring) return ((ntc > ntu) ? 0 : ring->count) + ntc - ntu - 1; } -static inline void ixgbevf_write_tail(struct ixgbevf_ring *ring, u32 value) -{ - writel(value, ring->tail); -} - #define IXGBEVF_RX_DESC(R, i) \ (&(((union ixgbe_adv_rx_desc *)((R)->desc))[i])) #define IXGBEVF_TX_DESC(R, i) \ diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c index 9b3d43d..b65f691 100644 --- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c +++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c @@ -659,7 +659,7 @@ static void ixgbevf_alloc_rx_buffers(struct ixgbevf_ring *rx_ring, * such as IA-64). */ wmb(); - ixgbevf_write_tail(rx_ring, i); + writel(i, rx_ring->tail); } } @@ -3644,7 +3644,7 @@ static void ixgbevf_tx_map(struct ixgbevf_ring *tx_ring, tx_ring->next_to_use = i; /* notify HW of packet */ - ixgbevf_write_tail(tx_ring, i); + writel(value, tx_ring->tail); return; dma_error: