Re: [Qemu-devel] [PULL 1/5] acpi-build: append description for non-hotplug

[Michael S. Tsirkin]

On Wed, Feb 19, 2014 at 02:45:29PM -0500, Gabriel L. Somlo wrote:
> On Wed, Feb 19, 2014 at 09:02:15PM +0200, Michael S. Tsirkin wrote:
> > On Wed, Feb 19, 2014 at 03:50:22PM +0200, Michael S. Tsirkin wrote:
> > > On Mon, Feb 17, 2014 at 09:51:39AM -0500, Gabriel L. Somlo wrote:
> > > > With this latest version of your patch, I crash during OS X boot with
> > > > "unable to find driver for this 
> > > > platform:\"ACPI\".\n"@/SourceCache/xnu/xnu-2050.48.12/iokit/Kernel/IOPlatformExpert.cpp:1514"
> > > > 
> > > Any chance below helps on top?
> > > Another alternative is that DSDT referencing
> > > SSDT does not work for apple.
> > > I hope it's not that, that would be annoying...
> > 
> > OK I think it's that unfortunately.
> > The following on top should help.
> > Can you confirm please?
> > 
> > Thanks a lot for the report!
> > 
> > commit a0ad25b1e5d0eb21cbba001799341bd6b557e995
> > Author: Michael S. Tsirkin <address@hidden>
> > Date:   Wed Feb 19 17:20:56 2014 +0200
> > 
> >     Don't call SSDT from DSDT
> >     
> >     Windows XP doesn't like this.
> >     Apparently, neither does Mac OSX.
> >     
> >     Signed-off-by: Michael S. Tsirkin <address@hidden>
> >     Tested-by: "Gabriel L. Somlo" <address@hidden>
> 
> Sorry, still the same error :(

Oh yes, I forgot that Q35 has a separate DSDT.
Please add this on top:

commit ceb36090bf2054c8ad5c8cf441b690fad5581f4f
Author: Michael S. Tsirkin <address@hidden>
Date:   Thu Feb 20 07:10:56 2014 +0200

    q35: fix up dsdt as well

diff --git a/hw/i386/q35-acpi-dsdt.dsl b/hw/i386/q35-acpi-dsdt.dsl
index 8e522a5..f4d2a2d 100644
--- a/hw/i386/q35-acpi-dsdt.dsl
+++ b/hw/i386/q35-acpi-dsdt.dsl
@@ -72,7 +72,6 @@ DefinitionBlock (
             Name(_ADR, 0x00)
             Name(_UID, 1)
 
-#define ISA SF8_
             External(ISA, DeviceObj)
 
             // _OSC: based on sample of ACPI3.0b spec
@@ -140,8 +139,10 @@ DefinitionBlock (
  * LPC ISA bridge
  ****************************************************************/
 
-    Scope(\_SB.PCI0.ISA) {
+    Scope(\_SB.PCI0) {
         /* PCI D31:f0 LPC ISA bridge */
+        Device(ISA) {
+            Name (_ADR, 0x001F0000)  // _ADR: Address
 
             /* ICH9 PCI to ISA irq remapping */
             OperationRegion(PIRQ, PCI_Config, 0x60, 0x0C)
@@ -164,6 +165,7 @@ DefinitionBlock (
                 LPEN,   1,
                 FDEN,   1
             }
+        }
     }
 
 #define DSDT_APPLESMC_STA q35_dsdt_applesmc_sta