From patchwork Sun Mar 25 14:39:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 10306863 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 54B6B600CC for ; Sun, 25 Mar 2018 22:21:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3A7EA2923A for ; Sun, 25 Mar 2018 22:21:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2F3B42934E; Sun, 25 Mar 2018 22:21:14 +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=unavailable 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 B05532923A for ; Sun, 25 Mar 2018 22:21:13 +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=PSC6WFM7Ew7vSiTtIcQk8QfvmTYhpF0bUdvk76VJlvs=; b=b4ss9dZt6IvFx4 tfg0pY6gxotcwSnroN7bY0S0NgTWFOvswTLKnGlQDN/aBYOYFRZ2Dn6O9Af3oe4X9c8UaIidIYdV2 aTT7/s5Lr6i4R425vwIrCw0tSvQTL0bzo+0VRJB602VmHdC7zlsFWYbSKuLaNzUqXRL3ty9yzTf/3 Nz2Y6ss6nKnHTR0eIvmogHhh9iDuGvDXp7rFN7quYoggsLmaZqA8d446Yt5ogPsR84c8Y6qRevlt3 MceVURLzdUa6CzmIIdm3vegW06oxBUpM+2KVf4bltZvzrpY59bVgRg8qcuAW7tXsasyF7gAlMVwxP ZnEwO0uUOac0I5DTFvtg==; 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 1f0E0j-00059L-2O; Sun, 25 Mar 2018 22:21:09 +0000 Received: from casper.infradead.org ([85.118.1.10]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f0DqI-0000cK-6q for linux-arm-kernel@bombadil.infradead.org; Sun, 25 Mar 2018 22:10:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=0834XJYVkmsVtVoQJnWxXLMZ8AJ6zNN+0GdXfUUMFuQ=; b=R2UFBwlHYOddvaFP6vk8R9ZHm6 tITgUEOxiHxrgyy9rj8aB4XvCryfWvrtAfpKyr2iT8eOH+kzBdw7aL1CK2plq5s4d4XuqU59/nqPl dW4Z7UaA0Nuk3nIAsKcwjheLmdyw01wFXSAntO+7cKPK79/rQnN9OjYHBXVWZi5gf02BUoOEB3gkn iMIhvk027FS0Xp/XhGhSV4Y8T2hq8l2utuW8yu22a7r7biv44xjOw38q0S5a+xo5c96BUO25g3cN3 9OcXib0BGM307aNDnRM6GeMKVPqXShJNyh7I58OaeJv83AlYnv9THyIUgczjxhiOK9jMtILocllo6 qycHAxTw==; Received: from smtp.codeaurora.org ([198.145.29.96]) by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f06pH-0000is-Ij for linux-arm-kernel@lists.infradead.org; Sun, 25 Mar 2018 14:40:53 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id A2E4360F6B; Sun, 25 Mar 2018 14:39:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1521988774; bh=xihGvyzCn0WEEWLaeWipjVki0XnjkkU5lFTxK257S4I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OX4QAFLiUESVICFfjNmSEYR96/z1tcozrAN8tXmGBReaQLF85cLshpK6x59ixKWhN lVAahCn3FsHavG3QTuBfwHqZKERmCZo5q4qBEPV82nc13/UvaLrPYrsI8IqEOfHTfa nThgY9FfEt3mEBLeNE8RoDR/hdgONLP0eqQp7SDg= 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 DD32C60F6D; Sun, 25 Mar 2018 14:39:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1521988773; bh=xihGvyzCn0WEEWLaeWipjVki0XnjkkU5lFTxK257S4I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CSnALv5ldNFkUg6DtGGXL8FfhvxZ8X9rrCdGgfOknXUsSGm22u154b3NRFm6XPudl 95QL/HlxcyrMeyO+yzUstOW3bZeWw2GTq7Wpn+E1vKJYW8rHX409uJ8j9d82Th+jzB yo5G3zAtUUtcJEp/36FnmfUdRHY+Ck5VTqD81cpU= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org DD32C60F6D 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 v7 5/7] net: qlge: Eliminate duplicate barriers on weakly-ordered archs Date: Sun, 25 Mar 2018 10:39:19 -0400 Message-Id: <1521988761-30344-6-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1521988761-30344-1-git-send-email-okaya@codeaurora.org> References: <1521988761-30344-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-20180325_154051_884576_F8012678 X-CRM114-Status: GOOD ( 13.48 ) 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: Dept-GELinuxNICDev@cavium.com, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Sinan Kaya , Harish Patil , linux-arm-kernel@lists.infradead.org, Manish Chopra 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 Code includes wmb() followed by writel(). writel() already has a barrier on some architectures like arm64. This ends up CPU observing two barriers back to back before executing the register write. Create a new wrapper function with relaxed write operator. Use the new wrapper when a write is following a wmb(). Signed-off-by: Sinan Kaya --- drivers/net/ethernet/qlogic/qlge/qlge.h | 16 ++++++++++++++++ drivers/net/ethernet/qlogic/qlge/qlge_main.c | 3 ++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/qlogic/qlge/qlge.h b/drivers/net/ethernet/qlogic/qlge/qlge.h index 84ac50f..3e71b65 100644 --- a/drivers/net/ethernet/qlogic/qlge/qlge.h +++ b/drivers/net/ethernet/qlogic/qlge/qlge.h @@ -2185,6 +2185,22 @@ static inline void ql_write_db_reg(u32 val, void __iomem *addr) } /* + * Doorbell Registers: + * Doorbell registers are virtual registers in the PCI memory space. + * The space is allocated by the chip during PCI initialization. The + * device driver finds the doorbell address in BAR 3 in PCI config space. + * The registers are used to control outbound and inbound queues. For + * example, the producer index for an outbound queue. Each queue uses + * 1 4k chunk of memory. The lower half of the space is for outbound + * queues. The upper half is for inbound queues. + * Caller has to guarantee ordering. + */ +static inline void ql_write_db_reg_relaxed(u32 val, void __iomem *addr) +{ + writel_relaxed(val, addr); +} + +/* * Shadow Registers: * Outbound queues have a consumer index that is maintained by the chip. * Inbound queues have a producer index that is maintained by the chip. diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_main.c b/drivers/net/ethernet/qlogic/qlge/qlge_main.c index 50038d9..8293c202 100644 --- a/drivers/net/ethernet/qlogic/qlge/qlge_main.c +++ b/drivers/net/ethernet/qlogic/qlge/qlge_main.c @@ -2700,7 +2700,8 @@ static netdev_tx_t qlge_send(struct sk_buff *skb, struct net_device *ndev) tx_ring->prod_idx = 0; wmb(); - ql_write_db_reg(tx_ring->prod_idx, tx_ring->prod_idx_db_reg); + ql_write_db_reg_relaxed(tx_ring->prod_idx, tx_ring->prod_idx_db_reg); + mmiowb(); netif_printk(qdev, tx_queued, KERN_DEBUG, qdev->ndev, "tx queued, slot %d, len %d\n", tx_ring->prod_idx, skb->len);