From db0eb183523c9ad03fb63ea7ef120784d8658514 Mon Sep 17 00:00:00 2001 From: Shruthi Ravichandran Date: Fri, 26 Aug 2022 07:40:11 -0700 Subject: [PATCH 1/2] e1000e: Replace PREEMPT_RT_FULL with PREEMPT_RT Commit a555b1a added a delay after long writes on PREEMPT_RT-enabled kernels, but using the PREEMPT_RT_FULL option, which has since been replaced by just PREEMPT_RT. Therefore, update the delay condition to check on PREEMPT_RT instead. Signed-off-by: Shruthi Ravichandran --- drivers/net/ethernet/intel/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/Kconfig b/drivers/net/ethernet/intel/Kconfig index 67d783b2c810b..d9a537ac15e9e 100644 --- a/drivers/net/ethernet/intel/Kconfig +++ b/drivers/net/ethernet/intel/Kconfig @@ -87,7 +87,7 @@ config E1000E_HWTS config E1000_DELAY bool "Add delays to e1000x drivers" default n - depends on (E1000E || E1000) && PREEMPT_RT_FULL + depends on (E1000E || E1000) && PREEMPT_RT help Enable delays after large numbers of MMIO writes to registers. The delays aid in preventing noticeable impact on real-time From a9017ce20b484cd35058ff3c9a2202e4f7188a53 Mon Sep 17 00:00:00 2001 From: Shruthi Ravichandran Date: Tue, 30 Aug 2022 14:39:34 +0000 Subject: [PATCH 2/2] nati_x86_64_defconfig: enable CONFIG_E1000_DELAY CONFIG_E1000_DELAY depended on PREEMPT_RT_FULL, which has since been replaced by PREEMPT_RT. Now that the Kconfig depends has been fixed for this config, enable CONFIG_E1000_DELAY. Signed-off-by: Shruthi Ravichandran --- arch/x86/configs/nati_x86_64_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/configs/nati_x86_64_defconfig b/arch/x86/configs/nati_x86_64_defconfig index e59fe012a6ba8..4d625f952938a 100644 --- a/arch/x86/configs/nati_x86_64_defconfig +++ b/arch/x86/configs/nati_x86_64_defconfig @@ -289,6 +289,7 @@ CONFIG_TULIP=m CONFIG_E100=m CONFIG_E1000=m CONFIG_E1000E=m +CONFIG_E1000_DELAY=y CONFIG_IGB=m CONFIG_IGBVF=m CONFIG_IXGB=m