On Thu, Feb 20, 2014 at 09:22:46AM -0500, Gabriel L. Somlo wrote:
> Hi Michael,
>
> On Thu, Feb 20, 2014 at 07:13:46AM +0200, Michael S. Tsirkin wrote:
> > Oh yes, I forgot that Q35 has a separate DSDT.
> > Please add this on top:
>
> Thanks, I can confirm that this patch
> (ceb36090bf2054c8ad5c8cf441b690fad5581f4f) on top of
> a0ad25b1e5d0eb21cbba001799341bd6b557e995, on top of
> the first patch you submitted ("acpi-build: append description for
> non-hotplug") fixes it for me !
>
> Regards,
> --Gabriel
Yay!
Okay will let it go through some testing and push hopefully
early next week.
Thanks a lot for catching this in time!
>
> >
> > commit ceb36090bf2054c8ad5c8cf441b690fad5581f4f
> > Author: Michael S. Tsirkin <m...@redhat.com>
> > 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
