/** @file\r
\r
-Copyright (c) 2006, Intel Corporation \r
+Copyright (c) 2006 - 2010, Intel Corporation \r
All rights reserved. This program and the accompanying materials \r
are licensed and made available under the terms and conditions of the BSD License \r
which accompanies this distribution. The full text of the license may be found at \r
#include "HobGeneration.h"\r
#include "Debug.h"\r
\r
-#define ACPI_RSD_PTR 0x2052545020445352LL\r
#define MPS_PTR SIGNATURE_32('_','M','P','_')\r
#define SMBIOS_PTR SIGNATURE_32('_','S','M','_')\r
\r
// First Seach 0x0e0000 - 0x0fffff for RSD Ptr\r
//\r
for (Address = 0xe0000; Address < 0xfffff; Address += 0x10) {\r
- if (*(UINT64 *)(Address) == ACPI_RSD_PTR) {\r
+ if (*(UINT64 *)(Address) == EFI_ACPI_3_0_ROOT_SYSTEM_DESCRIPTION_POINTER_SIGNATURE) {\r
return (VOID *)Address;\r
}\r
}\r
\r
Address = (*(UINT16 *)(UINTN)(EBDA_BASE_ADDRESS)) << 4;\r
for (Index = 0; Index < 0x400 ; Index += 16) {\r
- if (*(UINT64 *)(Address + Index) == ACPI_RSD_PTR) {\r
+ if (*(UINT64 *)(Address + Index) == EFI_ACPI_3_0_ROOT_SYSTEM_DESCRIPTION_POINTER_SIGNATURE) {\r
return (VOID *)Address;\r
}\r
}\r
}\r
\r
#pragma pack(1)\r
-typedef struct {\r
- UINT8 Signature[8];\r
- UINT8 Checksum;\r
- UINT8 OemId[6];\r
- UINT8 Revision;\r
- UINT32 RsdtAddress;\r
- UINT32 Length;\r
- UINT64 XsdtAddress;\r
- UINT8 ExtendedChecksum;\r
- UINT8 Reserved[3];\r
-} RSDP_TABLE;\r
-\r
-typedef struct {\r
- UINT32 Signature;\r
- UINT32 Length;\r
- UINT8 Revision;\r
- UINT8 Checksum;\r
- UINT8 OemId[6];\r
- UINT8 OemTableId[8];\r
- UINT32 OemRevision;\r
- UINT8 CreatorId[4];\r
- UINT32 CreatorRevision;\r
-} DESCRIPTION_HEADER;\r
\r
typedef struct {\r
- DESCRIPTION_HEADER Header;\r
- UINT32 Entry;\r
+ EFI_ACPI_DESCRIPTION_HEADER Header;\r
+ UINT32 Entry;\r
} RSDT_TABLE;\r
\r
typedef struct {\r
- DESCRIPTION_HEADER Header;\r
- UINT64 Entry;\r
+ EFI_ACPI_DESCRIPTION_HEADER Header;\r
+ UINT64 Entry;\r
} XSDT_TABLE;\r
\r
-typedef struct {\r
- UINT8 Address_Space_ID;\r
- UINT8 Register_Bit_Width;\r
- UINT8 Register_Bit_Offset;\r
- UINT8 Access_Size;\r
- UINT64 Address;\r
-} GADDRESS_STRUCTURE;\r
-\r
#pragma pack()\r
\r
VOID\r
ScanTableInRSDT (\r
- RSDT_TABLE *Rsdt,\r
- UINT32 Signature,\r
- DESCRIPTION_HEADER **FoundTable\r
+ RSDT_TABLE *Rsdt,\r
+ UINT32 Signature,\r
+ EFI_ACPI_DESCRIPTION_HEADER **FoundTable\r
)\r
{\r
- UINTN Index;\r
- UINT32 EntryCount;\r
- UINT32 *EntryPtr;\r
- DESCRIPTION_HEADER *Table;\r
+ UINTN Index;\r
+ UINT32 EntryCount;\r
+ UINT32 *EntryPtr;\r
+ EFI_ACPI_DESCRIPTION_HEADER *Table;\r
\r
*FoundTable = NULL;\r
\r
- EntryCount = (Rsdt->Header.Length - sizeof (DESCRIPTION_HEADER)) / sizeof(UINT32);\r
+ EntryCount = (Rsdt->Header.Length - sizeof (EFI_ACPI_DESCRIPTION_HEADER)) / sizeof(UINT32);\r
\r
EntryPtr = &Rsdt->Entry;\r
for (Index = 0; Index < EntryCount; Index ++, EntryPtr ++) {\r
- Table = (DESCRIPTION_HEADER*)((UINTN)(*EntryPtr));\r
+ Table = (EFI_ACPI_DESCRIPTION_HEADER*)((UINTN)(*EntryPtr));\r
if (Table->Signature == Signature) {\r
*FoundTable = Table;\r
break;\r
\r
VOID\r
ScanTableInXSDT (\r
- XSDT_TABLE *Xsdt,\r
- UINT32 Signature,\r
- DESCRIPTION_HEADER **FoundTable\r
+ XSDT_TABLE *Xsdt,\r
+ UINT32 Signature,\r
+ EFI_ACPI_DESCRIPTION_HEADER **FoundTable\r
)\r
{\r
- UINTN Index;\r
- UINT32 EntryCount;\r
- UINT64 EntryPtr;\r
- UINTN BasePtr;\r
- \r
- DESCRIPTION_HEADER *Table;\r
+ UINTN Index;\r
+ UINT32 EntryCount;\r
+ UINT64 EntryPtr;\r
+ UINTN BasePtr;\r
+ EFI_ACPI_DESCRIPTION_HEADER *Table;\r
\r
*FoundTable = NULL;\r
\r
- EntryCount = (Xsdt->Header.Length - sizeof (DESCRIPTION_HEADER)) / sizeof(UINT64);\r
+ EntryCount = (Xsdt->Header.Length - sizeof (EFI_ACPI_DESCRIPTION_HEADER)) / sizeof(UINT64);\r
\r
BasePtr = (UINTN)(&(Xsdt->Entry));\r
for (Index = 0; Index < EntryCount; Index ++) {\r
CopyMem (&EntryPtr, (VOID *)(BasePtr + Index * sizeof(UINT64)), sizeof(UINT64));\r
- Table = (DESCRIPTION_HEADER*)((UINTN)(EntryPtr));\r
+ Table = (EFI_ACPI_DESCRIPTION_HEADER*)((UINTN)(EntryPtr));\r
if (Table->Signature == Signature) {\r
*FoundTable = Table;\r
break;\r
UINT32 Signature\r
)\r
{\r
- DESCRIPTION_HEADER *AcpiTable;\r
- RSDP_TABLE *Rsdp;\r
- RSDT_TABLE *Rsdt;\r
- XSDT_TABLE *Xsdt;\r
+ EFI_ACPI_DESCRIPTION_HEADER *AcpiTable;\r
+ EFI_ACPI_3_0_ROOT_SYSTEM_DESCRIPTION_POINTER *Rsdp;\r
+ RSDT_TABLE *Rsdt;\r
+ XSDT_TABLE *Xsdt;\r
\r
AcpiTable = NULL;\r
\r
// Check ACPI2.0 table\r
//\r
if ((int)Hob->Acpi20.Table != -1) {\r
- Rsdp = (RSDP_TABLE *)(UINTN)Hob->Acpi20.Table;\r
+ Rsdp = (EFI_ACPI_3_0_ROOT_SYSTEM_DESCRIPTION_POINTER *)(UINTN)Hob->Acpi20.Table;\r
Rsdt = (RSDT_TABLE *)(UINTN)Rsdp->RsdtAddress;\r
Xsdt = NULL;\r
if ((Rsdp->Revision >= 2) && (Rsdp->XsdtAddress < (UINT64)(UINTN)-1)) {\r
// Check ACPI1.0 table\r
//\r
if ((AcpiTable == NULL) && ((int)Hob->Acpi.Table != -1)) {\r
- Rsdp = (RSDP_TABLE *)(UINTN)Hob->Acpi.Table;\r
+ Rsdp = (EFI_ACPI_3_0_ROOT_SYSTEM_DESCRIPTION_POINTER *)(UINTN)Hob->Acpi.Table;\r
Rsdt = (RSDT_TABLE *)(UINTN)Rsdp->RsdtAddress;\r
//\r
// Check Rsdt\r
}\r
\r
#pragma pack(1)\r
-//#define MCFG_SIGNATURE 0x4746434D\r
-#define MCFG_SIGNATURE SIGNATURE_32 ('M', 'C', 'F', 'G')\r
typedef struct {\r
UINT64 BaseAddress;\r
UINT16 PciSegmentGroupNumber;\r
UINT8 EndBusNumber;\r
UINT32 Reserved;\r
} MCFG_STRUCTURE;\r
-\r
-#define FADT_SIGNATURE SIGNATURE_32 ('F', 'A', 'C', 'P')\r
-typedef struct {\r
- DESCRIPTION_HEADER Header;\r
- UINT32 FIRMWARE_CTRL;\r
- UINT32 DSDT;\r
- UINT8 INT_MODEL;\r
- UINT8 Preferred_PM_Profile;\r
- UINT16 SCI_INIT;\r
- UINT32 SMI_CMD;\r
- UINT8 ACPI_ENABLE;\r
- UINT8 ACPI_DISABLE;\r
- UINT8 S4BIOS_REQ;\r
- UINT8 PSTATE_CNT;\r
- UINT32 PM1a_EVT_BLK;\r
- UINT32 PM1b_EVT_BLK;\r
- UINT32 PM1a_CNT_BLK;\r
- UINT32 PM1b_CNT_BLK;\r
- UINT32 PM2_CNT_BLK;\r
- UINT32 PM_TMR_BLK;\r
- UINT32 GPE0_BLK;\r
- UINT32 GPE1_BLK;\r
- UINT8 PM1_EVT_LEN;\r
- UINT8 PM1_CNT_LEN;\r
- UINT8 PM2_CNT_LEN;\r
- UINT8 PM_TMR_LEN;\r
- UINT8 GPE0_BLK_LEN;\r
- UINT8 GPE1_BLK_LEN;\r
- UINT8 GPE1_BASE;\r
- UINT8 CST_CNT;\r
- UINT16 P_LVL2_LAT;\r
- UINT16 P_LVL3_LAT;\r
- UINT16 FLUSH_SIZE;\r
- UINT16 FLUSH_STRIDE;\r
- UINT8 DUTY_OFFSET;\r
- UINT8 DUTY_WIDTH;\r
- UINT8 DAY_ALARM;\r
- UINT8 MON_ALARM;\r
- UINT8 CENTRY;\r
- UINT16 IAPC_BOOT_ARCH;\r
- UINT8 Reserved_111;\r
- UINT32 Flags;\r
- GADDRESS_STRUCTURE RESET_REG;\r
- UINT8 RESET_VALUE;\r
- UINT8 Reserved_129[3];\r
- UINT64 X_FIRMWARE_CTRL;\r
- UINT64 X_DSDT;\r
- GADDRESS_STRUCTURE X_PM1a_EVT_BLK;\r
- GADDRESS_STRUCTURE X_PM1b_EVT_BLK;\r
- GADDRESS_STRUCTURE X_PM1a_CNT_BLK;\r
- GADDRESS_STRUCTURE X_PM1b_CNT_BLK;\r
- GADDRESS_STRUCTURE X_PM2_CNT_BLK;\r
- GADDRESS_STRUCTURE X_PM_TMR_BLK;\r
- GADDRESS_STRUCTURE X_GPE0_BLK;\r
- GADDRESS_STRUCTURE X_GPE1_BLK;\r
-} FADT_TABLE;\r
-\r
#pragma pack()\r
\r
VOID\r
IN HOB_TEMPLATE *Hob\r
)\r
{\r
- DESCRIPTION_HEADER *McfgTable;\r
- MCFG_STRUCTURE *Mcfg;\r
- UINTN McfgCount;\r
- UINTN Index;\r
+ EFI_ACPI_DESCRIPTION_HEADER *McfgTable;\r
+ MCFG_STRUCTURE *Mcfg;\r
+ UINTN McfgCount;\r
+ UINTN Index;\r
\r
- McfgTable = FindAcpiPtr (Hob, MCFG_SIGNATURE);\r
+ McfgTable = FindAcpiPtr (Hob, EFI_ACPI_3_0_PCI_EXPRESS_MEMORY_MAPPED_CONFIGURATION_SPACE_BASE_ADDRESS_DESCRIPTION_TABLE_SIGNATURE);\r
if (McfgTable == NULL) {\r
return ;\r
}\r
\r
- Mcfg = (MCFG_STRUCTURE *)((UINTN)McfgTable + sizeof(DESCRIPTION_HEADER) + sizeof(UINT64));\r
- McfgCount = (McfgTable->Length - sizeof(DESCRIPTION_HEADER) - sizeof(UINT64)) / sizeof(MCFG_STRUCTURE);\r
+ Mcfg = (MCFG_STRUCTURE *)((UINTN)McfgTable + sizeof(EFI_ACPI_DESCRIPTION_HEADER) + sizeof(UINT64));\r
+ McfgCount = (McfgTable->Length - sizeof(EFI_ACPI_DESCRIPTION_HEADER) - sizeof(UINT64)) / sizeof(MCFG_STRUCTURE);\r
\r
//\r
// Fill PciExpress info on Hob\r
IN HOB_TEMPLATE *Hob\r
)\r
{\r
- FADT_TABLE *Fadt;\r
- EFI_ACPI_DESCRIPTION *AcpiDescription;\r
+ EFI_ACPI_3_0_FIXED_ACPI_DESCRIPTION_TABLE *Fadt;\r
+ EFI_ACPI_DESCRIPTION *AcpiDescription;\r
\r
- Fadt = FindAcpiPtr (Hob, FADT_SIGNATURE);\r
+ Fadt = FindAcpiPtr (Hob, EFI_ACPI_3_0_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE);\r
if (Fadt == NULL) {\r
return ;\r
}\r
// Fill AcpiDescription according to FADT\r
// Currently, only for PM_TMR\r
//\r
- AcpiDescription->PM_TMR_LEN = Fadt->PM_TMR_LEN;\r
+ AcpiDescription->PM_TMR_LEN = Fadt->PmTmrLen;\r
AcpiDescription->TMR_VAL_EXT = (UINT8)((Fadt->Flags & 0x100) != 0);\r
- if ((Fadt->Header.Revision >= 3) && (Fadt->Header.Length >= sizeof(FADT_TABLE))) {\r
+ \r
+ //\r
+ // For fields not included in ACPI 1.0 spec, we get the value based on table length\r
+ //\r
+ if (Fadt->Header.Length >= OFFSET_OF (EFI_ACPI_3_0_FIXED_ACPI_DESCRIPTION_TABLE, XPmTmrBlk) + sizeof (Fadt->XPmTmrBlk)) {\r
CopyMem (\r
&AcpiDescription->PM_TMR_BLK,\r
- &Fadt->X_PM_TMR_BLK,\r
- sizeof(GADDRESS_STRUCTURE)\r
+ &Fadt->XPmTmrBlk,\r
+ sizeof(EFI_ACPI_3_0_GENERIC_ADDRESS_STRUCTURE)\r
);\r
+ }\r
+ if (Fadt->Header.Length >= OFFSET_OF (EFI_ACPI_3_0_FIXED_ACPI_DESCRIPTION_TABLE, ResetValue) + sizeof (Fadt->ResetValue)) {\r
CopyMem (\r
&AcpiDescription->RESET_REG,\r
- &Fadt->RESET_REG,\r
- sizeof(GADDRESS_STRUCTURE)\r
+ &Fadt->ResetReg,\r
+ sizeof(EFI_ACPI_3_0_GENERIC_ADDRESS_STRUCTURE)\r
);\r
- AcpiDescription->RESET_VALUE = Fadt->RESET_VALUE;\r
+ AcpiDescription->RESET_VALUE = Fadt->ResetValue;\r
}\r
+\r
if (AcpiDescription->PM_TMR_BLK.Address == 0) {\r
- AcpiDescription->PM_TMR_BLK.Address = Fadt->PM_TMR_BLK;\r
- AcpiDescription->PM_TMR_BLK.AddressSpaceId = ACPI_ADDRESS_ID_IO;\r
+ AcpiDescription->PM_TMR_BLK.Address = Fadt->PmTmrBlk;\r
+ AcpiDescription->PM_TMR_BLK.AddressSpaceId = EFI_ACPI_3_0_SYSTEM_IO;\r
AcpiDescription->PM_TMR_BLK.RegisterBitWidth = (UINT8) ((AcpiDescription->TMR_VAL_EXT == 0) ? 24 : 32);\r
}\r
\r
projects / mirror_edk2.git / blobdiff