Patchwork reset PMBA and PMREGMISC PIIX4 registers.

login
register
mail settings
Submitter Gleb Natapov
Date Aug. 7, 2012, 12:52 p.m.
Message ID <20120807125203.GC3341@redhat.com>
Download mbox | patch
Permalink /patch/175624/
State New
Headers show

Comments

Gleb Natapov - Aug. 7, 2012, 12:52 p.m.
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. 

Signed-off-by: Gleb Natapov <gleb@redhat.com>
--
			Gleb.
Laszlo Ersek - Aug. 7, 2012, 1:03 p.m.
On 08/07/12 14:52, Gleb Natapov wrote:
> 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. 
> 
> Signed-off-by: Gleb Natapov <gleb@redhat.com>
> diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c
> index 0aace60..90b46b5 100644
> --- a/hw/acpi_piix4.c
> +++ b/hw/acpi_piix4.c
> @@ -353,6 +353,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;
> @@ -392,8 +395,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);
>  
> --
> 			Gleb.

Unless I'm missing something, the patch keeps the "PM io base read only
bit" set-up correctly the first time around too, since

piix4_pm_initfn()
  qemu_register_reset(piix4_reset, ...);

main()
  qemu_system_reset()

FWIW,

Reviewed-by: Laszlo Ersek <lersek@redhat.com>

Thanks!
Laszlo
Gleb Natapov - Aug. 15, 2012, 4:48 p.m.
Ping.

On Tue, Aug 07, 2012 at 03:52:03PM +0300, Gleb Natapov wrote:
> 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. 
> 
> Signed-off-by: Gleb Natapov <gleb@redhat.com>
> diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c
> index 0aace60..90b46b5 100644
> --- a/hw/acpi_piix4.c
> +++ b/hw/acpi_piix4.c
> @@ -353,6 +353,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;
> @@ -392,8 +395,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);
>  
> --
> 			Gleb.

--
			Gleb.

Patch

diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c
index 0aace60..90b46b5 100644
--- a/hw/acpi_piix4.c
+++ b/hw/acpi_piix4.c
@@ -353,6 +353,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;
@@ -392,8 +395,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);