From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44337) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VgxA5-00088U-Bi for qemu-devel@nongnu.org; Thu, 14 Nov 2013 08:40:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vgx9w-0001lP-EP for qemu-devel@nongnu.org; Thu, 14 Nov 2013 08:40:45 -0500 Received: from mx1.redhat.com ([209.132.183.28]:17551) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vgx9w-0001l3-44 for qemu-devel@nongnu.org; Thu, 14 Nov 2013 08:40:36 -0500 Message-ID: <1384436259.27694.14.camel@localhost.localdomain> From: Marcel Apfelbaum Date: Thu, 14 Nov 2013 15:37:39 +0200 In-Reply-To: <20131114121609.GA4997@redhat.com> References: <20131114121609.GA4997@redhat.com> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH] ACPI DSDT: Make control method `IQCR` serialized List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Michael S. Tsirkin" Cc: Hu Tao , qemu-devel@nongnu.org, Gerd Hoffmann , Anthony Liguori , Kenji Kaneshige , Igor Mammedov , Laszlo Ersek , Paul Menzel On Thu, 2013-11-14 at 14:16 +0200, Michael S. Tsirkin wrote: > Forward-port the following commit from seabios: >=20 > commit 995bbeef78b338370f426bf8d0399038c3fa259c > Author: Paul Menzel > Date: Thu Oct 3 11:30:52 2013 +0200 >=20 > The ASL Optimizing Compiler version 20130823-32 [Sep 11 2013] issue= s the > following warning. >=20 > $ make > [=E2=80=A6] > Compiling IASL out/src/fw/acpi-dsdt.hex > out/src/fw/acpi-dsdt.dsl.i 360: Method(IQCR, 1, = NotSerialized) { > Remark 2120 - ^ Contr= ol Method should be made Serialized (due to creation of named objects wit= hin) > [=E2=80=A6] > ASL Input: out/src/fw/acpi-dsdt.dsl.i - 475 lines, 1918= 1 bytes, 316 keywords > AML Output: out/src/fw/acpi-dsdt.aml - 4407 bytes, 159 n= amed objects, 157 executable opcodes > Listing File: out/src/fw/acpi-dsdt.lst - 143715 bytes > Hex Dump: out/src/fw/acpi-dsdt.hex - 41661 bytes >=20 > Compilation complete. 0 Errors, 0 Warnings, 1 Remarks, 246 = Optimizations > [=E2=80=A6] >=20 > After changing the parameter from `NotSerialized` to `Serialized`, = the > remark is indeed gone and there is no size change. >=20 > The remark was added in ACPICA version 20130517 [1] and gives the > following explanation. >=20 > If a thread blocks within the method for any reason, and an= other thread > enters the method, the method will fail because an attempt = will be > made to create the same (named) object twice. >=20 > In this case, issue a remark that the method should be mark= ed > serialized. ACPICA BZ 909. >=20 > [1] https://github.com/acpica/acpica/commit/ba84d0fc18ba910a47a3f71= c68a43543c06e6831 >=20 > Signed-off-by: Paul Menzel >=20 > Reported-by: Marcel Apfelbaum > Signed-off-by: Michael S. Tsirkin Dumped the acpi tables and verified that is ok now. Thanks! Tested-by: Marcel Apfelbaum > --- > hw/i386/acpi-dsdt.dsl | 2 +- > hw/i386/acpi-dsdt.hex.generated | 4 ++-- > hw/i386/q35-acpi-dsdt.dsl | 2 +- > hw/i386/q35-acpi-dsdt.hex.generated | 4 ++-- > 4 files changed, 6 insertions(+), 6 deletions(-) >=20 > diff --git a/hw/i386/acpi-dsdt.dsl b/hw/i386/acpi-dsdt.dsl > index 90efce0..a377424 100644 > --- a/hw/i386/acpi-dsdt.dsl > +++ b/hw/i386/acpi-dsdt.dsl > @@ -235,7 +235,7 @@ DefinitionBlock ( > } > Return (0x0B) > } > - Method(IQCR, 1, NotSerialized) { > + Method(IQCR, 1, Serialized) { > // _CRS method - get current settings > Name(PRR0, ResourceTemplate() { > Interrupt(, Level, ActiveHigh, Shared) { 0 } > diff --git a/hw/i386/acpi-dsdt.hex.generated b/hw/i386/acpi-dsdt.hex.ge= nerated > index 2c01107..f8bd4ea 100644 > --- a/hw/i386/acpi-dsdt.hex.generated > +++ b/hw/i386/acpi-dsdt.hex.generated > @@ -8,7 +8,7 @@ static unsigned char AcpiDsdtAmlCode[] =3D { > 0x0, > 0x0, > 0x1, > -0xe0, > +0xd8, > 0x42, > 0x58, > 0x50, > @@ -3379,7 +3379,7 @@ static unsigned char AcpiDsdtAmlCode[] =3D { > 0x51, > 0x43, > 0x52, > -0x1, > +0x9, > 0x8, > 0x50, > 0x52, > diff --git a/hw/i386/q35-acpi-dsdt.dsl b/hw/i386/q35-acpi-dsdt.dsl > index 21c89b0..575c5d7 100644 > --- a/hw/i386/q35-acpi-dsdt.dsl > +++ b/hw/i386/q35-acpi-dsdt.dsl > @@ -333,7 +333,7 @@ DefinitionBlock ( > } > Return (0x0B) > } > - Method(IQCR, 1, NotSerialized) { > + Method(IQCR, 1, Serialized) { > // _CRS method - get current settings > Name(PRR0, ResourceTemplate() { > Interrupt(, Level, ActiveHigh, Shared) { 0 } > diff --git a/hw/i386/q35-acpi-dsdt.hex.generated b/hw/i386/q35-acpi-dsd= t.hex.generated > index 32c16ff..111ad3e 100644 > --- a/hw/i386/q35-acpi-dsdt.hex.generated > +++ b/hw/i386/q35-acpi-dsdt.hex.generated > @@ -8,7 +8,7 @@ static unsigned char Q35AcpiDsdtAmlCode[] =3D { > 0x0, > 0x0, > 0x1, > -0x6, > +0xfe, > 0x42, > 0x58, > 0x50, > @@ -5338,7 +5338,7 @@ static unsigned char Q35AcpiDsdtAmlCode[] =3D { > 0x51, > 0x43, > 0x52, > -0x1, > +0x9, > 0x8, > 0x50, > 0x52,