From 8c122a5b79df2e326f429c2f08a667285be52529 Mon Sep 17 00:00:00 2001 From: Marcel Apfelbaum Date: Wed, 24 May 2017 11:35:59 +0200 Subject: [PATCH 4/6] Revert "hw/pci: disable pci-bridge's shpc by default" RH-Author: Marcel Apfelbaum Message-id: <20170524113559.17638-1-marcel@redhat.com> Patchwork-id: 75407 O-Subject: [RHEL-7.4 qemu-kvm-rhev PATCH V2] Revert "hw/pci: disable pci-bridge's shpc by default" Bugzilla: 1434706 RH-Acked-by: Eduardo Habkost RH-Acked-by: Paolo Bonzini RH-Acked-by: Michael S. Tsirkin Tests: Tested the empty pci bridge gets the IO range resources This reverts commit dc0ae767700c156894e36fab89a745a2dc4173de. Disabling the shpc controller has an undesired side effect. The PCI bridge remains with no attached devices at boot time, and the guest operating systems do not allocate any resources for it, leaving the bridge unusable. Note that the behaviour is dictated by the pci bridge specification. Revert the commit and leave the shpc controller even if is not actually used by any architecture. Slot 0 remains unusable at boot time. Keep shpc off for QEMU 2.9 machines. Signed-off-by: Marcel Apfelbaum Reviewed-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin (cherry picked from commit 2fa356629ed2ce9c714f11c89c1a074b8bad3fcb) Signed-off-by: Marcel Apfelbaum Signed-off-by: Miroslav Rezanina --- hw/pci-bridge/pci_bridge_dev.c | 2 +- include/hw/compat.h | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/hw/pci-bridge/pci_bridge_dev.c b/hw/pci-bridge/pci_bridge_dev.c index 647ad80..5dbd933 100644 --- a/hw/pci-bridge/pci_bridge_dev.c +++ b/hw/pci-bridge/pci_bridge_dev.c @@ -163,7 +163,7 @@ static Property pci_bridge_dev_properties[] = { DEFINE_PROP_ON_OFF_AUTO(PCI_BRIDGE_DEV_PROP_MSI, PCIBridgeDev, msi, ON_OFF_AUTO_AUTO), DEFINE_PROP_BIT(PCI_BRIDGE_DEV_PROP_SHPC, PCIBridgeDev, flags, - PCI_BRIDGE_DEV_F_SHPC_REQ, false), + PCI_BRIDGE_DEV_F_SHPC_REQ, true), DEFINE_PROP_END_OF_LIST(), }; diff --git a/include/hw/compat.h b/include/hw/compat.h index f85c1c2..8366acc 100644 --- a/include/hw/compat.h +++ b/include/hw/compat.h @@ -341,10 +341,6 @@ .property = "old-multiple-chip-handling",\ .value = "on",\ },{ /* HW_COMPAT_RHEL7_3 */ \ - .driver = "pci-bridge",\ - .property = "shpc",\ - .value = "on",\ - },{ /* HW_COMPAT_RHEL7_3 */ \ .driver = TYPE_PCI_DEVICE,\ .property = "x-pcie-extcap-init",\ .value = "off",\ -- 1.8.3.1