aboutsummaryrefslogtreecommitdiff
path: root/sys/contrib/dev/acpica/tbconvrt.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/contrib/dev/acpica/tbconvrt.c')
-rw-r--r--sys/contrib/dev/acpica/tbconvrt.c121
1 files changed, 83 insertions, 38 deletions
diff --git a/sys/contrib/dev/acpica/tbconvrt.c b/sys/contrib/dev/acpica/tbconvrt.c
index 16ad3043cd81..aafb62c00374 100644
--- a/sys/contrib/dev/acpica/tbconvrt.c
+++ b/sys/contrib/dev/acpica/tbconvrt.c
@@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: tbconvrt - ACPI Table conversion utilities
- * $Revision: 57 $
+ * $Revision: 1.64 $
*
*****************************************************************************/
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2004, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2005, Intel Corp.
* All rights reserved.
*
* 2. License
@@ -123,6 +123,24 @@
#define _COMPONENT ACPI_TABLES
ACPI_MODULE_NAME ("tbconvrt")
+/* Local prototypes */
+
+static void
+AcpiTbInitGenericAddress (
+ ACPI_GENERIC_ADDRESS *NewGasStruct,
+ UINT8 RegisterBitWidth,
+ ACPI_PHYSICAL_ADDRESS Address);
+
+static void
+AcpiTbConvertFadt1 (
+ FADT_DESCRIPTOR_REV2 *LocalFadt,
+ FADT_DESCRIPTOR_REV1 *OriginalFadt);
+
+static void
+AcpiTbConvertFadt2 (
+ FADT_DESCRIPTOR_REV2 *LocalFadt,
+ FADT_DESCRIPTOR_REV2 *OriginalFadt);
+
/*******************************************************************************
*
@@ -149,7 +167,9 @@ AcpiTbGetTableCount (
ACPI_FUNCTION_ENTRY ();
- if (RSDP->Revision < 2)
+ /* RSDT pointers are 32 bits, XSDT pointers are 64 bits */
+
+ if (AcpiGbl_RootTableType == ACPI_TABLE_TYPE_RSDT)
{
PointerSize = sizeof (UINT32);
}
@@ -214,15 +234,19 @@ AcpiTbConvertToXsdt (
for (i = 0; i < AcpiGbl_RsdtTableCount; i++)
{
- if (AcpiGbl_RSDP->Revision < 2)
+ /* RSDT pointers are 32 bits, XSDT pointers are 64 bits */
+
+ if (AcpiGbl_RootTableType == ACPI_TABLE_TYPE_RSDT)
{
ACPI_STORE_ADDRESS (NewTable->TableOffsetEntry[i],
- (ACPI_CAST_PTR (RSDT_DESCRIPTOR_REV1, TableInfo->Pointer))->TableOffsetEntry[i]);
+ (ACPI_CAST_PTR (RSDT_DESCRIPTOR_REV1,
+ TableInfo->Pointer))->TableOffsetEntry[i]);
}
else
{
NewTable->TableOffsetEntry[i] =
- (ACPI_CAST_PTR (XSDT_DESCRIPTOR, TableInfo->Pointer))->TableOffsetEntry[i];
+ (ACPI_CAST_PTR (XSDT_DESCRIPTOR,
+ TableInfo->Pointer))->TableOffsetEntry[i];
}
}
@@ -240,7 +264,7 @@ AcpiTbConvertToXsdt (
}
-/******************************************************************************
+/*******************************************************************************
*
* FUNCTION: AcpiTbInitGenericAddress
*
@@ -266,7 +290,7 @@ AcpiTbInitGenericAddress (
NewGasStruct->AddressSpaceId = ACPI_ADR_SPACE_SYSTEM_IO;
NewGasStruct->RegisterBitWidth = RegisterBitWidth;
NewGasStruct->RegisterBitOffset = 0;
- NewGasStruct->Reserved = 0;
+ NewGasStruct->AccessWidth = 0;
}
@@ -277,7 +301,7 @@ AcpiTbInitGenericAddress (
* PARAMETERS: LocalFadt - Pointer to new FADT
* OriginalFadt - Pointer to old FADT
*
- * RETURN: Populates LocalFadt
+ * RETURN: None, populates LocalFadt
*
* DESCRIPTION: Convert an ACPI 1.0 FADT to common internal format
*
@@ -289,7 +313,6 @@ AcpiTbConvertFadt1 (
FADT_DESCRIPTOR_REV1 *OriginalFadt)
{
-
/* ACPI 1.0 FACS */
/* The BIOS stored FADT should agree with Revision 1.0 */
@@ -307,7 +330,8 @@ AcpiTbConvertFadt1 (
ACPI_STORE_ADDRESS (LocalFadt->XDsdt, LocalFadt->V1_Dsdt);
/*
- * System Interrupt Model isn't used in ACPI 2.0 (LocalFadt->Reserved1 = 0;)
+ * System Interrupt Model isn't used in ACPI 2.0
+ * (LocalFadt->Reserved1 = 0;)
*/
/*
@@ -342,7 +366,8 @@ AcpiTbConvertFadt1 (
* that immediately follows.
*/
ACPI_MEMCPY (&LocalFadt->ResetRegister,
- &((FADT_DESCRIPTOR_REV2_MINUS *) OriginalFadt)->ResetRegister,
+ &(ACPI_CAST_PTR (FADT_DESCRIPTOR_REV2_MINUS,
+ OriginalFadt))->ResetRegister,
sizeof (ACPI_GENERIC_ADDRESS) + 1);
}
else
@@ -378,7 +403,8 @@ AcpiTbConvertFadt1 (
AcpiTbInitGenericAddress (&AcpiGbl_XPm1aEnable,
(UINT8) ACPI_DIV_2 (AcpiGbl_FADT->Pm1EvtLen),
- (ACPI_PHYSICAL_ADDRESS) (ACPI_GET_ADDRESS (LocalFadt->XPm1aEvtBlk.Address) +
+ (ACPI_PHYSICAL_ADDRESS)
+ (ACPI_GET_ADDRESS (LocalFadt->XPm1aEvtBlk.Address) +
ACPI_DIV_2 (AcpiGbl_FADT->Pm1EvtLen)));
/* PM1B is optional; leave null if not present */
@@ -387,7 +413,8 @@ AcpiTbConvertFadt1 (
{
AcpiTbInitGenericAddress (&AcpiGbl_XPm1bEnable,
(UINT8) ACPI_DIV_2 (AcpiGbl_FADT->Pm1EvtLen),
- (ACPI_PHYSICAL_ADDRESS) (ACPI_GET_ADDRESS (LocalFadt->XPm1bEvtBlk.Address) +
+ (ACPI_PHYSICAL_ADDRESS)
+ (ACPI_GET_ADDRESS (LocalFadt->XPm1bEvtBlk.Address) +
ACPI_DIV_2 (AcpiGbl_FADT->Pm1EvtLen)));
}
}
@@ -400,7 +427,7 @@ AcpiTbConvertFadt1 (
* PARAMETERS: LocalFadt - Pointer to new FADT
* OriginalFadt - Pointer to old FADT
*
- * RETURN: Populates LocalFadt
+ * RETURN: None, populates LocalFadt
*
* DESCRIPTION: Convert an ACPI 2.0 FADT to common internal format.
* Handles optional "X" fields.
@@ -424,7 +451,8 @@ AcpiTbConvertFadt2 (
*/
if (!(ACPI_GET_ADDRESS (LocalFadt->XFirmwareCtrl)))
{
- ACPI_STORE_ADDRESS (LocalFadt->XFirmwareCtrl, LocalFadt->V1_FirmwareCtrl);
+ ACPI_STORE_ADDRESS (LocalFadt->XFirmwareCtrl,
+ LocalFadt->V1_FirmwareCtrl);
}
if (!(ACPI_GET_ADDRESS (LocalFadt->XDsdt)))
@@ -435,37 +463,43 @@ AcpiTbConvertFadt2 (
if (!(ACPI_GET_ADDRESS (LocalFadt->XPm1aEvtBlk.Address)))
{
AcpiTbInitGenericAddress (&LocalFadt->XPm1aEvtBlk,
- LocalFadt->Pm1EvtLen, (ACPI_PHYSICAL_ADDRESS) LocalFadt->V1_Pm1aEvtBlk);
+ LocalFadt->Pm1EvtLen,
+ (ACPI_PHYSICAL_ADDRESS) LocalFadt->V1_Pm1aEvtBlk);
}
if (!(ACPI_GET_ADDRESS (LocalFadt->XPm1bEvtBlk.Address)))
{
AcpiTbInitGenericAddress (&LocalFadt->XPm1bEvtBlk,
- LocalFadt->Pm1EvtLen, (ACPI_PHYSICAL_ADDRESS) LocalFadt->V1_Pm1bEvtBlk);
+ LocalFadt->Pm1EvtLen,
+ (ACPI_PHYSICAL_ADDRESS) LocalFadt->V1_Pm1bEvtBlk);
}
if (!(ACPI_GET_ADDRESS (LocalFadt->XPm1aCntBlk.Address)))
{
AcpiTbInitGenericAddress (&LocalFadt->XPm1aCntBlk,
- LocalFadt->Pm1CntLen, (ACPI_PHYSICAL_ADDRESS) LocalFadt->V1_Pm1aCntBlk);
+ LocalFadt->Pm1CntLen,
+ (ACPI_PHYSICAL_ADDRESS) LocalFadt->V1_Pm1aCntBlk);
}
if (!(ACPI_GET_ADDRESS (LocalFadt->XPm1bCntBlk.Address)))
{
AcpiTbInitGenericAddress (&LocalFadt->XPm1bCntBlk,
- LocalFadt->Pm1CntLen, (ACPI_PHYSICAL_ADDRESS) LocalFadt->V1_Pm1bCntBlk);
+ LocalFadt->Pm1CntLen,
+ (ACPI_PHYSICAL_ADDRESS) LocalFadt->V1_Pm1bCntBlk);
}
if (!(ACPI_GET_ADDRESS (LocalFadt->XPm2CntBlk.Address)))
{
AcpiTbInitGenericAddress (&LocalFadt->XPm2CntBlk,
- LocalFadt->Pm2CntLen, (ACPI_PHYSICAL_ADDRESS) LocalFadt->V1_Pm2CntBlk);
+ LocalFadt->Pm2CntLen,
+ (ACPI_PHYSICAL_ADDRESS) LocalFadt->V1_Pm2CntBlk);
}
if (!(ACPI_GET_ADDRESS (LocalFadt->XPmTmrBlk.Address)))
{
AcpiTbInitGenericAddress (&LocalFadt->XPmTmrBlk,
- LocalFadt->PmTmLen, (ACPI_PHYSICAL_ADDRESS) LocalFadt->V1_PmTmrBlk);
+ LocalFadt->PmTmLen,
+ (ACPI_PHYSICAL_ADDRESS) LocalFadt->V1_PmTmrBlk);
}
if (!(ACPI_GET_ADDRESS (LocalFadt->XGpe0Blk.Address)))
@@ -484,9 +518,12 @@ AcpiTbConvertFadt2 (
AcpiTbInitGenericAddress (&AcpiGbl_XPm1aEnable,
(UINT8) ACPI_DIV_2 (AcpiGbl_FADT->Pm1EvtLen),
- (ACPI_PHYSICAL_ADDRESS) (ACPI_GET_ADDRESS (LocalFadt->XPm1aEvtBlk.Address) +
+ (ACPI_PHYSICAL_ADDRESS)
+ (ACPI_GET_ADDRESS (LocalFadt->XPm1aEvtBlk.Address) +
ACPI_DIV_2 (AcpiGbl_FADT->Pm1EvtLen)));
- AcpiGbl_XPm1aEnable.AddressSpaceId = LocalFadt->XPm1aEvtBlk.AddressSpaceId;
+
+ AcpiGbl_XPm1aEnable.AddressSpaceId =
+ LocalFadt->XPm1aEvtBlk.AddressSpaceId;
/* PM1B is optional; leave null if not present */
@@ -494,9 +531,12 @@ AcpiTbConvertFadt2 (
{
AcpiTbInitGenericAddress (&AcpiGbl_XPm1bEnable,
(UINT8) ACPI_DIV_2 (AcpiGbl_FADT->Pm1EvtLen),
- (ACPI_PHYSICAL_ADDRESS) (ACPI_GET_ADDRESS (LocalFadt->XPm1bEvtBlk.Address) +
+ (ACPI_PHYSICAL_ADDRESS)
+ (ACPI_GET_ADDRESS (LocalFadt->XPm1bEvtBlk.Address) +
ACPI_DIV_2 (AcpiGbl_FADT->Pm1EvtLen)));
- AcpiGbl_XPm1bEnable.AddressSpaceId = LocalFadt->XPm1bEvtBlk.AddressSpaceId;
+
+ AcpiGbl_XPm1bEnable.AddressSpaceId =
+ LocalFadt->XPm1bEvtBlk.AddressSpaceId;
}
}
@@ -518,7 +558,8 @@ AcpiTbConvertFadt2 (
******************************************************************************/
ACPI_STATUS
-AcpiTbConvertTableFadt (void)
+AcpiTbConvertTableFadt (
+ void)
{
FADT_DESCRIPTOR_REV2 *LocalFadt;
ACPI_TABLE_DESC *TableDesc;
@@ -533,7 +574,8 @@ AcpiTbConvertTableFadt (void)
*/
if (AcpiGbl_FADT->Length < sizeof (FADT_DESCRIPTOR_REV1))
{
- ACPI_REPORT_ERROR (("FADT is invalid, too short: 0x%X\n", AcpiGbl_FADT->Length));
+ ACPI_REPORT_ERROR (("FADT is invalid, too short: 0x%X\n",
+ AcpiGbl_FADT->Length));
return_ACPI_STATUS (AE_INVALID_TABLE_LENGTH);
}
@@ -551,8 +593,9 @@ AcpiTbConvertTableFadt (void)
{
/* Length is too short to be a V2.0 table */
- ACPI_REPORT_WARNING (("Inconsistent FADT length (0x%X) and revision (0x%X), using FADT V1.0 portion of table\n",
- AcpiGbl_FADT->Length, AcpiGbl_FADT->Revision));
+ ACPI_REPORT_WARNING ((
+ "Inconsistent FADT length (0x%X) and revision (0x%X), using FADT V1.0 portion of table\n",
+ AcpiGbl_FADT->Length, AcpiGbl_FADT->Revision));
AcpiTbConvertFadt1 (LocalFadt, (void *) AcpiGbl_FADT);
}
@@ -570,9 +613,8 @@ AcpiTbConvertTableFadt (void)
AcpiTbConvertFadt1 (LocalFadt, (void *) AcpiGbl_FADT);
}
- /*
- * Global FADT pointer will point to the new common V2.0 FADT
- */
+ /* Global FADT pointer will point to the new common V2.0 FADT */
+
AcpiGbl_FADT = LocalFadt;
AcpiGbl_FADT->Length = sizeof (FADT_DESCRIPTOR);
@@ -600,9 +642,9 @@ AcpiTbConvertTableFadt (void)
/*******************************************************************************
*
- * FUNCTION: AcpiTbConvertTableFacs
+ * FUNCTION: AcpiTbBuildCommonFacs
*
- * PARAMETERS: TableInfo - Info for currently installad FACS
+ * PARAMETERS: TableInfo - Info for currently installed FACS
*
* RETURN: Status
*
@@ -623,13 +665,15 @@ AcpiTbBuildCommonFacs (
if (AcpiGbl_FACS->Length < 24)
{
- ACPI_REPORT_ERROR (("Invalid FACS table length: 0x%X\n", AcpiGbl_FACS->Length));
+ ACPI_REPORT_ERROR (("Invalid FACS table length: 0x%X\n",
+ AcpiGbl_FACS->Length));
return_ACPI_STATUS (AE_INVALID_TABLE_LENGTH);
}
if (AcpiGbl_FACS->Length < 64)
{
- ACPI_REPORT_WARNING (("FACS is shorter than the ACPI specification allows: 0x%X, using anyway\n",
+ ACPI_REPORT_WARNING ((
+ "FACS is shorter than the ACPI specification allows: 0x%X, using anyway\n",
AcpiGbl_FACS->Length));
}
@@ -643,7 +687,8 @@ AcpiTbBuildCommonFacs (
{
/* ACPI 1.0 FACS or short table or optional X_ field is zero */
- AcpiGbl_CommonFACS.FirmwareWakingVector = ACPI_CAST_PTR (UINT64, &(AcpiGbl_FACS->FirmwareWakingVector));
+ AcpiGbl_CommonFACS.FirmwareWakingVector = ACPI_CAST_PTR (UINT64,
+ &(AcpiGbl_FACS->FirmwareWakingVector));
AcpiGbl_CommonFACS.VectorWidth = 32;
}
else
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 12:41:34 +0000