From patchwork Thu Mar 22 17:10:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 10301935 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 4D1C0600F6 for ; Thu, 22 Mar 2018 17:11:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3C09C28989 for ; Thu, 22 Mar 2018 17:11:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3AA1A28A10; Thu, 22 Mar 2018 17:11: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=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 7C3BE28989 for ; Thu, 22 Mar 2018 17:10:52 +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=dQr8EXOxAcI82I 5mllVAjgkJQR5oe4kEKIiowUw5dDDq80Ri/QuEoJy4oSBmLJqNqTFnaZey94lagnKUVVsDZPfmqj/ S4F2RRcXNcXHaNiEkUV6P+xwpRvcWQYniW4O79ufpJ35GlPucUMX9bqSo4LnCB8BBOXyy5e2aqJwc CQNymkCyBzeRpAIZKb2+PREvmbHV1xiw2DOfdhZ8QVhCSA8TlZmGzbihYwezvyvQT2CG7covW6333 dsKTNOGR0qoNGOodlGZLBi6nx5gXV7rYlogAQYtiB0aZ4N9e31wxUm64ctiS/jVbM2qg9XEM9SEpn Wq2cInHYouULBM68J+4w==; 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 1ez3ji-000855-Ei; Thu, 22 Mar 2018 17:10:46 +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 1ez3jH-0007n8-Ch for linux-arm-kernel@lists.infradead.org; Thu, 22 Mar 2018 17:10:21 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 15D7F60F6B; Thu, 22 Mar 2018 17:10:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1521738615; bh=xihGvyzCn0WEEWLaeWipjVki0XnjkkU5lFTxK257S4I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oluik0+aVFEvitkjA1uqQsbvXGFwkXTpZEt+9aJRwtIJs9JeAT9Q/5LjJzNHC4mZ0 U3gFdsumnnTjQTG+KtE6DOLAw+coRFy0Akw3M9Bd8xpQFHtsvmfvw9s8MjcoYDvpLH nKn7xTnkzafcU+rWX1W4TSB505vrtVaDG2C+1rhY= 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 ADBA66030F; Thu, 22 Mar 2018 17:10:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1521738614; bh=xihGvyzCn0WEEWLaeWipjVki0XnjkkU5lFTxK257S4I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RLwboPxUMina8mNRW5Q8agNHRwolB7/DCxc5p+ELrluQaL93InZBqJSO895/Yx7Ep NYoRsFbpvs9d88WTxmggoLbkBfnciz5vRA6JRlII/OLLOx/29UHZt2Hw4btWJqhpNU W+6/3JYFHA+uzea4fdXO99DqBVjrgvCGxg83HaHk= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org ADBA66030F 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 v5 4/5] net: qlge: Eliminate duplicate barriers on weakly-ordered archs Date: Thu, 22 Mar 2018 13:10:01 -0400 Message-Id: <1521738603-23596-5-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1521738603-23596-1-git-send-email-okaya@codeaurora.org> References: <1521738603-23596-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-20180322_101019_567303_9FD88F12 X-CRM114-Status: GOOD ( 13.66 ) 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);