From patchwork Mon Oct 9 15:12:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Kirsher X-Patchwork-Id: 115261 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp2666919qgn; Mon, 9 Oct 2017 08:13:32 -0700 (PDT) X-Google-Smtp-Source: AOwi7QBObXskg3wJphOB32r5x5X2OlIS3AEZjmrPPG2iVdbV6hBjl8hB093l0w0J+JzN2mbVBx9d X-Received: by 10.101.72.132 with SMTP id n4mr2403484pgs.245.1507562012661; Mon, 09 Oct 2017 08:13:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507562012; cv=none; d=google.com; s=arc-20160816; b=veH43vkr9LeykbW+s1CjrB9Rs3JYQpTsS4+ndut/NHEAURAtUb+wL/dL9NMTGOLMdR SGgJKhJ38sNLViB+hboMu+MHilbn82dej2cblQhgiyoM0Pr3smAX5BAxmyz5fHkS1duc dFRIXjJwidMAc3sOFfEWmIY3mh4PgqsMMNDaAHlDlsEaJyozhIgG2eYSeWcZEJlCt8OL vjjNynsHfjyl9Zw0qnRRzf1j76pYLVQE9x8hPel/6dTUPnI/KH5Ku9NoHOfx9tZjv/Ts k7bhW9PlaHBjAa2KekCk7MsNcuAgdhWEulWFhBV8R1vHa4uDXhSxyJ7PI42fzTETrYUm nz9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=8PpRU7/oHz47NIdwxQUjsOJ8Jm9ireFuZbKH0Xmkfwk=; b=wPOYuVj4vP+6JThjRgXj9YtXrRSzeTBPkuxReqQDBN0PYHYxu6nzbNT81hZXuhthwv onDtt9KcgAvUnJmobHg7AGduHNFybodUmF/z1v2iLfMFxHP8WW7ivc5AbRKOIBRY600C 8mcgfZ7XH+UmwT3Wnj27wQBc5l6q50VYa+gXMtcdwibu9vsCfIH4g9K0i9Jc+5BZd0md mgSha+fgdE/H724WwYHLP6T4XDPW9w9U0AT21S5m0LSP9/w+jzRISmsdPXomgkT0eekW j43UQ2sFI8w0KoBUAjI+fmQPWMZQEdcPiVG4+gny7UiD5FHpytpK4T4a9AhsIUtiV/1Z L3xg== 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 o82si1301941pfj.249.2017.10.09.08.13.32; Mon, 09 Oct 2017 08:13:32 -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 S1754631AbdJIPNa (ORCPT + 26 others); Mon, 9 Oct 2017 11:13:30 -0400 Received: from mga05.intel.com ([192.55.52.43]:48022 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754245AbdJIPNP (ORCPT ); Mon, 9 Oct 2017 11:13:15 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga105.fm.intel.com with ESMTP; 09 Oct 2017 08:13:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.42,500,1500966000"; d="scan'208";a="144436620" Received: from jtkirshe-desk.jf.intel.com (HELO jtkirshe-DESK.amr.corp.intel.com.com) ([134.134.177.54]) by orsmga002.jf.intel.com with ESMTP; 09 Oct 2017 08:13:13 -0700 From: Jeff Kirsher To: davem@davemloft.net Cc: Ding Tianhong , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com, jogreene@redhat.com, Jeff Kirsher Subject: [net 3/5] Revert commit 1a8b6d76dc5b ("net:add one common config...") Date: Mon, 9 Oct 2017 08:12:49 -0700 Message-Id: <20171009151251.53939-4-jeffrey.t.kirsher@intel.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171009151251.53939-1-jeffrey.t.kirsher@intel.com> References: <20171009151251.53939-1-jeffrey.t.kirsher@intel.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ding Tianhong 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 Tested-by: Andrew Bowers Signed-off-by: Jeff Kirsher --- arch/Kconfig | 3 --- arch/sparc/Kconfig | 1 - drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) -- 2.14.2 diff --git a/arch/Kconfig b/arch/Kconfig index 1aafb4efbb51..d789a89cb32c 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -937,9 +937,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 ARCH_HAS_REFCOUNT bool help diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 0be3828752e5..4e83f950713e 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 2c19070d2a0b..e8c1788aed1f 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c @@ -366,7 +366,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;