From patchwork Tue Mar 20 02:42:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 10295997 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 B5AE160385 for ; Tue, 20 Mar 2018 02:45:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A3B572922E for ; Tue, 20 Mar 2018 02:45:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 962F929233; Tue, 20 Mar 2018 02:45:05 +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 18C2B2922E for ; Tue, 20 Mar 2018 02:45:05 +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=HjAWbr0kVrfM4mWHEbD8YV2YJSl0bJ7xJX+xz6BR3zE=; b=RWk4l91T5q+s6f kC805IoxnBy+buyaYkok99LHpCV1A2OA3zoi19QU9mSQyGjqfVzXoM086Hi/P4RG6s7Cdgi5WNtKt CtITqhY5AA68NTML+71DG3sScIdR2CJt56SNPEmCWJiWt8gKtsnESsOn7m5kLeXhVgdexW70/pwpJ lDmnS68b1t8hcHGYrYurk77+k2pLKZsFXype35rXL1fYiGHhGthUTVA7desAgJYk6RawU1RUahCRp Fbwoi0j6t97ybR5PXnBsLJhHx67EFsmpGOaqb+ZaxBlsJjs/K8bHPeWNiMpkH/wadBFid7Sz2f2xO sJ+vt7r+XmACWdjzC+Cg==; 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 1ey7Gl-0001W5-A9; Tue, 20 Mar 2018 02:44:59 +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 1ey7Es-0008Vf-5d for linux-arm-kernel@lists.infradead.org; Tue, 20 Mar 2018 02:43:06 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 3FBBC60C5F; Tue, 20 Mar 2018 02:42:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1521513766; bh=/dk6LFTwdGuq2DfBfF7yg7MAPz5m1QtQ1ahc8Y6Agf8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Votycgn8VU2mVyXRIxeNqRKAS3PZnvh7vxOF1Zx0QCBez7L69xWi2BDiE1Mm1BSZr O4Qp+A7pxOlhUu6UcTVu4ZcIfn6amEUdIUB/caJSc8/id1pxQ67HaUneBbyIrHPuvr OP8vFdig7h5VfqL6ll5QpVM5vaTkX/4aBvL8zV7E= 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 6BCD760C5F; Tue, 20 Mar 2018 02:42:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1521513765; bh=/dk6LFTwdGuq2DfBfF7yg7MAPz5m1QtQ1ahc8Y6Agf8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AaSWMPLb4HUmtyt1sddPRfznu9TRgsCxuycCZY+RO641u6T4q/gUSjV09iC+ZiRwz dP8Iys56NnNzY2LKWYb8RgY/oWN+YrU6wm36zjN6MuteaQ970C3w3+SwfryJJ+lzAg R1yhIyN2XdVcbkGJK6Nj7CwoFzh+8/eMczLG7v6s= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 6BCD760C5F 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@codeaurora.org, sulrich@codeaurora.org Subject: [PATCH v4 05/17] ixgbevf: keep writel() closer to wmb() Date: Mon, 19 Mar 2018 22:42:20 -0400 Message-Id: <1521513753-7325-6-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1521513753-7325-1-git-send-email-okaya@codeaurora.org> References: <1521513753-7325-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-20180319_194302_818488_500C6DA2 X-CRM114-Status: GOOD ( 11.59 ) 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 Reviewed-by: Alexander Duyck --- 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..6bf778a 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(i, tx_ring->tail); return; dma_error: