From patchwork Sun Aug 20 10:10:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ding Tianhong X-Patchwork-Id: 110476 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp18600qge; Sun, 20 Aug 2017 03:11:28 -0700 (PDT) X-Received: by 10.84.214.137 with SMTP id j9mr15360818pli.457.1503223888714; Sun, 20 Aug 2017 03:11:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503223888; cv=none; d=google.com; s=arc-20160816; b=pgDm6r2iz/fX5T2q1kYj2c0taHhdBgKSRF4zPAeqS9b2MMFGKgeYqJ2C0F0xW8t9cK RotBz3ZnzDDDmTABH7p9iKRDklfM+bs1Xx8AutHzR7TGLBlRdlA7M6mCGPV/xUzG4A/w wXMZilBOmj8EyFCVzLotHknJqkosasaBfqkCB4uFy3pTbJthxfgSLQEZtXAGi8q3719b MoE1z9nsUIq1jZukzZQqFzaUg36xSfbWV46t77Z6pCizSHdFSwb87OQzGPqQRKbM1iT2 17HJ9Pa8f169d4uTumG2RvA0hIC3Q2VlfK4wh21jfcBvs5r2SVR1Ys7ssQn3r/VP+zp2 uyug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:arc-authentication-results; bh=i+RRu7YjSlMRtqzOYrbT38esgLWwPdi474cVUCEVmNs=; b=otAaVOS+9LSkXkFi0pwdMiW0eNlu/V5InQtm6+eXqx92F9gFCxsICSFsAZ5mEJxRSn 85seWBojAMdpCPgh0TtNUhLGJTNYRhiDhZ8Xy0vsSuv7br8lESdrSC0fAT3hi+yvODp1 x4G6DMBBVOWCrrjiFBY2fQ8tO3m91RY2IzkFlowWzm+EO7AOcxH+kqFaT6O1rw1MW86l gaH0da1h7Ygtpaj9uc2u7JheoBA1kar76IVexG2IPvepxQDuJD7Df5YfVsStfOrAlQt/ 6i9xmgHsTzqdQPlsU5KHo6PwxwA96Z7wHeAncIL2i1cctJaiDR6o/+ZtgQeV/g7LKfjA Rxvg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h2si5840626pgr.733.2017.08.20.03.11.28; Sun, 20 Aug 2017 03:11:28 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752786AbdHTKLZ (ORCPT + 26 others); Sun, 20 Aug 2017 06:11:25 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:4516 "EHLO szxga04-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752344AbdHTKLU (ORCPT ); Sun, 20 Aug 2017 06:11:20 -0400 Received: from 172.30.72.59 (EHLO DGGEMS412-HUB.china.huawei.com) ([172.30.72.59]) by dggrg04-dlp.huawei.com (MOS 4.4.6-GA FastPath queued) with ESMTP id DFN22680; Sun, 20 Aug 2017 18:11:09 +0800 (CST) Received: from localhost (10.177.23.32) by DGGEMS412-HUB.china.huawei.com (10.3.19.212) with Microsoft SMTP Server id 14.3.301.0; Sun, 20 Aug 2017 18:11:02 +0800 From: Ding Tianhong To: , , , , , , , , CC: Ding Tianhong Subject: [PATCH v3 net 1/2 RESEND] Revert commit 1a8b6d76dc5b ("net:add one common config...") Date: Sun, 20 Aug 2017 18:10:54 +0800 Message-ID: <1503223855-24616-2-git-send-email-dingtianhong@huawei.com> X-Mailer: git-send-email 1.8.5.2.msysgit.0 In-Reply-To: <1503223855-24616-1-git-send-email-dingtianhong@huawei.com> References: <1503223855-24616-1-git-send-email-dingtianhong@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.177.23.32] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020201.5999603E.0070, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2014-11-16 11:51:01, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 0c76a942e374e2e683276c9621f23933 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The new flag PCI_DEV_FLAGS_NO_RELAXED_ORDERING has been added to indicate that Relaxed Ordering Attributes (RO) should not be used for Transaction Layer Packets (TLP) targeted toward these affected Root Port, it will clear the bit4 in the PCIe Device Control register, so the PCIe device drivers could query PCIe configuration space to determine if it can send TLPs to Root Port with the Relaxed Ordering Attributes set. With this new flag we don't need the config ARCH_WANT_RELAX_ORDER to control the Relaxed Ordering Attributes for the ixgbe drivers just like the commit 1a8b6d76dc5b ("net:add one common config...") did, so revert this commit. Signed-off-by: Ding Tianhong --- arch/Kconfig | 3 --- arch/sparc/Kconfig | 1 - drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) -- 1.8.3.1 diff --git a/arch/Kconfig b/arch/Kconfig index 21d0089..00cfc63 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -928,9 +928,6 @@ config STRICT_MODULE_RWX and non-text memory will be made non-executable. This provides protection against certain security exploits (e.g. writing to text) -config ARCH_WANT_RELAX_ORDER - bool - config REFCOUNT_FULL bool "Perform full reference count validation at the expense of speed" help diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index a4a6261..987a575 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@ -44,7 +44,6 @@ config SPARC select ARCH_HAS_SG_CHAIN select CPU_NO_EFFICIENT_FFS select LOCKDEP_SMALL if LOCKDEP - select ARCH_WANT_RELAX_ORDER config SPARC32 def_bool !64BIT diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c index 4e35e70..d4933d2 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c @@ -350,7 +350,7 @@ s32 ixgbe_start_hw_gen2(struct ixgbe_hw *hw) } IXGBE_WRITE_FLUSH(hw); -#ifndef CONFIG_ARCH_WANT_RELAX_ORDER +#ifndef CONFIG_SPARC /* Disable relaxed ordering */ for (i = 0; i < hw->mac.max_tx_queues; i++) { u32 regval;