From nobody Sat May 18 18:13:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+103681+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+103681+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1682559080; cv=none; d=zohomail.com; s=zohoarc; b=lFM1zd0EsKs5BZTjUAFEQVngV9ZyWWc0jZltTP6XqU3Os9ZUzVta7Yt/Q35vWoQqm5Hp4bE/XF3FRLH7Ig+kIT5DJ+ZBkSSawcxY9Xb/C9S5q7q4jlTaZURXF4jPk+nqg2E+DU3S8T27AWdnBbdq5dPMSPy51chfvO4/owL6bTs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682559080; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=OdHUQfFaQceJf2jzBuanr1NjpdN0PqqNyU+6VR5mEy8=; b=D6mlEYY6690G174b6kKLuo/k3/kMg+GsFR/4qATr6cVyuNMIgTAlvSAvpCquXTUtAmdjjF/A9JqKqIm87mL9rM5WvujtFQJQJf0bXEgFKw7qwPLmN2h4Kodt/pAuBv7veL3NtT51dAsKebzsqzzvA123C8yJ/DZmaa7I9Yn/TQ8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+103681+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1682559080915786.0802808156794; Wed, 26 Apr 2023 18:31:20 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id N3yhYY1788612xFWc8HzBbfL; Wed, 26 Apr 2023 18:31:20 -0700 X-Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mx.groups.io with SMTP id smtpd.web11.10409.1682559079673689770 for ; Wed, 26 Apr 2023 18:31:19 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10692"; a="344734581" X-IronPort-AV: E=Sophos;i="5.99,229,1677571200"; d="scan'208";a="344734581" X-Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Apr 2023 18:31:10 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10692"; a="838167341" X-IronPort-AV: E=Sophos;i="5.99,229,1677571200"; d="scan'208";a="838167341" X-Received: from kxinfux-desk.gar.corp.intel.com ([10.227.107.32]) by fmsmga001.fm.intel.com with ESMTP; 26 Apr 2023 18:31:09 -0700 From: "VincentX Ke" To: devel@edk2.groups.io Cc: VincentX Ke Subject: [edk2-devel] [PATCH v1] MinPlatformPkg: Update HWSignature filed in FADT Date: Thu, 27 Apr 2023 09:31:06 +0800 Message-Id: <20230427013106.563-1-vincentx.ke@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,vincentx.ke@intel.com X-Gm-Message-State: GOcxSifH5I1NGvroGKjVvBafx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1682559080; bh=zjD1pnnOO6WZmA6WZwljj5sOXaFchjPBOKSzLZPBdqw=; h=Cc:Date:From:Reply-To:Subject:To; b=k4sN0wOaBKyylIcurspqYV09iUG81Rjb1nofe9x0/eQiP/PMl6f0t6E+6skE6XtH/PH X2Up5wLhAw9rpHmT3IJKT1raubQFO2UP518jfYcVU6VnnYngsKTy5CLv2+uttz2vQuZAz 6SfrogpOoIeu+IJr6cn9/2CpRQzQKcZlGW8= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1682559081282100001 Content-Type: text/plain; charset="utf-8" From: VincentX Ke REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4428 Calculating CRC based on checksum from all ACPI tables. Update HWSignature filed in FADT based on CRC while ACPI table changed. Signed-off-by: VincentX Ke --- Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c | 110 +++++= ++++++++++++++- Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf | 1 + 2 files changed, 110 insertions(+), 1 deletion(-) diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c b= /Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c index e967031a3b..bfc3cd0b33 100644 --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c @@ -1285,6 +1285,108 @@ IsHardwareChange ( FreePool (HWChange); } =20 +/** + This function calculates RCR based on Checksum from ACPI tables. + It also calculates CRC and provides as HWSignature filed in FADT table. +**/ +VOID +IsAcpiTableChange ( + VOID + ) +{ + EFI_STATUS Status; + UINTN Index; + UINTN AcpiTableCount; + UINT32 Table; + UINT32 CRC; + UINT32 *AcpiTable; + EFI_ACPI_6_5_ROOT_SYSTEM_DESCRIPTION_POINTER *Rsdp; + EFI_ACPI_DESCRIPTION_HEADER *Rsdt; + EFI_ACPI_DESCRIPTION_HEADER *Xsdt; + EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE *FacsPtr; + EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE *pFADT; + + AcpiTableCount =3D 0; + AcpiTable =3D NULL; + Rsdp =3D NULL; + Rsdt =3D NULL; + Xsdt =3D NULL; + FacsPtr =3D NULL; + pFADT =3D NULL; + + DEBUG ((DEBUG_INFO, "%a() - Start\n", __FUNCTION__)); + + Status =3D EfiGetSystemConfigurationTable (&gEfiAcpiTableGuid, (VOID **)= &Rsdp); + if (EFI_ERROR (Status) || (Rsdp =3D=3D NULL)) { + return; + } + + // + // Count ACPI table start with 2 since RSDT and XSDT already be found. + // Then add ACPI tables found by XSDT and FADT. + // + Rsdt =3D (EFI_ACPI_DESCRIPTION_HEADER *)(UINTN)Rsdp->RsdtAddre= ss; + Xsdt =3D (EFI_ACPI_DESCRIPTION_HEADER *)(UINTN)Rsdp->XsdtAddre= ss; + AcpiTableCount =3D AcpiTableCount + 2; + AcpiTableCount =3D AcpiTableCount + (Xsdt->Length - sizeof (EFI_ACPI_DES= CRIPTION_HEADER))/sizeof (UINT64); + + for (Index =3D sizeof (EFI_ACPI_DESCRIPTION_HEADER); Index < (Xsdt->Leng= th); Index =3D Index + sizeof (UINT64)) { + Table =3D *((UINT32 *)((UINT8 *)Xsdt + Index)); + if (((EFI_ACPI_DESCRIPTION_HEADER *)(UINTN)Table)->Signature =3D=3D EF= I_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE) { + pFADT =3D (EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE *)(UINTN)Table; + if ((pFADT->XDsdt !=3D 0) || (pFADT->Dsdt !=3D 0)) { + AcpiTableCount =3D AcpiTableCount + 1; + } + } + } + + // + // Allocate memory for founded ACPI tables and add additional entries + // + AcpiTable =3D AllocateZeroPool (sizeof (UINT32) * AcpiTableCount); + if (AcpiTable =3D=3D NULL) { + return; + } + + AcpiTableCount =3D 0; + AcpiTable[AcpiTableCount++] =3D Rsdt->Checksum; + AcpiTable[AcpiTableCount++] =3D Xsdt->Checksum; + + for (Index =3D sizeof (EFI_ACPI_DESCRIPTION_HEADER); Index < (Xsdt->Leng= th); Index =3D Index + sizeof (UINT64)) { + Table =3D *((UINT32 *)((UINT8 *)Xsdt + Index)); + AcpiTable[AcpiTableCount++] =3D ((EFI_ACPI_DESCRIPTION_HEADER *)(UINTN= )Table)->Checksum; + if (((EFI_ACPI_DESCRIPTION_HEADER *)(UINTN)Table)->Signature =3D=3D EF= I_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE) { + pFADT =3D (EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE *)(UINTN)Table; + if (pFADT->XDsdt !=3D 0) { + AcpiTable[AcpiTableCount++] =3D ((EFI_ACPI_DESCRIPTION_HEADER *)(U= INTN)pFADT->XDsdt)->Checksum; + } else { + AcpiTable[AcpiTableCount++] =3D ((EFI_ACPI_DESCRIPTION_HEADER *)(U= INTN)pFADT->Dsdt)->Checksum; + } + } + } + + // + // pFADT table not found + // + if (pFADT =3D=3D NULL) { + return; + } + + // + // Calculate CRC value with HWChange data. + // + Status =3D gBS->CalculateCrc32 (AcpiTable, AcpiTableCount, &CRC); + DEBUG ((DEBUG_INFO, "CRC =3D %x and Status =3D %r\n", CRC, Status)); + + // + // Set HardwareSignature value based on CRC value. + // + FacsPtr =3D (EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUC= TURE *)(UINTN)pFADT->FirmwareCtrl; + FacsPtr->HardwareSignature =3D CRC; + FreePool (AcpiTable); + DEBUG ((DEBUG_INFO, "%a() - End\n", __FUNCTION__)); +} + VOID UpdateLocalTable ( VOID @@ -1329,7 +1431,13 @@ AcpiEndOfDxeEvent ( // // Calculate Hardware Signature value based on current platform configur= ations // - IsHardwareChange (); + if ((PcdGet8 (PcdFadtMajorVersion) <=3D EFI_ACPI_6_3_FIXED_ACPI_DESCRIPT= ION_TABLE_REVISION) && + (PcdGet8 (PcdFadtMinorVersion) <=3D EFI_ACPI_6_3_FIXED_ACPI_DESCRIPT= ION_TABLE_MINOR_REVISION)) + { + IsHardwareChange (); + } else { + IsAcpiTableChange (); + } } =20 /** diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf= b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf index 694492112b..f47cc3908d 100644 --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf @@ -128,6 +128,7 @@ gEfiGlobalVariableGuid ## CONSUMES gEfiHobListGuid ## CONSUMES gEfiEndOfDxeEventGroupGuid ## CONSUMES + gEfiAcpiTableGuid ## CONSUMES =20 [Depex] gEfiAcpiTableProtocolGuid AND --=20 2.39.2.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#103681): https://edk2.groups.io/g/devel/message/103681 Mute This Topic: https://groups.io/mt/98528732/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-