diff options
| author |   Gleb Natapov <gleb@redhat.com> | 2012-08-07 15:52:03 +0300 |
|---|---|---|
| committer |   Michael Roth <mdroth@linux.vnet.ibm.com> | 2012-09-05 10:30:38 -0500 |
| commit | 219a7482ab5866c64fc5a815381737ef8cf77f63 (patch) | |
| tree | c35f930923a75957c368f5254b688b0c38c9abab | |
| parent | 28846ad3b556458674f03323cac3144dcc3cd5e2 (diff) | |
reset PMBA and PMREGMISC PIIX4 registers.
The bug causes Windows + OVMF hang after reboot since OVMF
checks PMREGMISC to see if IO space is enabled and skip
configuration if it is.
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
(cherry picked from commit 4d09d37c6aa9a02b44b1fdb6268820fab92499bd)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| -rw-r--r-- | hw/acpi_piix4.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c index 585da4e3e..7bc4e0dba 100644 --- a/hw/acpi_piix4.c +++ b/hw/acpi_piix4.c @@ -345,6 +345,9 @@ static void piix4_reset(void *opaque) pci_conf[0x5a] = 0; pci_conf[0x5b] = 0; + pci_conf[0x40] = 0x01; /* PM io base read only bit */ + pci_conf[0x80] = 0; + if (s->kvm_enabled) { /* Mark SMM as already inited (until KVM supports SMM). */ pci_conf[0x5B] = 0x02; @@ -384,8 +387,6 @@ static int piix4_pm_initfn(PCIDevice *dev) pci_conf[0x09] = 0x00; pci_conf[0x3d] = 0x01; // interrupt pin 1 - pci_conf[0x40] = 0x01; /* PM io base read only bit */ - /* APM */ apm_init(&s->apm, apm_ctrl_changed, s); |