Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Revert commit 1a8b6d76dc5b ("net:add one common config...")

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>

authored by

Ding Tianhong and committed by
Jeff Kirsher
f4986d25 a39221ce

+1 -5
-3
arch/Kconfig
··· 937 937 and non-text memory will be made non-executable. This provides 938 938 protection against certain security exploits (e.g. writing to text) 939 939 940 - config ARCH_WANT_RELAX_ORDER 941 - bool 942 - 943 940 config ARCH_HAS_REFCOUNT 944 941 bool 945 942 help
-1
arch/sparc/Kconfig
··· 44 44 select ARCH_HAS_SG_CHAIN 45 45 select CPU_NO_EFFICIENT_FFS 46 46 select LOCKDEP_SMALL if LOCKDEP 47 - select ARCH_WANT_RELAX_ORDER 48 47 49 48 config SPARC32 50 49 def_bool !64BIT
+1 -1
drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
··· 366 366 } 367 367 IXGBE_WRITE_FLUSH(hw); 368 368 369 - #ifndef CONFIG_ARCH_WANT_RELAX_ORDER 369 + #ifndef CONFIG_SPARC 370 370 /* Disable relaxed ordering */ 371 371 for (i = 0; i < hw->mac.max_tx_queues; i++) { 372 372 u32 regval;