[PATCH 0/2] acpi: windows fixes

[Gerd Hoffmann]

Hi,

Two little fixes needed to make windows 7 boot with master.

cheers,
  Gerd

Gerd Hoffmann (2):
  acpi: reorder PX13 + ISA
  acpi: fix COM2._UID

src/acpi-dsdt-isa.dsl |    2 +-
 src/acpi-dsdt.dsl     |   24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

[PATCH 1/2] acpi: reorder PX13 + ISA

[Gerd Hoffmann]

Without this windows 7 BSODs, probably because
we are referencing PX13 from ISA.

Signed-off-by: Gerd Hoffmann 
---
 src/acpi-dsdt.dsl |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/acpi-dsdt.dsl b/src/acpi-dsdt.dsl
index 58d2f9e..7cde312 100644
--- a/src/acpi-dsdt.dsl
+++ b/src/acpi-dsdt.dsl
@@ -91,6 +91,18 @@ DefinitionBlock (

/****************************************************************
+ * PIIX4 PM
+ ****************************************************************/
+
+    Scope(_SB.PCI0) {
+        Device(PX13) {
+            Name(_ADR, 0x00010003)
+            OperationRegion(P13C, PCI_Config, 0x00, 0xff)
+        }
+    }
+
+
+/****************************************************************
  * SuperIO devices (kbd, mouse, etc.)
  ****************************************************************/

@@ -114,18 +126,6 @@ DefinitionBlock (

/****************************************************************
- * PIIX4 PM
- ****************************************************************/
-
-    Scope(_SB.PCI0) {
-        Device(PX13) {
-            Name(_ADR, 0x00010003)
-            OperationRegion(P13C, PCI_Config, 0x00, 0xff)
-        }
-    }
-
-
-/****************************************************************
  * PCI hotplug
  ****************************************************************/

[PATCH 1/2] acpi: reorder PX13 + ISA

[Kevin O'Connor]

On Tue, Dec 04, 2012 at 04:26:39PM +0100, Gerd Hoffmann wrote:
> Without this windows 7 BSODs, probably because
> we are referencing PX13 from ISA.

Thanks - I applied both patches.

It's odd that this patch is needed - the dsdt has been referencing
not yet defined objects for some time without report of problems.  It
would be good to know what Win7 doesn't like about this particular
forward reference.

-Kevin

[PATCH 1/2] acpi: reorder PX13 + ISA

[Gerd Hoffmann]

On 12/05/12 03:07, Kevin O'Connor wrote:
> On Tue, Dec 04, 2012 at 04:26:39PM +0100, Gerd Hoffmann wrote:
> > Without this windows 7 BSODs, probably because
> > we are referencing PX13 from ISA.
>
> Thanks - I applied both patches.
>
> It's odd that this patch is needed - the dsdt has been referencing
> not yet defined objects for some time without report of problems.  It
> would be good to know what Win7 doesn't like about this particular
> forward reference.

No idea, figured by trial and error.  /me was surprised too that this
actually helps, linux guests have no problems with the forward reference.

cheers,
  Gerd

[PATCH 2/2] acpi: fix COM2._UID

[Gerd Hoffmann]

Commit 8d7449771068824b8bdb51fe622c10660b373d4f broke this.

Signed-off-by: Gerd Hoffmann 
---
 src/acpi-dsdt-isa.dsl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/acpi-dsdt-isa.dsl b/src/acpi-dsdt-isa.dsl
index cc5efde..23761db 100644
--- a/src/acpi-dsdt-isa.dsl
+++ b/src/acpi-dsdt-isa.dsl
@@ -85,7 +85,7 @@ Scope(_SB.PCI0.ISA) {

Device(COM2) {
         Name(_HID, EisaId("PNP0501"))
-        Name(_UID, 0x01)
+        Name(_UID, 0x02)
         Method(_STA, 0, NotSerialized) {
             Store(CBEN, Local0)
             If (LEqual(Local0, 0)) {