ixgbe: sparc: rename the ARCH_WANT_RELAX_ORDER to IXGBE_ALLOW_RELAXED_ORDER
Subsystems (3)
PATCH 1/4 ixgbe: sparc: rename the ARCH_WANT_RELAX_ORDER to IXGBE_ALLOW_RELAXED_ORDER
From: Ding Tianhong <[email protected]>
Till now only the Intel ixgbe could support enable Relaxed ordering in the drivers for special architecture, but the ARCH_WANT_RELAX_ORDER is looks like a general name for all arch, so rename to a specific name for intel card looks more appropriate.
---
Doing what the author could not do, send to the correct mailing list...
--- arch/Kconfig | 2 +- arch/sparc/Kconfig | 2 +- drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/Kconfig +1 -1
@@ -844,7 +844,7 @@ 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 +config IXGBE_ALLOW_RELAXED_ORDER bool source "kernel/gcov/Kconfig"
arch/sparc/Kconfig +1 -1
@@ -44,7 +44,7 @@ config SPARC select CPU_NO_EFFICIENT_FFS select HAVE_ARCH_HARDENED_USERCOPY select PROVE_LOCKING_SMALL if PROVE_LOCKING - select ARCH_WANT_RELAX_ORDER + select IXGBE_ALLOW_RELAXED_ORDER config SPARC32 def_bool !64BIT
drivers/net/ethernet/intel/ixgbe/ixgbe_common.c +1 -1
@@ -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_IXGBE_ALLOW_RELAX_ORDER /* Disable relaxed ordering */ for (i =0 ; i < hw->mac.max_tx_queues; i++) {u32 regval;
PATCH 2/4 ixgbe/ixgbevf: Clear the CONFIG_SPARC for ixgbevf and 82598
From: Ding Tianhong <[email protected]>
The CONFIG_SPARC in ixgbevf and ixgbe_82598 is only used to enable relaxed ordering, the CONFIG_IXBGE_WANT_RELAXED_ORDER already did this, so rename this config for the same setting.
---
Doing what the author could not do, send to the correct mailing list...
--- drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | 4 ++-- drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c +2 -2
@@ -175,7 +175,7 @@ static s32 ixgbe_init_phy_ops_82598(struct ixgbe_hw *hw)**/ static s32 ixgbe_start_hw_82598 (struct ixgbe_hw *hw) { -#ifndef CONFIG_SPARC +#ifndef CONFIG_IXGBE_ALLOW_RELAXED_ORDER u32 regval;u32 i;#endif
@@ -183,7 +183,7 @@ static s32 ixgbe_start_hw_82598(struct ixgbe_hw *hw) ret_val =ixgbe_start_hw_generic (hw); -#ifndef CONFIG_SPARC +#ifndef CONFIG_IXGBE_ALLOW_RELAXED_ORDER /* Disable relaxed ordering */ for (i =0 ; ((i < hw->mac.max_tx_queues) && (i <IXGBE_DCA_MAX_QUEUES_82598 )); i++) {
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c +1 -1
@@ -1713,7 +1713,7 @@ static void ixgbevf_configure_rx_ring(struct ixgbevf_adapter *adapter,IXGBE_WRITE_REG (hw,IXGBE_VFRDLEN (reg_idx), ring->count *sizeof (union ixgbe_adv_rx_desc )); -#ifndef CONFIG_SPARC +#ifndef CONFIG_IXGBE_ALLOW_RELAXED_ORDER /* enable relaxed ordering */ IXGBE_WRITE_REG (hw,IXGBE_VFDCA_RXCTRL (reg_idx),IXGBE_DCA_RXCTRL_DESC_RRO_EN );
PATCH 3/4 ixgbe: move IXGBE_ALLOW_RELAXED_ORDER from architecture to driver
In reply to Jeff KirsherFrom: Ding Tianhong <[email protected]>
The Relaxed Ordering is an specific PCI option and impact some architecture performance just like SPARC and ARM64, so compare to drop this to the several architecture folder, put it in driver looks more appropriate, it will not impact or be seen for other architectures.
---
Doing what the author could not do, send to the correct mailing list...
--- arch/Kconfig | 3 --- arch/sparc/Kconfig | 1 - drivers/net/ethernet/intel/Kconfig | 4 ++++ 3 files changed, 4 insertions(+), 4 deletions(-)
arch/Kconfig +0 -3
@@ -844,7 +844,4 @@ 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 IXGBE_ALLOW_RELAXED_ORDER - bool - source "kernel/gcov/Kconfig"
arch/sparc/Kconfig +0 -1
@@ -44,7 +44,6 @@ config SPARC select CPU_NO_EFFICIENT_FFS select HAVE_ARCH_HARDENED_USERCOPY select PROVE_LOCKING_SMALL if PROVE_LOCKING - select IXGBE_ALLOW_RELAXED_ORDER config SPARC32 def_bool !64BIT
drivers/net/ethernet/intel/Kconfig +4 -0
@@ -275,4 +275,8 @@ config FM10K To compile this driver as a module, choose M here. The module will be called fm10k. MSI-X interrupt support is required +config IXGBE_ALLOW_RELAXED_ORDER + bool "Intel(R) 10GbE PCI Express adapters Enable Relaxed Ordering" if SPARC + default y if SPARC + endif # NET_VENDOR_INTEL
PATCH 4/4 ixgbe: enable IXGBE_ALLOW_RELAXED_ORDER for ARM64
In reply to Jeff KirsherFrom: Ding Tianhong <[email protected]>
The IXGBE_ALLOW_RELAXED_ORDER will enable Relaxed Ordering (RO) which allows transactions that do not have any order of completion requirements to complete more efficiently compare to the Stricted Ordering (SO) for ixgbe net card. Some architecture will see high write-to-memory performance when RO is enabled on the data transactions just like the SPARC did.
The aarch64 could both support Relaxed Ordering (RO) and Stricted Ordering (SO), so enable this config could get much more better performance, didn't see any adverse effects.
---
Doing what the author could not do, send to the correct mailing list...
--- drivers/net/ethernet/intel/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/Kconfig +2 -2
@@ -276,7 +276,7 @@ config FM10K will be called fm10k. MSI-X interrupt support is required config IXGBE_ALLOW_RELAXED_ORDER - bool "Intel(R) 10GbE PCI Express adapters Enable Relaxed Ordering" if SPARC - default y if SPARC + bool "Intel(R) 10GbE PCI Express adapters Enable Relaxed Ordering" if (SPARC || ARM64) + default y if (SPARC || ARM64) endif # NET_VENDOR_INTEL