* [Qemu-devel] [PATCH for-2.0] acpi: Fixed incorrect ACPI generation for pci bridges
@ 2014-03-27 15:35 Marcel Apfelbaum
2014-03-27 15:45 ` Michael S. Tsirkin
0 siblings, 1 reply; 2+ messages in thread
From: Marcel Apfelbaum @ 2014-03-27 15:35 UTC (permalink / raw)
To: qemu-devel; +Cc: aliguori, mst
Commit 8dcf525abc5dff785251a881f9764dd961065c0d appended
description for all occupied non hotpluggable PCI slots.
However the bridge devices are already added to SSDT,
adding them again will create an incorrect SSDT table.
Fixed by skipping the pci bridge devices, marking them as 'system'.
Signed-off-by: Marcel Apfelbaum <marcel.a@redhat.com>
---
hw/i386/acpi-build.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 7ecfd70..60abb57 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -841,7 +841,8 @@ static void build_pci_bus_end(PCIBus *bus, void *bus_state)
pc = PCI_DEVICE_GET_CLASS(pdev);
dc = DEVICE_GET_CLASS(pdev);
- if (pc->class_id == PCI_CLASS_BRIDGE_ISA) {
+ if (pc->class_id == PCI_CLASS_BRIDGE_ISA ||
+ pc->is_bridge) { /* DSDT or SSDT above */
set_bit(slot, slot_device_system);
}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [Qemu-devel] [PATCH for-2.0] acpi: Fixed incorrect ACPI generation for pci bridges
2014-03-27 15:35 [Qemu-devel] [PATCH for-2.0] acpi: Fixed incorrect ACPI generation for pci bridges Marcel Apfelbaum
@ 2014-03-27 15:45 ` Michael S. Tsirkin
0 siblings, 0 replies; 2+ messages in thread
From: Michael S. Tsirkin @ 2014-03-27 15:45 UTC (permalink / raw)
To: Marcel Apfelbaum; +Cc: qemu-devel, aliguori
On Thu, Mar 27, 2014 at 05:35:36PM +0200, Marcel Apfelbaum wrote:
> Commit 8dcf525abc5dff785251a881f9764dd961065c0d appended
> description for all occupied non hotpluggable PCI slots.
> However the bridge devices are already added to SSDT,
> adding them again will create an incorrect SSDT table.
>
> Fixed by skipping the pci bridge devices, marking them as 'system'.
>
> Signed-off-by: Marcel Apfelbaum <marcel.a@redhat.com>
Applied.
I tweaked the commit log and comment a bit.
> ---
> hw/i386/acpi-build.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index 7ecfd70..60abb57 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -841,7 +841,8 @@ static void build_pci_bus_end(PCIBus *bus, void *bus_state)
> pc = PCI_DEVICE_GET_CLASS(pdev);
> dc = DEVICE_GET_CLASS(pdev);
>
> - if (pc->class_id == PCI_CLASS_BRIDGE_ISA) {
> + if (pc->class_id == PCI_CLASS_BRIDGE_ISA ||
> + pc->is_bridge) { /* DSDT or SSDT above */
> set_bit(slot, slot_device_system);
> }
>
> --
> 1.8.3.1
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-03-27 15:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-27 15:35 [Qemu-devel] [PATCH for-2.0] acpi: Fixed incorrect ACPI generation for pci bridges Marcel Apfelbaum
2014-03-27 15:45 ` Michael S. Tsirkin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).