From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web12.227.1588802075730001402 for ; Wed, 06 May 2020 14:54:35 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=eH4fuH3D; spf=pass (domain: intel.com, ip: 134.134.136.100, mailfrom: rangasai.v.chaganty@intel.com) IronPort-SDR: 4wOs033PKXwx0Rjjfr6U7ZPMZQ/Tg0SHK/+FG86hBzhnddhIYeh60DRCNxOW2AhlXGHn7QaWOT Wns6xBt2hFyQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 May 2020 14:54:34 -0700 IronPort-SDR: Zc50pn5uebNFdypADU2dWOtxNE991d7qUzr28xPf1ktO00ax4ucNaq3sWRH6KGiKs/ILIhjQhP fb5/tQGzL91g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,360,1583222400"; d="scan'208";a="461605270" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by fmsmga005.fm.intel.com with ESMTP; 06 May 2020 14:54:34 -0700 Received: from fmsmsx601.amr.corp.intel.com (10.18.126.81) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 6 May 2020 14:54:34 -0700 Received: from fmsmsx607.amr.corp.intel.com (10.18.126.87) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Wed, 6 May 2020 14:54:33 -0700 Received: from FMSEDG001.ED.cps.intel.com (10.1.192.133) by fmsmsx607.amr.corp.intel.com (10.18.126.87) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Wed, 6 May 2020 14:54:33 -0700 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (104.47.56.172) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 6 May 2020 14:54:33 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jivbR+lI2malkM0JrdjP9ZSkcDsGylP8ZK89kmfo2+USYj39nvUHLUcYtM/h9dF+mv9m15kFYgo9Jl5u79XsAyxlaMzOL3wlLYDI+YFurMxzHcFdeXB0gP65CfqKEU0Cst+9QJX4y+f77U8bqlSG1ZJPV7E7eyyBnlVGhf8d2l3iLHJGRfsHPs+0AJ6X8dKjaYrt7+7iDeEc7h99gnLOb4hft2SixOjRr5jveSpYC4XlzwlZxNpL+iCrIzb7/XNLeFmivHYnwWTgTT7QPuRAQFAhSWwPpOcVQJsQrQwQcB1/5ilu4nAM8fz7oYJQrEr4ODJCXNQxs6myPSPpuk0Epg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=QYZtt7jwBc9EFAPQf7mXgJp5E6tyctFQlugpqoQRGVw=; b=kua3X6pdo4AM1072LcXplWC9AZzdyoIabvAzVbueNtMRRdQKnPH9h6zNzHItn3ev9xZTgmj49D87WYnAzxTVUALFk4rGVgaWiNaTR/N/nTudzSkL5cfgsOAyjqF6TERygA90Py4xI5efk5i7UVGVEvUbocq+7WhqgsDLcarzQhXenhb211dGkg/v6dEPyayT29vRLrY6IL8cBIA6RO3zxGzwu/pec/pLIpIgmeYcBWNPdtqAdN4sSQ2xFa6l1sBiw/hEo2eQZ3LBNX/59lgAmKNeOQN3yK4t6NVpm5ICCdEpShcO32Wd602ScNVpxUtL62YOfzEbE/cmMSfchRq2fA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=QYZtt7jwBc9EFAPQf7mXgJp5E6tyctFQlugpqoQRGVw=; b=eH4fuH3DsYPKBr2mVEke+C92IEojKS1JVR1r3l4L9CQwv5Fu5SqVnVqdlOV4DwDAD9SwOfUhempXgy7hVN3CHoN/Nxa6AS8httOh2YhNwX8n8Ia3bLhUxyNB0mazEZMNKr6Z8y2jJ2vCqik9QWlc8m+KfBiBuMnyYWwqDBzNyks= Received: from MWHPR11MB1886.namprd11.prod.outlook.com (2603:10b6:300:110::9) by MWHPR11MB1566.namprd11.prod.outlook.com (2603:10b6:301:10::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.27; Wed, 6 May 2020 21:54:30 +0000 Received: from MWHPR11MB1886.namprd11.prod.outlook.com ([fe80::64d0:a918:94e9:d710]) by MWHPR11MB1886.namprd11.prod.outlook.com ([fe80::64d0:a918:94e9:d710%9]) with mapi id 15.20.2958.030; Wed, 6 May 2020 21:54:30 +0000 From: "Chaganty, Rangasai V" To: "Shindo, Miki" , "devel@edk2.groups.io" CC: "Chiu, Chasel" , "Desimone, Nathaniel L" , "Agyeman, Prince" , "Ni, Ray" Subject: Re: [edk2-platforms:PATCH v5 6/7] CoffeelakeSiliconPkg/DxeAslUpdateLib: Cleans up APIs Thread-Topic: [edk2-platforms:PATCH v5 6/7] CoffeelakeSiliconPkg/DxeAslUpdateLib: Cleans up APIs Thread-Index: AQHWI1TzDuINbZXhwUOLjuH/eUnGkKibmx8A Date: Wed, 6 May 2020 21:54:30 +0000 Message-ID: References: <20200506031650.55020-1-miki.shindo@intel.com> <20200506031650.55020-7-miki.shindo@intel.com> In-Reply-To: <20200506031650.55020-7-miki.shindo@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-reaction: no-action dlp-version: 11.2.0.6 dlp-product: dlpe-windows authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [50.45.159.74] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 301a5fa7-4b8b-4b5f-9dd3-08d7f2080ddf x-ms-traffictypediagnostic: MWHPR11MB1566: x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:8273; x-forefront-prvs: 03950F25EC x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: CjQM22zO4SHhm0uY2nXPSUslOJwxPpJBipHdxkrgje/VIgTn8Iy99yrnPDPIZKJUmiw3B1vMd2QcvBg2oJG4juCiPk10ppSTWHPVH512FPLnt/gtY5cNcvpxLnlCoR7cJI9pRXcXvSqtg4ibxINRSHTHk6L+IMzR99HAndA/bvTOAbF6k+uOzeHJcO1+BZ8PLi4i6yyG+GABJ81EMUEhSwnzhPRGfr+rFlB8PuYy/vxhszS9UNLvXolqu/pDOs/jZcbuUpcG3sMHHk9fJTdyAEsalgpaP32rSjNTXkJIN7EU8UtlR/CY9ghDLDhyeRKU0CGJFDLVjJuf41CnGb+fWMAdb/pWpGdHZTHIRcc2Qq4ejbFlsdq2AmnFHGgRPbYPFApcOqHk2v9g8CRN352E37Dk4C3RlD/EGbIQuIxn9wQyAusqTG3kQD7yUuxksfJfs68FCcVjqP+ohETWOy6nJUDjxoFTic9QxLyhP8B5A6NMA6W7CA9YZX/mUzT8aTf6jkil01EFEooogRuu0yk0Yj4mOZk9qUnLjU3qkTJnVVjv0OQbntyJ0e54U6FDuoN/qEnkJcpPbD6aGU1+EbTAyYUIn0dARvJBi2FQlK/s7GY= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR11MB1886.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(376002)(346002)(396003)(366004)(136003)(39860400002)(33430700001)(26005)(86362001)(2906002)(186003)(71200400001)(33656002)(8676002)(66476007)(52536014)(66946007)(54906003)(110136005)(316002)(6506007)(5660300002)(33440700001)(7696005)(53546011)(30864003)(478600001)(66556008)(64756008)(66446008)(107886003)(9686003)(76116006)(55016002)(966005)(4326008)(8936002)(559001)(579004);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: QyrXTE8MiWov8wVdlAMXjvQDysZkMDqinPI/NHX9uqQmFEEPvr3uDVHrLu7MiRBMZ0jy0Nsry73eMUavq7PkeIB54A9ZQPxJd0wU6iHYuGz/IOfZxo0OnusjeUEp6Jt5wBVllVdVrHJ8ZxKCzdYIf0vadfbas+KzpodCm+uLbHkpScwdya7v6r6+BXzFzn92lE0CpvsxFt4G3Foqyn2/c9Az1cziTfxH1KpNEMQKUjT+AI18/K7FUKtR9oueBZ86h9ToD5L2hzsHfhLrd9ZRfpEOrE1BOpk1o6K+fG0H3VUqN1WZKP4rwepXisHMZkz3XQ69/ndv/lDWKbFbn8prudjb15qPf8SZhW9ffFGLWRCGjZfgkK+cYee386a3D1tBV5DfbJmAWWPJ1pu/811MV8EG8HCLYJaGBbVdMzq/R7olTgOaUSZ0+yVH/4pnw9O936gqVHnTXV4E+5vljAnBY3AfLoiQgROvJG3RUc8FIRUrxU9tL7YTGofrliuySNX2aNji9JyCfXeVa0j+9XBHhywMkAUcIw6YmktyMEljs2caLa0F9QRThp2NE83OT+wn/D2x8tMqBYvQ8ZNifyhnqf5RzU0NcVDRXAl6s9t0+Ru8jZmux8fes9wfErCF65ZojQrgv3+vILzfDGgv4jlmFquhs1teg8pZgZ8feRBFz7+ijOp5g3634ese1IZNYsxZ1swq20d9Xbu3t7ogrkNuLdN/Tuga2YIoXOWU8Rgv29PsFXvf3/I2SANM1bwIw7W93+yE6WvIRdWFxtYPpej9OWMok5jrEB4JvHuo7QN0+0Y= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 301a5fa7-4b8b-4b5f-9dd3-08d7f2080ddf X-MS-Exchange-CrossTenant-originalarrivaltime: 06 May 2020 21:54:30.1274 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 3oUqdetUNLsIZxF7MfgFYMOd09sD4iwLhuE4lUTpaQsjG9Bkz1Bi7VOG8TbX+9+KFp9xFxgwCCzBfDokTWNk0YT2iVz0uIpOk8gReeUfMhA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1566 Return-Path: rangasai.v.chaganty@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Sai Chaganty -----Original Message----- From: Shindo, Miki =20 Sent: Tuesday, May 05, 2020 8:17 PM To: devel@edk2.groups.io Cc: Chaganty, Rangasai V ; Chiu, Chasel ; Desimone, Nathaniel L = ; Agyeman, Prince ; Ni, Ray Subject: [edk2-platforms:PATCH v5 6/7] CoffeelakeSiliconPkg/DxeAslUpdateLib= : Cleans up APIs REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2536 Callers of DxeAslUpdateLib don't have to call InitializeAslUpdateLib() but = the library itself runs it internally. This commit deletes the redundant ca= lls in caller side and makes it an internal call. LocateAcpiTableByOemTableId() is unreferenced externally so this commit mak= es it an internal call. PSS_PACKAGE_LAYOUT and AML_RESRC_TEMP_END_TAG are both unreferenced so they= are removed. AslUpdateLib.h is cleaned up accordingly. Signed-off-by: Miki Shindo Cc: Sai Chaganty Cc: Chasel Chiu Cc: Nate DeSimone Cc: Prince Agyeman Cc: Ray Ni Acked-by: Nate DeSimone Reviewed-by: Ray Ni Reviewed-by: Sai Chaganty Reviewed-by: Chasel Chiu --- Silicon/Intel/CoffeelakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLib= .c | 198 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++= ++++++++++++++++++++++++++++++++++-----------------------------------------= ----------------------------------------------------------------- Silicon/Intel/CoffeelakeSiliconPkg/Library/DxeAslUpdateLibNull/DxeAslUpdat= eLibNull.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++= ++++-------------------------------------- Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchAcpi.c = | 3 --- Silicon/Intel/CoffeelakeSiliconPkg/Include/Library/AslUpdateLib.h = | 120 ++++++++++++++++++++++++++++++++++++++--------------------= -------------------------------------------------------------- 4 files changed, 192 insertions(+), 229 deletions(-) diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Library/DxeAslUpdateLib/Dxe= AslUpdateLib.c b/Silicon/Intel/CoffeelakeSiliconPkg/Library/DxeAslUpdateLib= /DxeAslUpdateLib.c index 04cf66fd2f..28d20980af 100644 --- a/Silicon/Intel/CoffeelakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpda= teLib.c +++ b/Silicon/Intel/CoffeelakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslU +++ pdateLib.c @@ -6,7 +6,7 @@ =20 This library uses the ACPI Support protocol. =20 - Copyright (c) 2019 Intel Corporation. All rights reserved.
+ Copyright (c) 2019 -2020, Intel Corporation. All rights reserved.=20 +
=20 SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -30,7 +30,7 @@ static EFI_ACPI_TABLE_PROTOCOL *mAcpiTable =3D NULL; =20 /** Initialize the ASL update library state. - This must be called prior to invoking other library functions. + This must be called at the beggining of the function calls in this libra= ry. =20 @retval EFI_SUCCESS - The function completed successfully. **/ @@ -51,9 +51,65 @@ InitializeAslUpdateLib ( return Status; } =20 +/** + This function uses the ACPI SDT protocol to locate an ACPI SSDT table. + + @param[in] TableId - Pointer to an ASCII string containing the= OEM Table ID from the ACPI table header + @param[in] TableIdSize - Length of the TableId to match. Table ID= are 8 bytes long, this function + will consider it a match if the first Tab= leIdSize bytes match + @param[in, out] Table - Updated with a pointer to the table + @param[in, out] Handle - AcpiSupport protocol table handle for the= table found + + @retval EFI_SUCCESS - The function completed successfully. + @retval EFI_NOT_FOUND - Failed to locate AcpiTable. + @retval EFI_NOT_READY - Not ready to locate AcpiTable. +**/ +EFI_STATUS +LocateAcpiTableByOemTableId ( + IN UINT8 *TableId, + IN UINT8 TableIdSize, + IN OUT EFI_ACPI_DESCRIPTION_HEADER **Table, + IN OUT UINTN *Handle + ) +{ + EFI_STATUS Status; + INTN Index; + EFI_ACPI_TABLE_VERSION Version; + EFI_ACPI_DESCRIPTION_HEADER *OrgTable; + + if (mAcpiSdt =3D=3D NULL) { + InitializeAslUpdateLib (); + if (mAcpiSdt =3D=3D NULL) { + return EFI_NOT_READY; + } + } + /// + /// Locate table with matching ID + /// + Version =3D 0; + Index =3D 0; + do { + Status =3D mAcpiSdt->GetAcpiTable (Index, (EFI_ACPI_SDT_HEADER **)&Org= Table, &Version, Handle); + if (Status =3D=3D EFI_NOT_FOUND) { + break; + } + ASSERT_EFI_ERROR (Status); + Index++; + } while (CompareMem (&(OrgTable->OemTableId), TableId, TableIdSize)); + + if (Status !=3D EFI_NOT_FOUND) { + *Table =3D AllocateCopyPool (OrgTable->Length, OrgTable); + ASSERT (*Table); + } + + /// + /// If we found the table, there will be no error. + /// + return Status; +} =20 /** - This procedure will update immediate value assigned to a Name + This procedure will update immediate value assigned to a Name. =20 @param[in] AslSignature - The signature of Operation Region that we= want to update. @param[in] Buffer - source of data to be written over origina= l aml @@ -61,8 +117,10 @@ InitializeAslUpdateLib ( =20 @retval EFI_SUCCESS - The function completed successfully. @retval EFI_NOT_FOUND - Failed to locate AcpiTable. + @retval EFI_NOT_READY - Not ready to locate AcpiTable. **/ EFI_STATUS +EFIAPI UpdateNameAslCode ( IN UINT32 AslSignature, IN VOID *Buffer, @@ -155,7 +213,30 @@ UpdateNameAslCode ( } =20 /** - This procedure will update the name of ASL Method + This procedure will update immediate value assigned to a Name in SSDT ta= ble. + + @param[in] TableId - Pointer to an ASCII string containing the= OEM Table ID from the ACPI table header + @param[in] TableIdSize - Length of the TableId to match. Table ID= are 8 bytes long, this function + @param[in] Buffer - source of data to be written over origina= l aml + @param[in] Length - length of data to be overwritten + + @retval EFI_UNSUPPORTED The function is not supported in this lib= rary. +**/ +EFI_STATUS +EFIAPI +UpdateSsdtNameAslCode ( + IN UINT8 *TableId, + IN UINT8 TableIdSize, + IN UINT32 AslSignature, + IN VOID *Buffer, + IN UINTN Length + ) +{ + return EFI_UNSUPPORTED; +} + +/** + This procedure will update the name of ASL Method. =20 @param[in] AslSignature - The signature of Operation Region that we= want to update. @param[in] Buffer - source of data to be written over origina= l aml @@ -163,8 +244,10 @@ UpdateNameAslCode ( =20 @retval EFI_SUCCESS - The function completed successfully. @retval EFI_NOT_FOUND - Failed to locate AcpiTable. + @retval EFI_NOT_READY - Not ready to locate AcpiTable. **/ EFI_STATUS +EFIAPI UpdateMethodAslCode ( IN UINT32 AslSignature, IN VOID *Buffer, @@ -249,15 +332,19 @@ UpdateMethodAslCode ( This function uses the ACPI SDT protocol to locate an ACPI table. It is really only useful for finding tables that only have a single inst= ance, e.g. FADT, FACS, MADT, etc. It is not good for locating SSDT, etc. + Matches are determined by finding the table with ACPI table that has =20 + a matching signature. =20 @param[in] Signature - Pointer to an ASCII string containing t= he OEM Table ID from the ACPI table header @param[in, out] Table - Updated with a pointer to the table @param[in, out] Handle - AcpiSupport protocol table handle for t= he table found - @param[in, out] Version - The version of the table desired =20 @retval EFI_SUCCESS - The function completed successfully. + @retval EFI_NOT_FOUND - Failed to locate AcpiTable. + @retval EFI_NOT_READY - Not ready to locate AcpiTable. **/ EFI_STATUS +EFIAPI LocateAcpiTableBySignature ( IN UINT32 Signature, IN OUT EFI_ACPI_DESCRIPTION_HEADER **Table, @@ -300,104 +387,3 @@ LocateAcpiTableBySignature ( /// return Status; } - -/** - This function uses the ACPI SDT protocol to locate an ACPI SSDT table. - - @param[in] TableId - Pointer to an ASCII string containing the= OEM Table ID from the ACPI table header - @param[in] TableIdSize - Length of the TableId to match. Table ID= are 8 bytes long, this function - will consider it a match if the first Tab= leIdSize bytes match - @param[in, out] Table - Updated with a pointer to the table - @param[in, out] Handle - AcpiSupport protocol table handle for the= table found - @param[in, out] Version - See AcpiSupport protocol, GetAcpiTable fu= nction for use - - @retval EFI_SUCCESS - The function completed successfully. -**/ -EFI_STATUS -LocateAcpiTableByOemTableId ( - IN UINT8 *TableId, - IN UINT8 TableIdSize, - IN OUT EFI_ACPI_DESCRIPTION_HEADER **Table, - IN OUT UINTN *Handle - ) -{ - EFI_STATUS Status; - INTN Index; - EFI_ACPI_TABLE_VERSION Version; - EFI_ACPI_DESCRIPTION_HEADER *OrgTable; - - if (mAcpiSdt =3D=3D NULL) { - InitializeAslUpdateLib (); - if (mAcpiSdt =3D=3D NULL) { - return EFI_NOT_READY; - } - } - /// - /// Locate table with matching ID - /// - Version =3D 0; - Index =3D 0; - do { - Status =3D mAcpiSdt->GetAcpiTable (Index, (EFI_ACPI_SDT_HEADER **)&Org= Table, &Version, Handle); - if (Status =3D=3D EFI_NOT_FOUND) { - break; - } - ASSERT_EFI_ERROR (Status); - Index++; - } while (CompareMem (&(OrgTable->OemTableId), TableId, TableIdSize)); - - if (Status !=3D EFI_NOT_FOUND) { - *Table =3D AllocateCopyPool (OrgTable->Length, OrgTable); - ASSERT (*Table); - } - - /// - /// If we found the table, there will be no error. - /// - return Status; -} - -/** - This function calculates and updates an UINT8 checksum. - - @param[in] Buffer Pointer to buffer to checksum - @param[in] Size Number of bytes to checksum - @param[in] ChecksumOffset Offset to place the checksum result in - - @retval EFI_SUCCESS The function completed successfully. -**/ -EFI_STATUS -AcpiChecksum ( - IN VOID *Buffer, - IN UINTN Size, - IN UINTN ChecksumOffset - ) -{ - UINT8 Sum; - UINT8 *Ptr; - - Sum =3D 0; - /// - /// Initialize pointer - /// - Ptr =3D Buffer; - - /// - /// set checksum to 0 first - /// - Ptr[ChecksumOffset] =3D 0; - - /// - /// add all content of buffer - /// - while (Size--) { - Sum =3D (UINT8) (Sum + (*Ptr++)); - } - /// - /// set checksum - /// - Ptr =3D Buffer; - Ptr[ChecksumOffset] =3D (UINT8) (0xff - Sum + 1); - - return EFI_SUCCESS; -} diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Library/DxeAslUpdateLibNull= /DxeAslUpdateLibNull.c b/Silicon/Intel/CoffeelakeSiliconPkg/Library/DxeAslU= pdateLibNull/DxeAslUpdateLibNull.c index a7ce92b7c3..f143af981d 100644 --- a/Silicon/Intel/CoffeelakeSiliconPkg/Library/DxeAslUpdateLibNull/DxeAsl= UpdateLibNull.c +++ b/Silicon/Intel/CoffeelakeSiliconPkg/Library/DxeAslUpdateLibNull/Dxe +++ AslUpdateLibNull.c @@ -6,7 +6,7 @@ =20 This library uses the ACPI Support protocol. =20 - Copyright (c) 2019 Intel Corporation. All rights reserved.
+ Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved.=20 +
=20 SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -28,7 +28,7 @@ =20 /** Initialize the ASL update library state. - This must be called prior to invoking other library functions. + This must be called at the beggining of the function calls in this libra= ry. =20 @retval EFI_SUCCESS - The function completed successfully. **/ @@ -40,9 +40,30 @@ InitializeAslUpdateLib ( return EFI_SUCCESS; } =20 +/** + This function uses the ACPI SDT protocol to locate an ACPI SSDT table. + + @param[in] TableId - Pointer to an ASCII string containing the= OEM Table ID from the ACPI table header + @param[in] TableIdSize - Length of the TableId to match. Table ID= are 8 bytes long, this function + will consider it a match if the first Tab= leIdSize bytes match + @param[in, out] Table - Updated with a pointer to the table + @param[in, out] Handle - AcpiSupport protocol table handle for the= table found + + @retval EFI_SUCCESS - The function completed successfully. +**/ +EFI_STATUS +LocateAcpiTableByOemTableId ( + IN UINT8 *TableId, + IN UINT8 TableIdSize, + IN OUT EFI_ACPI_DESCRIPTION_HEADER **Table, + IN OUT UINTN *Handle + ) +{ + return EFI_SUCCESS; +} =20 /** - This procedure will update immediate value assigned to a Name + This procedure will update immediate value assigned to a Name. =20 @param[in] AslSignature - The signature of Operation Region that we= want to update. @param[in] Buffer - source of data to be written over origina= l aml @@ -51,6 +72,7 @@ InitializeAslUpdateLib ( @retval EFI_SUCCESS - The function completed successfully. **/ EFI_STATUS +EFIAPI UpdateNameAslCode ( IN UINT32 AslSignature, IN VOID *Buffer, @@ -60,66 +82,68 @@ UpdateNameAslCode ( return EFI_SUCCESS; } =20 - /** - This function uses the ACPI SDT protocol to locate an ACPI table. - It is really only useful for finding tables that only have a single inst= ance, - e.g. FADT, FACS, MADT, etc. It is not good for locating SSDT, etc. + This procedure will update immediate value assigned to a Name in SSDT ta= ble. =20 - @param[in] Signature - Pointer to an ASCII string containing t= he OEM Table ID from the ACPI table header - @param[in, out] Table - Updated with a pointer to the table - @param[in, out] Handle - AcpiSupport protocol table handle for t= he table found - @param[in, out] Version - The version of the table desired + @param[in] TableId - Pointer to an ASCII string containing the= OEM Table ID from the ACPI table header + @param[in] TableIdSize - Length of the TableId to match. Table ID= are 8 bytes long, this function + @param[in] Buffer - source of data to be written over origina= l aml + @param[in] Length - length of data to be overwritten =20 - @retval EFI_SUCCESS - The function completed successfully. + @retval EFI_SUCCESS - The function completed successfully. **/ EFI_STATUS -LocateAcpiTableBySignature ( - IN UINT32 Signature, - IN OUT EFI_ACPI_DESCRIPTION_HEADER **Table, - IN OUT UINTN *Handle +EFIAPI +UpdateSsdtNameAslCode ( + IN UINT8 *TableId, + IN UINT8 TableIdSize, + IN UINT32 AslSignature, + IN VOID *Buffer, + IN UINTN Length ) { return EFI_SUCCESS; } =20 /** - This function uses the ACPI SDT protocol to locate an ACPI SSDT table. + This procedure will update the name of ASL Method. =20 - @param[in] TableId - Pointer to an ASCII string containing the= OEM Table ID from the ACPI table header - @param[in] TableIdSize - Length of the TableId to match. Table ID= are 8 bytes long, this function - will consider it a match if the first Tab= leIdSize bytes match - @param[in, out] Table - Updated with a pointer to the table - @param[in, out] Handle - AcpiSupport protocol table handle for the= table found - @param[in, out] Version - See AcpiSupport protocol, GetAcpiTable fu= nction for use + @param[in] AslSignature - The signature of Operation Region that we= want to update. + @param[in] Buffer - source of data to be written over origina= l aml + @param[in] Length - length of data to be overwritten =20 @retval EFI_SUCCESS - The function completed successfully. **/ EFI_STATUS -LocateAcpiTableByOemTableId ( - IN UINT8 *TableId, - IN UINT8 TableIdSize, - IN OUT EFI_ACPI_DESCRIPTION_HEADER **Table, - IN OUT UINTN *Handle +EFIAPI +UpdateMethodAslCode ( + IN UINT32 AslSignature, + IN VOID *Buffer, + IN UINTN Length ) { return EFI_SUCCESS; } =20 /** - This function calculates and updates an UINT8 checksum. - - @param[in] Buffer Pointer to buffer to checksum - @param[in] Size Number of bytes to checksum - @param[in] ChecksumOffset Offset to place the checksum result in + This function uses the ACPI SDT protocol to locate an ACPI table. + It is really only useful for finding tables that only have a single=20 + instance, e.g. FADT, FACS, MADT, etc. It is not good for locating SSDT,= etc. + Matches are determined by finding the table with ACPI table that has =20 + a matching signature. =20 - @retval EFI_SUCCESS The function completed successfully. + @param[in] Signature - Pointer to an ASCII string containing t= he OEM Table ID from the ACPI table header + @param[in, out] Table - Updated with a pointer to the table + @param[in, out] Handle - AcpiSupport protocol table handle for t= he table found +s + @retval EFI_SUCCESS - The function completed successfully. **/ EFI_STATUS -AcpiChecksum ( - IN VOID *Buffer, - IN UINTN Size, - IN UINTN ChecksumOffset +EFIAPI +LocateAcpiTableBySignature ( + IN UINT32 Signature, + IN OUT EFI_ACPI_DESCRIPTION_HEADER **Table, + IN OUT UINTN *Handle ) { return EFI_SUCCESS; diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchAcpi.c b= /Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchAcpi.c index 12f1a7f4fe..807cdb92f7 100644 --- a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchAcpi.c +++ b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchAcpi.c @@ -438,9 +438,6 @@ PatchPchNvsAreaAddress ( UINT32 Address; UINT16 Length; =20 - Status =3D InitializeAslUpdateLib (); - ASSERT_EFI_ERROR (Status); - Address =3D (UINT32) (UINTN) mPchNvsAreaProtocol.Area; Length =3D (UINT16) sizeof (PCH_NVS_AREA); DEBUG ((DEBUG_INFO, "PatchPchNvsAreaAddress: PCH NVS Address %x Length %= x\n", Address, Length)); diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/In= clude/Library/AslUpdateLib.h b/Silicon/Intel/CoffeelakeSiliconPkg/Include/L= ibrary/AslUpdateLib.h index 39baa6c03a..be53c44b6c 100644 --- a/Silicon/Intel/CoffeelakeSiliconPkg/Include/Library/AslUpdateLib.h +++ b/Silicon/Intel/CoffeelakeSiliconPkg/Include/Library/AslUpdateLib.h @@ -5,7 +5,7 @@ Make sure you meet the requirements for the library (protocol dependenci= es, use restrictions, etc). =20 - Copyright (c) 2019 Intel Corporation. All rights reserved.
+ Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved.=20 +
=20 SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -16,68 +16,57 @@ /= / // Include files // +#include #include #include #include =20 -// -// AML parsing definitions -// -#define AML_RESRC_TEMP_END_TAG 0x0079 - -// -// ASL PSS package structure layout -// -#pragma pack (1) -typedef struct { - UINT8 NameOp; // 12h ;First opcode is a NameOp. - UINT8 PackageLead; // 20h ;First opcode is a NameOp. - UINT8 NumEntries; // 06h ;First opcode is a NameOp. - UINT8 DwordPrefix1; // 0Ch - UINT32 CoreFrequency; // 00h - UINT8 DwordPrefix2; // 0Ch - UINT32 Power; // 00h - UINT8 DwordPrefix3; // 0Ch - UINT32 TransLatency; // 00h - UINT8 DwordPrefix4; // 0Ch - UINT32 BmLatency; // 00h - UINT8 DwordPrefix5; // 0Ch - UINT32 Control; // 00h - UINT8 DwordPrefix6; // 0Ch - UINT32 Status; // 00h -} PSS_PACKAGE_LAYOUT; -#pragma pack() - /** - Initialize the ASL update library state. - This must be called prior to invoking other library functions. + This procedure will update immediate value assigned to a Name. =20 + @param[in] AslSignature The signature of Operation Region = that we want to update. + @param[in] Buffer source of data to be written over = original aml + @param[in] Length length of data to be overwritten =20 @retval EFI_SUCCESS The function completed successfull= y. + @retval EFI_NOT_FOUND Failed to locate AcpiTable. + @retval EFI_NOT_READY Not ready to locate AcpiTable. + @retval EFI_UNSUPPORTED The function is not supported in t= his library. **/ EFI_STATUS -InitializeAslUpdateLib ( - VOID +EFIAPI +UpdateNameAslCode( + IN UINT32 AslSignature, + IN VOID *Buffer, + IN UINTN Length ); =20 /** - This procedure will update immediate value assigned to a Name + This procedure will update immediate value assigned to a Name in SSDT ta= ble. =20 - @param[in] AslSignature The signature of Operation Region = that we want to update. - @param[in] Buffer source of data to be written over = original aml - @param[in] Length length of data to be overwritten + @param[in] TableId - Pointer to an ASCII string containing the= OEM Table ID from the ACPI table header + @param[in] TableIdSize - Length of the TableId to match. Table ID= are 8 bytes long, this function + @param[in] AslSignature - The signature of Operation Region that we= want to update. + @param[in] Buffer - source of data to be written over origina= l aml + @param[in] Length - length of data to be overwritten =20 - @retval EFI_SUCCESS The function completed successfull= y. + @retval EFI_SUCCESS - The function completed successfully. + @retval EFI_NOT_FOUND - Failed to locate AcpiTable. + @retval EFI_NOT_READY - Not ready to locate AcpiTable. + @retval EFI_UNSUPPORTED - The function is not supported in this lib= rary. **/ EFI_STATUS -UpdateNameAslCode( +EFIAPI +UpdateSsdtNameAslCode ( + IN UINT8 *TableId, + IN UINT8 TableIdSize, IN UINT32 AslSignature, IN VOID *Buffer, IN UINTN Length ); =20 /** - This procedure will update the name of ASL Method + This procedure will update the name of ASL Method. =20 @param[in] AslSignature - The signature of Operation Region that we= want to update. @param[in] Buffer - source of data to be written over origina= l aml @@ -85,8 +74,11 @@ UpdateNameAslCode( =20 @retval EFI_SUCCESS - The function completed successfully. @retval EFI_NOT_FOUND - Failed to locate AcpiTable. + @retval EFI_NOT_READY - Not ready to locate AcpiTable. + @retval EFI_UNSUPPORTED - The function is not supported in this lib= rary. **/ EFI_STATUS +EFIAPI UpdateMethodAslCode ( IN UINT32 AslSignature, IN VOID *Buffer, @@ -94,64 +86,28 @@ UpdateMethodAslCode ( ); =20 /** - This function uses the ACPI support protocol to locate an ACPI table usi= ng the . + This function uses the ACPI support protocol to locate an ACPI table. It is really only useful for finding tables that only have a single inst= ance, e.g. FADT, FACS, MADT, etc. It is not good for locating SSDT, etc. Matches are determined by finding the table with ACPI table that has - a matching signature and version. + a matching signature. =20 @param[in] Signature Pointer to an ASCII string contain= ing the Signature to match @param[in, out] Table Updated with a pointer to the tabl= e @param[in, out] Handle AcpiSupport protocol table handle = for the table found - @param[in, out] Version On input, the version of the table= desired, - on output, the versions the table = belongs to @see AcpiSupport protocol for deta= ils =20 @retval EFI_SUCCESS The function completed successfull= y. + @retval EFI_NOT_FOUND Failed to locate AcpiTable. + @retval EFI_NOT_READY Not ready to locate AcpiTable. + @retval EFI_UNSUPPORTED The function is not supported in t= his library. **/ EFI_STATUS +EFIAPI LocateAcpiTableBySignature ( IN UINT32 Signature, IN OUT EFI_ACPI_DESCRIPTION_HEADER **Table, IN OUT UINTN *Handle ); =20 -/** - This function uses the ACPI support protocol to locate an ACPI SSDT tabl= e. - The table is located by searching for a matching OEM Table ID field. - Partial match searches are supported via the TableIdSize parameter. - - @param[in] TableId Pointer to an ASCII string contain= ing the OEM Table ID from the ACPI table header - @param[in] TableIdSize Length of the TableId to match. T= able ID are 8 bytes long, this function - will consider it a match if the fi= rst TableIdSize bytes match - @param[in, out] Table Updated with a pointer to the tabl= e - @param[in, out] Handle AcpiSupport protocol table handle = for the table found - @param[in, out] Version See AcpiSupport protocol, GetAcpiT= able function for use - - @retval EFI_SUCCESS The function completed successfull= y. -**/ -EFI_STATUS -LocateAcpiTableByOemTableId ( - IN UINT8 *TableId, - IN UINT8 TableIdSize, - IN OUT EFI_ACPI_DESCRIPTION_HEADER **Table, - IN OUT UINTN *Handle - ); - -/** - This function calculates and updates an UINT8 checksum. - - @param[in] Buffer Pointer to buffer to checksum - @param[in] Size Number of bytes to checksum - @param[in] ChecksumOffset Offset to place the checksum resul= t in - - @retval EFI_SUCCESS The function completed successfull= y. -**/ -EFI_STATUS -AcpiChecksum ( - IN VOID *Buffer, - IN UINTN Size, - IN UINTN ChecksumOffset - ); - #endif -- 2.16.2.windows.1