From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 1C59E80387 for ; Wed, 8 Mar 2017 16:47:53 -0800 (PST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Mar 2017 16:47:52 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,266,1486454400"; d="scan'208";a="1120248344" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by fmsmga001.fm.intel.com with ESMTP; 08 Mar 2017 16:47:52 -0800 Received: from fmsmsx125.amr.corp.intel.com (10.18.125.40) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.248.2; Wed, 8 Mar 2017 16:47:52 -0800 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by FMSMSX125.amr.corp.intel.com (10.18.125.40) with Microsoft SMTP Server (TLS) id 14.3.248.2; Wed, 8 Mar 2017 16:47:51 -0800 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.88]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.204]) with mapi id 14.03.0248.002; Thu, 9 Mar 2017 08:47:49 +0800 From: "Yao, Jiewen" To: Laszlo Ersek , edk2-devel-01 CC: Al Stone , Ard Biesheuvel , "Tian, Feng" , Igor Mammedov , "Leo Duran" , Michael Tsirkin , "Phil Dennis-Jordan" , "Zeng, Star" Thread-Topic: [PATCH v2 2/2] MdeModulePkg/AcpiTableDxe: improve FADT.{DSDT,X_DSDT} mutual exclusion Thread-Index: AQHSmEZyGHTg6hhpTUS5ttLb7/trzqGLrPaw Date: Thu, 9 Mar 2017 00:47:48 +0000 Message-ID: <74D8A39837DF1E4DA445A8C0B3885C503A8FC9A1@shsmsx102.ccr.corp.intel.com> References: <20170308195839.18689-1-lersek@redhat.com> <20170308195839.18689-3-lersek@redhat.com> In-Reply-To: <20170308195839.18689-3-lersek@redhat.com> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH v2 2/2] MdeModulePkg/AcpiTableDxe: improve FADT.{DSDT, X_DSDT} mutual exclusion X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Mar 2017 00:47:53 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: jiewen.yao@Intel.com > -----Original Message----- > From: Laszlo Ersek [mailto:lersek@redhat.com] > Sent: Thursday, March 9, 2017 3:59 AM > To: edk2-devel-01 > Cc: Al Stone ; Ard Biesheuvel ; > Tian, Feng ; Igor Mammedov ; > Yao, Jiewen ; Leo Duran ; > Michael Tsirkin ; Phil Dennis-Jordan > ; Zeng, Star > Subject: [PATCH v2 2/2] MdeModulePkg/AcpiTableDxe: improve > FADT.{DSDT,X_DSDT} mutual exclusion >=20 > The ACPI specification, up to and including revision 5.1 Errata A, allows > the DSDT and X_DSDT fields to be both set in the FADT. (Obviously, this > only makes sense if the DSDT address is representable in 4 bytes.) >=20 > Starting with 5.1 Errata B, specifically for Mantis 1393 > , the spec requires at > most one of DSDT and X_DSDT to be set to a nonzero value. >=20 > MdeModulePkg/AcpiTableDxe handles this mutual exclusion somewhat > inconsistently. >=20 > - If the caller of EFI_ACPI_TABLE_PROTOCOL.InstallAcpiTable() installs th= e > tables in "DSDT, FADT" order, then we enforce the exclusion between the > DSDT and X_DSDT fields: >=20 > DSDT under 4GB FADT.DSDT FADT.X_DSDT [VARIANT B] > -------------- --------- ----------- > yes set clear > no clear set >=20 > This behavior conforms to 5.1 Errata B. (And it's not required by > earlier versions of the spec.) >=20 > - If the caller passes in the tables in "FADT, DSDT" relative order, then > we do not enforce the exclusion: >=20 > DSDT under 4GB FADT.DSDT FADT.X_DSDT [VARIANT A] > -------------- --------- ----------- > yes set set > no clear set >=20 > This satisfies 5.1 Errata A and earlier, but breaks 5.1 Errata B and > later. >=20 > Unify the handling of both relative orders. In particular, check the majo= r > and minor version numbers in the FADT. If the FADT version is strictly > before 5.1, then implement [VARIANT A]. If the FADT version is equal to o= r > larger than 5.1, then implement [VARIANT B]. >=20 > We make three observations: >=20 > - We can't check the FADT table version precisely against "5.1 Errata B"; > erratum levels are not captured in the table. We err in the safe > direction, namely we enforce the exclusion for "5.1" and "5.1 Errata A"= . >=20 > - The same applies to "6.0" versus "6.0 Errata A". Because we cannot > distinguish these two, we consider "6.0" to be "equal to or larger than > 5.1", and apply [VARIANT B], enforcing the exclusion. >=20 > - While a blanket [VARIANT B] would be simpler, there is a significant > benefit to [VARIANT A], under the spec versions that permit it: > compatibility with a wider range of OSPMs (typically, older ones). >=20 > For example, Igor reported about a "DELL R430 system with rev4 FADT > where DSDT and X_DSDT are pointing to the same address". Michael also > reported about several systems that exhibit the same. >=20 > Regression tested with the following KVM guests (QEMU built at > ata0def594286d, "Merge remote-tracking branch > 'remotes/bonzini/tags/for-upstream' into staging", 2017-01-30): >=20 > - OVMF: boot and S3 suspend/resume > - Ia32, Q35, SMM > - Fedlet 20141209 > - Ia32X64, Q35, SMM > - Fedora 22 > - Windows 7 > - Windows 8.1 > - Windows 10 > - Windows Server 2008 R2 > - Windows Server 2012 R2 > - Windows Server 2016 Tech Preview 4 > - X64, I440FX, no SMM > - Fedora 24 > - RHEL-6.7 > - RHEL-7.2-ish > - ArmVirtQemu: boot test with virtio-gpu > - AARCH64 > - Fedora 24 > - RHELSA-7.3 > - openSUSE Tumbleweed (4.8.4-based) >=20 > This change is connected to ASWG ticket > , which is now > closed/fixed. >=20 > Cc: Al Stone > Cc: Ard Biesheuvel > Cc: Feng Tian > Cc: Igor Mammedov > Cc: Jiewen Yao > Cc: Leo Duran > Cc: Michael Tsirkin > Cc: Phil Dennis-Jordan > Cc: Star Zeng > Reported-by: Phil Dennis-Jordan > Suggested-by: Igor Mammedov > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Laszlo Ersek > Reviewed-by: Phil Dennis-Jordan > --- >=20 > Notes: > v2: > - simplify logic in RequireDsdtXDsdtExclusion() [Jiewen] > - pick up Phil's R-b nonetheless (the above change is a minimal > reformulation of code, with no behavioral difference) > - add reference to Mantis#1757 to the commit message >=20 > v1: > NOTE for people on the CC list: >=20 > If you are not presently subscribed to edk2-devel and wish to comment= on > this patch publicly, you need to subscribe first, and wait for the > subscription request to *complete* (see your inbox), *before* sending > your followup. This is not ideal, but edk2-devel requires subscriptio= n > before reflecting messages from someone. >=20 > Subscribe at . Than= ks. >=20 > MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c | 62 > +++++++++++++++++++- > 1 file changed, 59 insertions(+), 3 deletions(-) >=20 > diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c > b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c > index 7795ff7269ca..4bb848df5203 100644 > --- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c > +++ b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c > @@ -430,6 +430,51 @@ ReallocateAcpiTableBuffer ( > mEfiAcpiMaxNumTables =3D NewMaxTableNumber; > return EFI_SUCCESS; > } > + > +/** > + Determine whether the FADT table passed in as parameter requires mutua= l > + exclusion between the DSDT and X_DSDT fields. (That is, whether there > exists > + an explicit requirement that at most one of those fields is permitted = to be > + nonzero.) > + > + @param[in] Fadt The EFI_ACPI_3_0_FIXED_ACPI_DESCRIPTION_TABLE > object to > + check. > + > + @retval TRUE Fadt requires mutual exclusion between DSDT and > X_DSDT. > + @retval FALSE Otherwise. > +**/ > +BOOLEAN > +RequireDsdtXDsdtExclusion ( > + IN EFI_ACPI_3_0_FIXED_ACPI_DESCRIPTION_TABLE *Fadt > + ) > +{ > + // > + // Mantis ticket #1393 was addressed in ACPI 5.1 Errata B. Unfortunate= ly, we > + // can't tell apart 5.1 Errata A and 5.1 Errata B just from looking at= the > + // FADT table. Therefore let's require exclusion for table versions >= =3D 5.1. > + // > + // While this needlessly covers 5.1 and 5.1A too, it is safer to requi= re > + // DSDT<->X_DSDT exclusion for lax (5.1, 5.1A) versions of the spec th= an to > + // permit DSDT<->X_DSDT duplication for strict (5.1B) versions of the = spec. > + // > + // The same applies to 6.0 vs. 6.0A. While 6.0 does not require the > + // exclusion, 6.0A and 6.1 do. Since we cannot distinguish 6.0 from 6.= 0A > + // based on just the FADT, we lump 6.0 in with the rest of >=3D 5.1. > + // > + if ((Fadt->Header.Revision < 5) || > + ((Fadt->Header.Revision =3D=3D 5) && > + (((EFI_ACPI_5_1_FIXED_ACPI_DESCRIPTION_TABLE > *)Fadt)->MinorVersion =3D=3D 0))) { > + // > + // version <=3D 5.0 > + // > + return FALSE; > + } > + // > + // version >=3D 5.1 > + // > + return TRUE; > +} > + > /** > This function adds an ACPI table to the table list. It will detect FA= CS and > allocate the correct type of memory and properly align the table. > @@ -647,12 +692,16 @@ AddTableToList ( > } > if ((UINT64)(UINTN)AcpiTableInstance->Dsdt3 < BASE_4GB) { > AcpiTableInstance->Fadt3->Dsdt =3D (UINT32) (UINTN) > AcpiTableInstance->Dsdt3; > - ZeroMem (&AcpiTableInstance->Fadt3->XDsdt, sizeof (UINT64)); > + if (RequireDsdtXDsdtExclusion (AcpiTableInstance->Fadt3)) { > + Buffer64 =3D 0; > + } else { > + Buffer64 =3D AcpiTableInstance->Fadt3->Dsdt; > + } > } else { > AcpiTableInstance->Fadt3->Dsdt =3D 0; > Buffer64 =3D (UINT64) (UINTN) AcpiTableInstance->Dsdt3; > - CopyMem (&AcpiTableInstance->Fadt3->XDsdt, &Buffer64, sizeof > (UINT64)); > } > + CopyMem (&AcpiTableInstance->Fadt3->XDsdt, &Buffer64, sizeof > (UINT64)); >=20 > // > // RSDP OEM information is updated to match the FADT OEM informati= on > @@ -847,8 +896,15 @@ AddTableToList ( > if (AcpiTableInstance->Fadt3 !=3D NULL) { > if ((UINT64)(UINTN)AcpiTableInstance->Dsdt3 < BASE_4GB) { > AcpiTableInstance->Fadt3->Dsdt =3D (UINT32) (UINTN) > AcpiTableInstance->Dsdt3; > + if (RequireDsdtXDsdtExclusion (AcpiTableInstance->Fadt3)) { > + Buffer64 =3D 0; > + } else { > + Buffer64 =3D AcpiTableInstance->Fadt3->Dsdt; > + } > + } else { > + AcpiTableInstance->Fadt3->Dsdt =3D 0; > + Buffer64 =3D (UINT64) (UINTN) AcpiTableInstance->Dsdt3; > } > - Buffer64 =3D (UINT64) (UINTN) AcpiTableInstance->Dsdt3; > CopyMem (&AcpiTableInstance->Fadt3->XDsdt, &Buffer64, sizeof > (UINT64)); >=20 > // > -- > 2.9.3