Check SCI status too early will cause the below error message will be printed out always: ERROR: The ACPI enabling status is inconsistent: SCI is not enabled but the ACPI table does not provide a means to enable it through FADT->SmiCmd. This may cause issues in OS. SCI will be set in BDS. So check the SCI in UPL is too early. Remove the SCI status check code from UPL. Gang Chen (1): UefiPayloadPkg/UefiPayloadEntry: Remove SCI enabling check UefiPayloadPkg/UefiPayloadEntry/AcpiTable.c | 38 --------------------- 1 file changed, 38 deletions(-) -- 2.40.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#113364): https://edk2.groups.io/g/devel/message/113364 Mute This Topic: https://groups.io/mt/103593435/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=-=-=-=-=-=-=-=-=-=-=- Check SCI status too early will cause the below error message will be printed out always: ERROR: The ACPI enabling status is inconsistent: SCI is not enabled but the ACPI table does not provide a means to enable it through FADT->SmiCmd. This may cause issues in OS. SCI will be set in BDS. So check the SCI in UPL is too early. Remove the SCI status check code from UPL. Gang Chen (1): UefiPayloadPkg/UefiPayloadEntry: Remove SCI enabling check UefiPayloadPkg/UefiPayloadEntry/AcpiTable.c | 38 --------------------- 1 file changed, 38 deletions(-) -- 2.40.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#113362): https://edk2.groups.io/g/devel/message/113362 Mute This Topic: https://groups.io/mt/103593435/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=-=-=-=-=-=-=-=-=-=-=- It's too early to check the SCI enable status, which is set in the BDS phase ususally. Remove the check from UPL. Signed-off-by: Gang Chen <gang.c.chen@intel.com> Cc: Gua Guo <gua.guo@intel.com> Cc: Guo Dong <guo.dong@intel.com> Cc: James Lu <james.lu@intel.com> Cc: Sean Rhodes <sean@starlabs.systems> --- UefiPayloadPkg/UefiPayloadEntry/AcpiTable.c | 38 --------------------- 1 file changed, 38 deletions(-) diff --git a/UefiPayloadPkg/UefiPayloadEntry/AcpiTable.c b/UefiPayloadPkg/UefiPayloadEntry/AcpiTable.c index XXXXXXX..XXXXXXX 100644 --- a/UefiPayloadPkg/UefiPayloadEntry/AcpiTable.c +++ b/UefiPayloadPkg/UefiPayloadEntry/AcpiTable.c @@ -XXX,XX +XXX,XX @@ Done: ASSERT (Fadt->Pm1aEvtBlk != 0); ASSERT (Fadt->Gpe0Blk != 0); - DEBUG_CODE_BEGIN (); - BOOLEAN SciEnabled; - - // - // Check the consistency of SCI enabling - // - - // - // Get SCI_EN value - // - if (Fadt->Pm1CntLen == 4) { - SciEnabled = (IoRead32 (Fadt->Pm1aCntBlk) & BIT0) ? TRUE : FALSE; - } else { - // - // if (Pm1CntLen == 2), use 16 bit IO read; - // if (Pm1CntLen != 2 && Pm1CntLen != 4), use 16 bit IO read as a fallback - // - SciEnabled = (IoRead16 (Fadt->Pm1aCntBlk) & BIT0) ? TRUE : FALSE; - } - - if (!(Fadt->Flags & EFI_ACPI_5_0_HW_REDUCED_ACPI) && - (Fadt->SmiCmd == 0) && - !SciEnabled) - { - // - // The ACPI enabling status is inconsistent: SCI is not enabled but ACPI - // table does not provide a means to enable it through FADT->SmiCmd - // - DEBUG (( - DEBUG_ERROR, - "ERROR: The ACPI enabling status is inconsistent: SCI is not" - " enabled but the ACPI table does not provide a means to enable it through FADT->SmiCmd." - " This may cause issues in OS.\n" - )); - } - - DEBUG_CODE_END (); - return RETURN_SUCCESS; } -- 2.40.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#113365): https://edk2.groups.io/g/devel/message/113365 Mute This Topic: https://groups.io/mt/103593439/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=-=-=-=-=-=-=-=-=-=-=- It's too early to check the SCI enable status, which is set in the BDS phase ususally. Remove the check from UPL. Signed-off-by: Gang Chen <gang.c.chen@intel.com> Cc: Gua Guo <gua.guo@intel.com> Cc: Guo Dong <guo.dong@intel.com> Cc: James Lu <james.lu@intel.com> Cc: Sean Rhodes <sean@starlabs.systems> --- UefiPayloadPkg/UefiPayloadEntry/AcpiTable.c | 38 --------------------- 1 file changed, 38 deletions(-) diff --git a/UefiPayloadPkg/UefiPayloadEntry/AcpiTable.c b/UefiPayloadPkg/UefiPayloadEntry/AcpiTable.c index XXXXXXX..XXXXXXX 100644 --- a/UefiPayloadPkg/UefiPayloadEntry/AcpiTable.c +++ b/UefiPayloadPkg/UefiPayloadEntry/AcpiTable.c @@ -XXX,XX +XXX,XX @@ Done: ASSERT (Fadt->Pm1aEvtBlk != 0); ASSERT (Fadt->Gpe0Blk != 0); - DEBUG_CODE_BEGIN (); - BOOLEAN SciEnabled; - - // - // Check the consistency of SCI enabling - // - - // - // Get SCI_EN value - // - if (Fadt->Pm1CntLen == 4) { - SciEnabled = (IoRead32 (Fadt->Pm1aCntBlk) & BIT0) ? TRUE : FALSE; - } else { - // - // if (Pm1CntLen == 2), use 16 bit IO read; - // if (Pm1CntLen != 2 && Pm1CntLen != 4), use 16 bit IO read as a fallback - // - SciEnabled = (IoRead16 (Fadt->Pm1aCntBlk) & BIT0) ? TRUE : FALSE; - } - - if (!(Fadt->Flags & EFI_ACPI_5_0_HW_REDUCED_ACPI) && - (Fadt->SmiCmd == 0) && - !SciEnabled) - { - // - // The ACPI enabling status is inconsistent: SCI is not enabled but ACPI - // table does not provide a means to enable it through FADT->SmiCmd - // - DEBUG (( - DEBUG_ERROR, - "ERROR: The ACPI enabling status is inconsistent: SCI is not" - " enabled but the ACPI table does not provide a means to enable it through FADT->SmiCmd." - " This may cause issues in OS.\n" - )); - } - - DEBUG_CODE_END (); - return RETURN_SUCCESS; } -- 2.40.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#113363): https://edk2.groups.io/g/devel/message/113363 Mute This Topic: https://groups.io/mt/103593438/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=-=-=-=-=-=-=-=-=-=-=-