aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksandr Bezzubikov <zuban32s@gmail.com>2017-07-29 02:37:49 +0300
committerMichael Roth <mdroth@linux.vnet.ibm.com>2017-08-24 18:40:47 -0500
commit5f7f7e4f0562508df96e26da3ed3ce3a42247114 (patch)
treeb29043dbf1609b98d22b2d5380dc0b799ae9f0a4
parentde9b6728ff712610a4f49a37f20a428f12d3623f (diff)
hw/i386: allow SHPC for Q35 machine
Unmask previously masked SHPC feature in _OSC method. Signed-off-by: Aleksandr Bezzubikov <zuban32s@gmail.com> Reviewed-by: Marcel Apfelbaum <marcel@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> (cherry picked from commit a41c78c135eb1850826e96b2154690323ff66719) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
-rw-r--r--hw/i386/acpi-build.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 2073108577..76fa4555bf 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1818,9 +1818,9 @@ static Aml *build_q35_osc_method(void)
/*
* Always allow native PME, AER (no dependencies)
- * Never allow SHPC (no SHPC controller in this system)
+ * Allow SHPC (PCI bridges can have SHPC controller)
*/
- aml_append(if_ctx, aml_and(a_ctrl, aml_int(0x1D), a_ctrl));
+ aml_append(if_ctx, aml_and(a_ctrl, aml_int(0x1F), a_ctrl));
if_ctx2 = aml_if(aml_lnot(aml_equal(aml_arg(1), aml_int(1))));
/* Unknown revision */