Fix CPU number calculation in EFI_ACPI_4_0_PROCESSOR_LOCAL_X2APIC_STRUCTURE.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jiewen Yao <jiewen.yao@intel.com>
This commit is contained in:
Jiewen Yao 2016-09-22 15:00:05 +08:00
parent 2d49504a94
commit a0a6a1c031
2 changed files with 3 additions and 3 deletions

View File

@ -382,7 +382,7 @@ GetCpuNumFromAcpi (
Index++;
}
} else if (LocalApic->Type == EFI_ACPI_4_0_PROCESSOR_LOCAL_X2APIC) {
if ((LocalApic->Flags & EFI_ACPI_2_0_LOCAL_APIC_ENABLED) != 0) {
if ((((EFI_ACPI_4_0_PROCESSOR_LOCAL_X2APIC_STRUCTURE *)LocalApic)->Flags & EFI_ACPI_4_0_LOCAL_APIC_ENABLED) != 0) {
Index++;
}
}

View File

@ -137,7 +137,7 @@ GetCpuNumFromAcpi (
Index++;
}
} else if (LocalApic->Type == EFI_ACPI_4_0_PROCESSOR_LOCAL_X2APIC) {
if ((LocalApic->Flags & EFI_ACPI_2_0_LOCAL_APIC_ENABLED) != 0) {
if ((((EFI_ACPI_4_0_PROCESSOR_LOCAL_X2APIC_STRUCTURE *)LocalApic)->Flags & EFI_ACPI_4_0_LOCAL_APIC_ENABLED) != 0) {
Index++;
}
}
@ -183,7 +183,7 @@ GetApicIdListFromAcpi (
Index++;
}
} else if (LocalApic->Type == EFI_ACPI_4_0_PROCESSOR_LOCAL_X2APIC) {
if ((LocalApic->Flags & EFI_ACPI_2_0_LOCAL_APIC_ENABLED) != 0) {
if ((((EFI_ACPI_4_0_PROCESSOR_LOCAL_X2APIC_STRUCTURE *)LocalApic)->Flags & EFI_ACPI_4_0_LOCAL_APIC_ENABLED) != 0) {
ApicIdList[Index] = ((EFI_ACPI_4_0_PROCESSOR_LOCAL_X2APIC_STRUCTURE *)LocalApic)->X2ApicId;
DEBUG ((EFI_D_INFO, "(FRM) ApicIdList(%d) - %08x\n", Index, ApicIdList[Index]));
Index++;