From patchwork Sun Mar 25 14:39:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 10306631 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 A9142600F6 for ; Sun, 25 Mar 2018 14:39:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 94CF928BC5 for ; Sun, 25 Mar 2018 14:39:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 88C0F293E2; Sun, 25 Mar 2018 14:39:35 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 16E9C28BC5 for ; Sun, 25 Mar 2018 14:39:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753400AbeCYOjc (ORCPT ); Sun, 25 Mar 2018 10:39:32 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:59004 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753368AbeCYOj2 (ORCPT ); Sun, 25 Mar 2018 10:39:28 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 0798160390; Sun, 25 Mar 2018 14:39:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1521988768; bh=v+h4GXmyu/tKzKBRDO+IdYEuRqQDlxUYkWkFq23fhC0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TQGX9EbuE5GD/OEtUY5zugSGIsAw+wDk02JuZZt5TJ+isy1vt7lk2zO/mJjfeH3Fc Y9GVOKtLxIeznCykVsQi+Ayr37R/NXlYxIEw9Wz8lkdvbrgc1gqoXRGwcZbodVT+V6 hnfyUfsLkTcg6TqZ/Vhdmb0rsN9a2EoH7b9YhEdE= 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 9942660390; Sun, 25 Mar 2018 14:39:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1521988767; bh=v+h4GXmyu/tKzKBRDO+IdYEuRqQDlxUYkWkFq23fhC0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YEtlvRd4i3lVTUpyYWzHFimagiK4yZyUxFMnfpR/+f+t9ZfiS00D7CYwJ05KTRD5K Rph9IsrWTqZcAvBRGzM9aPU60h7GwrNFkOY4j/oOYxpSjeoLz25l4ErtFqTR8symE4 AdRX9lamzBjgDCHhqauxtbjgYD8qTJ+j1oVHJyhI= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 9942660390 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 Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sinan Kaya , Dept-GELinuxNICDev@cavium.com, linux-kernel@vger.kernel.org Subject: [PATCH v7 1/7] net: qla3xxx: Eliminate duplicate barriers on weakly-ordered archs Date: Sun, 25 Mar 2018 10:39:15 -0400 Message-Id: <1521988761-30344-2-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 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.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. Since code already has an explicit barrier call, changing code to wmb() writel_relaxed() mmiowb() for multi-arch support. Signed-off-by: Sinan Kaya --- drivers/net/ethernet/qlogic/qla3xxx.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/qlogic/qla3xxx.c b/drivers/net/ethernet/qlogic/qla3xxx.c index 9e5264d..b48f761 100644 --- a/drivers/net/ethernet/qlogic/qla3xxx.c +++ b/drivers/net/ethernet/qlogic/qla3xxx.c @@ -1858,8 +1858,9 @@ static void ql_update_small_bufq_prod_index(struct ql3_adapter *qdev) qdev->small_buf_release_cnt -= 8; } wmb(); - writel(qdev->small_buf_q_producer_index, - &port_regs->CommonRegs.rxSmallQProducerIndex); + writel_relaxed(qdev->small_buf_q_producer_index, + &port_regs->CommonRegs.rxSmallQProducerIndex); + mmiowb(); } }