From c4236cb2d1f7b8e47c442943321e4000eb7c488b Mon Sep 17 00:00:00 2001 From: David Gibson Date: Mon, 26 Jul 2021 18:35:09 +1000 Subject: [PATCH] packaging/kernel: Add CONFIG_PCI_MMCONFIG to x86 guest kernel configuration The guest kernel configuration suggested for Kata, and which is used by the CI didn't include CONFIG_PCI_MMCONFIG. That's kind of weird, MMCONFIG is the modern normal way of handling configuration cycles. In addition, due to a complex set of interactions through the ACPI code, disabling MMCONFIG means that SHPC hotplug doesn't work: the driver is included in the guest kernel, but will fail to probe on PCI to PCI bridges, meaning it won't actually be activated. Enable MMCONFIG so that we suggest and testa more typical guest kernel configuration. fixes #2288 Signed-off-by: David Gibson --- tools/packaging/kernel/configs/fragments/x86_64/pci.conf | 1 + tools/packaging/kernel/kata_config_version | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/packaging/kernel/configs/fragments/x86_64/pci.conf b/tools/packaging/kernel/configs/fragments/x86_64/pci.conf index 90bf4c7ca89e..2fab0638ab39 100644 --- a/tools/packaging/kernel/configs/fragments/x86_64/pci.conf +++ b/tools/packaging/kernel/configs/fragments/x86_64/pci.conf @@ -1 +1,2 @@ +CONFIG_PCI_MMCONFIG=y CONFIG_PCI_MSI_IRQ_DOMAIN=y diff --git a/tools/packaging/kernel/kata_config_version b/tools/packaging/kernel/kata_config_version index a862eb8444d4..8cf5c1a22a22 100644 --- a/tools/packaging/kernel/kata_config_version +++ b/tools/packaging/kernel/kata_config_version @@ -1 +1 @@ -85 +86