From 72054cd2a352ed120838d102313e2b1ad3c0e8ad Mon Sep 17 00:00:00 2001 From: Jianyong Wu Date: Tue, 7 May 2019 01:39:14 -0400 Subject: [PATCH] kernel: disable pci shpc hotplug for arm64 As shpchp used for pci hotplug on arm64 initialized its bottom half work as a delay work for 5 seconds, pci bus rescan triggered between up half and bottom half of shpc interrupt handling will fail. so disable shpc and let bus rescan to do the device hotplug on arm64. Fixes: #498 Signed-off-by: Jianyong Wu --- kernel/configs/arm64_kata_kvm_4.19.x | 2 +- kernel/kata_config_version | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/configs/arm64_kata_kvm_4.19.x b/kernel/configs/arm64_kata_kvm_4.19.x index 56c5296880..e065fec90a 100644 --- a/kernel/configs/arm64_kata_kvm_4.19.x +++ b/kernel/configs/arm64_kata_kvm_4.19.x @@ -286,7 +286,7 @@ CONFIG_HOTPLUG_PCI=y CONFIG_HOTPLUG_PCI_ACPI=y # CONFIG_HOTPLUG_PCI_ACPI_IBM is not set CONFIG_HOTPLUG_PCI_CPCI=y -CONFIG_HOTPLUG_PCI_SHPC=y +# CONFIG_HOTPLUG_PCI_SHPC is not set # # PCI controller drivers diff --git a/kernel/kata_config_version b/kernel/kata_config_version index a2720097dc..425151f3a4 100644 --- a/kernel/kata_config_version +++ b/kernel/kata_config_version @@ -1 +1 @@ -39 +40