From c4bd5f6e084a6ced2c7a2f76798d0a34947ffeb7 Mon Sep 17 00:00:00 2001 From: Martin Borg Date: Fri, 23 Mar 2018 14:01:03 +0100 Subject: boot_time_opt: update host boot time optimization patches for 4.14 The new patches are based on: https://github.com/clearlinux-pkgs/linux-lts commit 5595fe425a52af6734235a1a953b6b03210060ec Signed-off-by: Martin Borg Signed-off-by: Adrian Dudau --- ...0121-igb-no-runtime-pm-to-fix-reboot-oops.patch | 64 ++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 patches/boot_time_opt/0121-igb-no-runtime-pm-to-fix-reboot-oops.patch (limited to 'patches/boot_time_opt/0121-igb-no-runtime-pm-to-fix-reboot-oops.patch') diff --git a/patches/boot_time_opt/0121-igb-no-runtime-pm-to-fix-reboot-oops.patch b/patches/boot_time_opt/0121-igb-no-runtime-pm-to-fix-reboot-oops.patch new file mode 100644 index 0000000..f271c34 --- /dev/null +++ b/patches/boot_time_opt/0121-igb-no-runtime-pm-to-fix-reboot-oops.patch @@ -0,0 +1,64 @@ +From 3600f0a90ddea2a2a8c4a157a0bb70913ae4e640 Mon Sep 17 00:00:00 2001 +From: Arjan van de Ven +Date: Thu, 12 Jan 2017 18:17:14 +0000 +Subject: [PATCH 121/126] disable PM on some NICs + +igb: no runtime pm to fix reboot oops + +Causes oops on reboot due to a race between runtime resume and shutdown + +e1000e: disable PM as it disconects from some NICs + +e1000: disable PM just in case + +--- + drivers/net/ethernet/intel/igb/igb_main.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c +index ea69af267d63..1107b74225b0 100644 +--- a/drivers/net/ethernet/intel/igb/igb_main.c ++++ b/drivers/net/ethernet/intel/igb/igb_main.c +@@ -239,9 +239,6 @@ static struct pci_driver igb_driver = { + .id_table = igb_pci_tbl, + .probe = igb_probe, + .remove = igb_remove, +-#ifdef CONFIG_PM +- .driver.pm = &igb_pm_ops, +-#endif + .shutdown = igb_shutdown, + .sriov_configure = igb_pci_sriov_configure, + .err_handler = &igb_err_handler +diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c +index 1982f7917a8d..6e8e8919f9b9 100644 +--- a/drivers/net/ethernet/intel/e1000/e1000_main.c ++++ b/drivers/net/ethernet/intel/e1000/e1000_main.c +@@ -209,11 +209,6 @@ static struct pci_driver e1000_driver = { + .id_table = e1000_pci_tbl, + .probe = e1000_probe, + .remove = e1000_remove, +-#ifdef CONFIG_PM +- /* Power Management Hooks */ +- .suspend = e1000_suspend, +- .resume = e1000_resume, +-#endif + .shutdown = e1000_shutdown, + .err_handler = &e1000_err_handler + }; +diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c +index 327dfe5bedc0..4f66a91b4026 100644 +--- a/drivers/net/ethernet/intel/e1000e/netdev.c ++++ b/drivers/net/ethernet/intel/e1000e/netdev.c +@@ -7572,9 +7572,6 @@ static struct pci_driver e1000_driver = { + .id_table = e1000_pci_tbl, + .probe = e1000_probe, + .remove = e1000_remove, +- .driver = { +- .pm = &e1000_pm_ops, +- }, + .shutdown = e1000_shutdown, + .err_handler = &e1000_err_handler + }; +-- +2.15.0 + -- cgit v1.2.3-54-g00ecf