]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
Revert commit 1a8b6d76dc5b ("net:add one common config...")
authorDing Tianhong <dingtianhong@huawei.com>
Fri, 3 Nov 2017 17:33:00 +0000 (18:33 +0100)
committerStefan Bader <stefan.bader@canonical.com>
Mon, 20 Nov 2017 10:50:44 +0000 (11:50 +0100)
BugLink: https://bugs.launchpad.net/bugs/1721365
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 <dingtianhong@huawei.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(backported from commit f4986d250ada29ae0c65c209a9d8f97968ea7eae)
Signed-off-by: dann frazier <dann.frazier@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
arch/Kconfig
arch/sparc/Kconfig
drivers/net/ethernet/intel/ixgbe/ixgbe_common.c

index 21d0089117fe957be2e32f97d5ab92b3086abd1c..00cfc634be7cc81982dd231f6cce9150645fadd9 100644 (file)
@@ -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
index a4a626199c47e1afce31559a028df4cda331f619..987a57502909b4eb81bc86afa286f1140955ade0 100644 (file)
@@ -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
index 4e35e7017f3de81da022ef3be77c9c8e27634bf6..d4933d22b7fe2f42a68dff0b66a22c167ef8f2b2 100644 (file)
@@ -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;