mirror of
https://github.com/acpica/acpica/
synced 2025-01-15 22:09:17 +03:00
date 2000.07.20.17.41.00; author mwalz; state Exp;
This commit is contained in:
aystarik
parent
38b2fb9227
commit
96bac91a29
@ -117,15 +117,15 @@
|
||||
#define __TBUTILS_C__
|
||||
|
||||
#include "acpi.h"
|
||||
#include "tables.h"
|
||||
#include "interp.h"
|
||||
#include "actables.h"
|
||||
#include "acinterp.h"
|
||||
|
||||
|
||||
#define _COMPONENT TABLE_MANAGER
|
||||
MODULE_NAME ("tbutils");
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
/*******************************************************************************
|
||||
*
|
||||
* FUNCTION: AcpiTbSystemTablePointer
|
||||
*
|
||||
@ -135,7 +135,7 @@
|
||||
* system tables such as the DSDT or an SSDT.)
|
||||
* FALSE otherwise
|
||||
*
|
||||
****************************************************************************/
|
||||
******************************************************************************/
|
||||
|
||||
ACPI_STATUS
|
||||
AcpiTbHandleToObject (
|
||||
@ -148,28 +148,27 @@ AcpiTbHandleToObject (
|
||||
|
||||
for (i = 0; i < ACPI_TABLE_MAX; i++)
|
||||
{
|
||||
ListHead = &Acpi_GblAcpiTables[i];
|
||||
ListHead = &AcpiGbl_AcpiTables[i];
|
||||
do
|
||||
{
|
||||
if (ListHead->TableId == TableId)
|
||||
{
|
||||
*TableDesc = ListHead;
|
||||
return AE_OK;
|
||||
return (AE_OK);
|
||||
}
|
||||
|
||||
ListHead = ListHead->Next;
|
||||
|
||||
} while (ListHead != &Acpi_GblAcpiTables[i]);
|
||||
} while (ListHead != &AcpiGbl_AcpiTables[i]);
|
||||
}
|
||||
|
||||
|
||||
DEBUG_PRINT (ACPI_ERROR, ("TableId=0x%X does not exist\n", TableId));
|
||||
return AE_BAD_PARAMETER;
|
||||
|
||||
return (AE_BAD_PARAMETER);
|
||||
}
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
/*******************************************************************************
|
||||
*
|
||||
* FUNCTION: AcpiTbSystemTablePointer
|
||||
*
|
||||
@ -179,7 +178,7 @@ AcpiTbHandleToObject (
|
||||
* system tables such as the DSDT or an SSDT.)
|
||||
* FALSE otherwise
|
||||
*
|
||||
****************************************************************************/
|
||||
******************************************************************************/
|
||||
|
||||
BOOLEAN
|
||||
AcpiTbSystemTablePointer (
|
||||
@ -203,7 +202,7 @@ AcpiTbSystemTablePointer (
|
||||
|
||||
/* Check for a pointer within the DSDT */
|
||||
|
||||
if (IS_IN_ACPI_TABLE (Where, Acpi_GblDSDT))
|
||||
if (IS_IN_ACPI_TABLE (Where, AcpiGbl_DSDT))
|
||||
{
|
||||
return (TRUE);
|
||||
}
|
||||
@ -211,9 +210,9 @@ AcpiTbSystemTablePointer (
|
||||
|
||||
/* Check each of the loaded SSDTs (if any)*/
|
||||
|
||||
TableDesc = &Acpi_GblAcpiTables[TABLE_SSDT];
|
||||
TableDesc = &AcpiGbl_AcpiTables[ACPI_TABLE_SSDT];
|
||||
|
||||
for (i = 0; i < Acpi_GblAcpiTables[TABLE_SSDT].Count; i++)
|
||||
for (i = 0; i < AcpiGbl_AcpiTables[ACPI_TABLE_SSDT].Count; i++)
|
||||
{
|
||||
Table = TableDesc->Pointer;
|
||||
|
||||
@ -228,9 +227,9 @@ AcpiTbSystemTablePointer (
|
||||
|
||||
/* Check each of the loaded PSDTs (if any)*/
|
||||
|
||||
TableDesc = &Acpi_GblAcpiTables[TABLE_PSDT];
|
||||
TableDesc = &AcpiGbl_AcpiTables[ACPI_TABLE_PSDT];
|
||||
|
||||
for (i = 0; i < Acpi_GblAcpiTables[TABLE_PSDT].Count; i++)
|
||||
for (i = 0; i < AcpiGbl_AcpiTables[ACPI_TABLE_PSDT].Count; i++)
|
||||
{
|
||||
Table = TableDesc->Pointer;
|
||||
|
||||
@ -243,15 +242,13 @@ AcpiTbSystemTablePointer (
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* Pointer does not point into any system table */
|
||||
|
||||
return (FALSE);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/******************************************************************************
|
||||
/*******************************************************************************
|
||||
*
|
||||
* FUNCTION: AcpiTbValidateTableHeader
|
||||
*
|
||||
@ -263,10 +260,11 @@ AcpiTbSystemTablePointer (
|
||||
*
|
||||
* NOTE: Table pointers are validated as follows:
|
||||
* 1) Table pointer must point to valid physical memory
|
||||
* 2) Signature must be 4 ASCII chars, even if we don't recognize the name
|
||||
* 2) Signature must be 4 ASCII chars, even if we don't recognize the
|
||||
* name
|
||||
* 3) Table must be readable for length specified in the header
|
||||
* 4) Table checksum must be valid (with the exception of the FACS which
|
||||
* has no checksum for some odd reason…)
|
||||
* 4) Table checksum must be valid (with the exception of the FACS
|
||||
* which has no checksum for some odd reason)
|
||||
*
|
||||
******************************************************************************/
|
||||
|
||||
@ -279,24 +277,26 @@ AcpiTbValidateTableHeader (
|
||||
|
||||
/* Verify that this is a valid address */
|
||||
|
||||
if (!AcpiOsdReadable (TableHeader, sizeof (ACPI_TABLE_HEADER)))
|
||||
if (!AcpiOsReadable (TableHeader, sizeof (ACPI_TABLE_HEADER)))
|
||||
{
|
||||
DEBUG_PRINT (ACPI_ERROR, ("Cannot read table header at %p\n", TableHeader));
|
||||
return AE_BAD_ADDRESS;
|
||||
DEBUG_PRINT (ACPI_ERROR,
|
||||
("Cannot read table header at %p\n", TableHeader));
|
||||
return (AE_BAD_ADDRESS);
|
||||
}
|
||||
|
||||
|
||||
/* Ensure that the signature is 4 ASCII characters */
|
||||
|
||||
STORE32 (&Signature, &TableHeader->Signature);
|
||||
MOVE_UNALIGNED32_TO_32 (&Signature, &TableHeader->Signature);
|
||||
if (!AcpiCmValidAcpiName (Signature))
|
||||
{
|
||||
DEBUG_PRINT (ACPI_ERROR, ("Table signature at %p [%X] has invalid characters\n",
|
||||
TableHeader, &Signature));
|
||||
DEBUG_PRINT (ACPI_ERROR,
|
||||
("Table signature at %p [%X] has invalid characters\n",
|
||||
TableHeader, &Signature));
|
||||
|
||||
REPORT_WARNING ("Invalid table signature found");
|
||||
DUMP_BUFFER (TableHeader, sizeof (ACPI_TABLE_HEADER));
|
||||
return AE_BAD_SIGNATURE;
|
||||
return (AE_BAD_SIGNATURE);
|
||||
}
|
||||
|
||||
|
||||
@ -304,27 +304,27 @@ AcpiTbValidateTableHeader (
|
||||
|
||||
if (TableHeader->Length < sizeof (ACPI_TABLE_HEADER))
|
||||
{
|
||||
DEBUG_PRINT (ACPI_ERROR, ("Invalid length in table header %p name %4.4s\n",
|
||||
TableHeader, &Signature));
|
||||
DEBUG_PRINT (ACPI_ERROR,
|
||||
("Invalid length in table header %p name %4.4s\n",
|
||||
TableHeader, &Signature));
|
||||
|
||||
REPORT_WARNING ("Invalid table header length found");
|
||||
DUMP_BUFFER (TableHeader, sizeof (ACPI_TABLE_HEADER));
|
||||
return AE_BAD_HEADER;
|
||||
return (AE_BAD_HEADER);
|
||||
}
|
||||
|
||||
|
||||
return AE_OK;
|
||||
return (AE_OK);
|
||||
}
|
||||
|
||||
|
||||
/******************************************************************************
|
||||
/*******************************************************************************
|
||||
*
|
||||
* FUNCTION: AcpiTbMapAcpiTable
|
||||
*
|
||||
* PARAMETERS: PhysicalAddress - Physical address of table to map
|
||||
* *Size - Size of the table. If zero, the size
|
||||
* from the table header is used. Actual
|
||||
* size is returned here.
|
||||
* from the table header is used.
|
||||
* Actual size is returned here.
|
||||
* **LogicalAddress - Logical address of mapped table
|
||||
*
|
||||
* RETURN: Logical address of the mapped table.
|
||||
@ -344,17 +344,17 @@ AcpiTbMapAcpiTable (
|
||||
ACPI_STATUS Status = AE_OK;
|
||||
|
||||
|
||||
|
||||
/* If size is zero, look at the table header to get the actual size */
|
||||
|
||||
if ((*Size) == 0)
|
||||
{
|
||||
/* Get the table header so we can extract the table length */
|
||||
|
||||
Status = AcpiOsdMapMemory (PhysicalAddress, sizeof (ACPI_TABLE_HEADER), (void **)&Table);
|
||||
Status = AcpiOsMapMemory (PhysicalAddress, sizeof (ACPI_TABLE_HEADER),
|
||||
(void **) &Table);
|
||||
if (ACPI_FAILURE (Status))
|
||||
{
|
||||
return Status;
|
||||
return (Status);
|
||||
}
|
||||
|
||||
/* Extract the full table length before we delete the mapping */
|
||||
@ -370,36 +370,37 @@ AcpiTbMapAcpiTable (
|
||||
|
||||
/* Always unmap the memory for the header */
|
||||
|
||||
AcpiOsdUnMapMemory (Table, sizeof (ACPI_TABLE_HEADER));
|
||||
AcpiOsUnmapMemory (Table, sizeof (ACPI_TABLE_HEADER));
|
||||
|
||||
/* Exit if header invalid */
|
||||
|
||||
if (ACPI_FAILURE (Status))
|
||||
{
|
||||
return Status;
|
||||
return (Status);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* Map the physical memory for the correct length */
|
||||
|
||||
Status = AcpiOsdMapMemory (PhysicalAddress, TableSize, (void **)&Table);
|
||||
Status = AcpiOsMapMemory (PhysicalAddress, TableSize, (void **) &Table);
|
||||
if (ACPI_FAILURE (Status))
|
||||
{
|
||||
return Status;
|
||||
return (Status);
|
||||
}
|
||||
|
||||
DEBUG_PRINT (ACPI_INFO, ("Mapped memory for ACPI table, length=%d(0x%X) at %p\n",
|
||||
TableSize, TableSize, Table));
|
||||
DEBUG_PRINT (ACPI_INFO,
|
||||
("Mapped memory for ACPI table, length=%d(0x%X) at %p\n",
|
||||
TableSize, TableSize, Table));
|
||||
|
||||
*Size = TableSize;
|
||||
*LogicalAddress = Table;
|
||||
|
||||
return Status;
|
||||
return (Status);
|
||||
}
|
||||
|
||||
|
||||
/******************************************************************************
|
||||
/*******************************************************************************
|
||||
*
|
||||
* FUNCTION: AcpiTbVerifyTableChecksum
|
||||
*
|
||||
@ -432,8 +433,9 @@ AcpiTbVerifyTableChecksum (
|
||||
if (CheckSum)
|
||||
{
|
||||
REPORT_ERROR ("Invalid ACPI table checksum");
|
||||
DEBUG_PRINT (ACPI_INFO, ("TbVerifyTableChecksum: Invalid checksum (%X) in %4.4s\n",
|
||||
CheckSum, &TableHeader->Signature));
|
||||
DEBUG_PRINT (ACPI_INFO,
|
||||
("TbVerifyTableChecksum: Invalid checksum (%X) in %4.4s\n",
|
||||
CheckSum, &TableHeader->Signature));
|
||||
|
||||
Status = AE_BAD_CHECKSUM;
|
||||
}
|
||||
@ -443,7 +445,7 @@ AcpiTbVerifyTableChecksum (
|
||||
}
|
||||
|
||||
|
||||
/******************************************************************************
|
||||
/*******************************************************************************
|
||||
*
|
||||
* FUNCTION: AcpiTbChecksum
|
||||
*
|
||||
@ -478,9 +480,7 @@ AcpiTbChecksum (
|
||||
}
|
||||
}
|
||||
|
||||
return sum;
|
||||
return (sum);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
|
||||
/******************************************************************************
|
||||
*
|
||||
* Module Name: tbxface - Public interfaces to the ACPI subsystem
|
||||
* ACPI table oriented interfaces
|
||||
* $Revision: 1.67 $
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
@ -10,8 +10,8 @@
|
||||
*
|
||||
* 1. Copyright Notice
|
||||
*
|
||||
* Some or all of this work - Copyright (c) 1999 - 2005, Intel Corp.
|
||||
* All rights reserved.
|
||||
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
|
||||
* reserved.
|
||||
*
|
||||
* 2. License
|
||||
*
|
||||
@ -119,99 +119,63 @@
|
||||
|
||||
#include "acpi.h"
|
||||
#include "acnamesp.h"
|
||||
#include "acinterp.h"
|
||||
#include "actables.h"
|
||||
|
||||
|
||||
#define _COMPONENT ACPI_TABLES
|
||||
ACPI_MODULE_NAME ("tbxface")
|
||||
#define _COMPONENT TABLE_MANAGER
|
||||
MODULE_NAME ("tbxface");
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
*
|
||||
* FUNCTION: AcpiLoadTables
|
||||
* FUNCTION: AcpiLoadFirmwareTables
|
||||
*
|
||||
* PARAMETERS: None
|
||||
*
|
||||
* RETURN: Status
|
||||
*
|
||||
* DESCRIPTION: This function is called to load the ACPI tables from the
|
||||
* provided RSDT
|
||||
* DESCRIPTION: This function is called to load the ACPI tables from BIOS
|
||||
*
|
||||
******************************************************************************/
|
||||
|
||||
ACPI_STATUS
|
||||
AcpiLoadTables (
|
||||
void)
|
||||
AcpiLoadFirmwareTables (void)
|
||||
{
|
||||
ACPI_POINTER RsdpAddress;
|
||||
ACPI_STATUS Status;
|
||||
ACPI_STATUS Status = AE_OK;
|
||||
UINT32 NumberOfTables = 0;
|
||||
|
||||
|
||||
ACPI_FUNCTION_TRACE ("AcpiLoadTables");
|
||||
FUNCTION_TRACE ("AcpiLoadFirmwareTables");
|
||||
|
||||
|
||||
/* Get the RSDP */
|
||||
/* Get the RSDT first */
|
||||
|
||||
Status = AcpiOsGetRootPointer (ACPI_LOGICAL_ADDRESSING,
|
||||
&RsdpAddress);
|
||||
Status = AcpiTbGetTableRsdt (&NumberOfTables);
|
||||
if (ACPI_FAILURE (Status))
|
||||
{
|
||||
ACPI_REPORT_ERROR (("AcpiLoadTables: Could not get RSDP, %s\n",
|
||||
AcpiFormatException (Status)));
|
||||
goto ErrorExit;
|
||||
}
|
||||
|
||||
/* Map and validate the RSDP */
|
||||
|
||||
AcpiGbl_TableFlags = RsdpAddress.PointerType;
|
||||
/* Now get the rest of the tables */
|
||||
|
||||
Status = AcpiTbVerifyRsdp (&RsdpAddress);
|
||||
Status = AcpiTbGetAllTables (NumberOfTables, NULL);
|
||||
if (ACPI_FAILURE (Status))
|
||||
{
|
||||
ACPI_REPORT_ERROR (("AcpiLoadTables: RSDP Failed validation: %s\n",
|
||||
AcpiFormatException (Status)));
|
||||
goto ErrorExit;
|
||||
}
|
||||
|
||||
/* Get the RSDT via the RSDP */
|
||||
|
||||
Status = AcpiTbGetTableRsdt ();
|
||||
if (ACPI_FAILURE (Status))
|
||||
{
|
||||
ACPI_REPORT_ERROR (("AcpiLoadTables: Could not load RSDT: %s\n",
|
||||
AcpiFormatException (Status)));
|
||||
goto ErrorExit;
|
||||
}
|
||||
|
||||
/* Now get the tables needed by this subsystem (FADT, DSDT, etc.) */
|
||||
|
||||
Status = AcpiTbGetRequiredTables ();
|
||||
if (ACPI_FAILURE (Status))
|
||||
{
|
||||
ACPI_REPORT_ERROR ((
|
||||
"AcpiLoadTables: Error getting required tables (DSDT/FADT/FACS): %s\n",
|
||||
AcpiFormatException (Status)));
|
||||
goto ErrorExit;
|
||||
}
|
||||
|
||||
ACPI_DEBUG_PRINT ((ACPI_DB_INIT, "ACPI Tables successfully acquired\n"));
|
||||
|
||||
/* Load the namespace from the tables */
|
||||
|
||||
Status = AcpiNsLoadNamespace ();
|
||||
if (ACPI_FAILURE (Status))
|
||||
{
|
||||
ACPI_REPORT_ERROR (("AcpiLoadTables: Could not load namespace: %s\n",
|
||||
AcpiFormatException (Status)));
|
||||
goto ErrorExit;
|
||||
}
|
||||
DEBUG_PRINT (ACPI_OK, ("ACPI Tables successfully loaded\n"));
|
||||
|
||||
return_ACPI_STATUS (AE_OK);
|
||||
|
||||
|
||||
ErrorExit:
|
||||
ACPI_REPORT_ERROR (("AcpiLoadTables: Could not load tables: %s\n",
|
||||
AcpiFormatException (Status)));
|
||||
DEBUG_PRINT (ACPI_ERROR,
|
||||
("Failure during ACPI Table Init: %s\n",
|
||||
AcpiCmFormatException (Status)));
|
||||
|
||||
return_ACPI_STATUS (Status);
|
||||
}
|
||||
@ -231,6 +195,8 @@ ErrorExit:
|
||||
* a valid header. The header fields will be verified, and if it
|
||||
* is determined that the table is invalid, the call will fail.
|
||||
*
|
||||
* If the call fails an appropriate status will be returned.
|
||||
*
|
||||
******************************************************************************/
|
||||
|
||||
ACPI_STATUS
|
||||
@ -239,11 +205,9 @@ AcpiLoadTable (
|
||||
{
|
||||
ACPI_STATUS Status;
|
||||
ACPI_TABLE_DESC TableInfo;
|
||||
ACPI_POINTER Address;
|
||||
|
||||
|
||||
ACPI_FUNCTION_TRACE ("AcpiLoadTable");
|
||||
|
||||
FUNCTION_TRACE ("AcpiLoadTable");
|
||||
|
||||
if (!TablePtr)
|
||||
{
|
||||
@ -252,10 +216,7 @@ AcpiLoadTable (
|
||||
|
||||
/* Copy the table to a local buffer */
|
||||
|
||||
Address.PointerType = ACPI_LOGICAL_POINTER | ACPI_LOGICAL_ADDRESSING;
|
||||
Address.Pointer.Logical = TablePtr;
|
||||
|
||||
Status = AcpiTbGetTableBody (&Address, TablePtr, &TableInfo);
|
||||
Status = AcpiTbGetTable (NULL, ((INT8 *) TablePtr), &TableInfo);
|
||||
if (ACPI_FAILURE (Status))
|
||||
{
|
||||
return_ACPI_STATUS (Status);
|
||||
@ -263,41 +224,10 @@ AcpiLoadTable (
|
||||
|
||||
/* Install the new table into the local data structures */
|
||||
|
||||
Status = AcpiTbInstallTable (&TableInfo);
|
||||
Status = AcpiTbInstallTable (NULL, &TableInfo);
|
||||
if (ACPI_FAILURE (Status))
|
||||
{
|
||||
/* Free table allocated by AcpiTbGetTableBody */
|
||||
|
||||
AcpiTbDeleteSingleTable (&TableInfo);
|
||||
return_ACPI_STATUS (Status);
|
||||
}
|
||||
|
||||
/* Convert the table to common format if necessary */
|
||||
|
||||
switch (TableInfo.Type)
|
||||
{
|
||||
case ACPI_TABLE_FADT:
|
||||
|
||||
Status = AcpiTbConvertTableFadt ();
|
||||
break;
|
||||
|
||||
case ACPI_TABLE_FACS:
|
||||
|
||||
Status = AcpiTbBuildCommonFacs (&TableInfo);
|
||||
break;
|
||||
|
||||
default:
|
||||
/* Load table into namespace if it contains executable AML */
|
||||
|
||||
Status = AcpiNsLoadTable (TableInfo.InstalledDesc, AcpiGbl_RootNode);
|
||||
break;
|
||||
}
|
||||
|
||||
if (ACPI_FAILURE (Status))
|
||||
{
|
||||
/* Uninstall table and free the buffer */
|
||||
|
||||
(void) AcpiTbUninstallTable (TableInfo.InstalledDesc);
|
||||
/* TBD: [Errors] must free table allocated by AcpiTbGetTable */
|
||||
}
|
||||
|
||||
return_ACPI_STATUS (Status);
|
||||
@ -320,10 +250,10 @@ ACPI_STATUS
|
||||
AcpiUnloadTable (
|
||||
ACPI_TABLE_TYPE TableType)
|
||||
{
|
||||
ACPI_TABLE_DESC *TableDesc;
|
||||
ACPI_TABLE_DESC *ListHead;
|
||||
|
||||
|
||||
ACPI_FUNCTION_TRACE ("AcpiUnloadTable");
|
||||
FUNCTION_TRACE ("AcpiUnloadTable");
|
||||
|
||||
|
||||
/* Parameter validation */
|
||||
@ -333,25 +263,22 @@ AcpiUnloadTable (
|
||||
return_ACPI_STATUS (AE_BAD_PARAMETER);
|
||||
}
|
||||
|
||||
|
||||
/* Find all tables of the requested type */
|
||||
|
||||
TableDesc = AcpiGbl_TableLists[TableType].Next;
|
||||
while (TableDesc)
|
||||
ListHead = &AcpiGbl_AcpiTables[TableType];
|
||||
do
|
||||
{
|
||||
/*
|
||||
* Delete all namespace entries owned by this table. Note that these
|
||||
* entries can appear anywhere in the namespace by virtue of the AML
|
||||
* "Scope" operator. Thus, we need to track ownership by an ID, not
|
||||
* simply a position within the hierarchy
|
||||
*/
|
||||
AcpiNsDeleteNamespaceByOwner (TableDesc->TableId);
|
||||
/* Delete the entire namespace under this table NTE */
|
||||
|
||||
TableDesc = TableDesc->Next;
|
||||
}
|
||||
AcpiNsDeleteNamespaceByOwner (ListHead->TableId);
|
||||
|
||||
/* Delete (or unmap) all tables of this type */
|
||||
/* Delete (or unmap) the actual table */
|
||||
|
||||
AcpiTbDeleteAcpiTable (TableType);
|
||||
|
||||
} while (ListHead != &AcpiGbl_AcpiTables[TableType]);
|
||||
|
||||
AcpiTbDeleteTablesByType (TableType);
|
||||
return_ACPI_STATUS (AE_OK);
|
||||
}
|
||||
|
||||
@ -375,6 +302,9 @@ AcpiUnloadTable (
|
||||
* function is not valid for the RSD PTR table since it does not
|
||||
* have a standard header and is fixed length.
|
||||
*
|
||||
* If the operation fails for any reason an appropriate status will
|
||||
* be returned and the contents of OutTableHeader are undefined.
|
||||
*
|
||||
******************************************************************************/
|
||||
|
||||
ACPI_STATUS
|
||||
@ -387,8 +317,9 @@ AcpiGetTableHeader (
|
||||
ACPI_STATUS Status;
|
||||
|
||||
|
||||
ACPI_FUNCTION_TRACE ("AcpiGetTableHeader");
|
||||
FUNCTION_TRACE ("AcpiGetTableHeader");
|
||||
|
||||
Status = AE_OK;
|
||||
|
||||
if ((Instance == 0) ||
|
||||
(TableType == ACPI_TABLE_RSDP) ||
|
||||
@ -400,12 +331,13 @@ AcpiGetTableHeader (
|
||||
/* Check the table type and instance */
|
||||
|
||||
if ((TableType > ACPI_TABLE_MAX) ||
|
||||
(ACPI_IS_SINGLE_TABLE (AcpiGbl_TableData[TableType].Flags) &&
|
||||
(AcpiGbl_AcpiTableData[TableType].Flags == ACPI_TABLE_SINGLE &&
|
||||
Instance > 1))
|
||||
{
|
||||
return_ACPI_STATUS (AE_BAD_PARAMETER);
|
||||
}
|
||||
|
||||
|
||||
/* Get a pointer to the entire table */
|
||||
|
||||
Status = AcpiTbGetTablePtr (TableType, Instance, &TblPtr);
|
||||
@ -414,17 +346,19 @@ AcpiGetTableHeader (
|
||||
return_ACPI_STATUS (Status);
|
||||
}
|
||||
|
||||
/* The function will return a NULL pointer if the table is not loaded */
|
||||
|
||||
/*
|
||||
* The function will return a NULL pointer if the table is not loaded
|
||||
*/
|
||||
if (TblPtr == NULL)
|
||||
{
|
||||
return_ACPI_STATUS (AE_NOT_EXIST);
|
||||
}
|
||||
|
||||
/* Copy the header to the caller's buffer */
|
||||
|
||||
ACPI_MEMCPY ((void *) OutTableHeader, (void *) TblPtr,
|
||||
sizeof (ACPI_TABLE_HEADER));
|
||||
/*
|
||||
* Copy the header to the caller's buffer
|
||||
*/
|
||||
MEMCPY ((void *) OutTableHeader, (void *) TblPtr,
|
||||
sizeof (ACPI_TABLE_HEADER));
|
||||
|
||||
return_ACPI_STATUS (Status);
|
||||
}
|
||||
@ -451,6 +385,9 @@ AcpiGetTableHeader (
|
||||
* copied into the OutBuffer->BufPtr buffer. This table will be
|
||||
* a complete table including the header.
|
||||
*
|
||||
* If the operation fails an appropriate status will be returned
|
||||
* and the contents of OutBuffer are undefined.
|
||||
*
|
||||
******************************************************************************/
|
||||
|
||||
ACPI_STATUS
|
||||
@ -461,34 +398,34 @@ AcpiGetTable (
|
||||
{
|
||||
ACPI_TABLE_HEADER *TblPtr;
|
||||
ACPI_STATUS Status;
|
||||
ACPI_SIZE TableLength;
|
||||
UINT32 RetBufLen;
|
||||
|
||||
|
||||
ACPI_FUNCTION_TRACE ("AcpiGetTable");
|
||||
FUNCTION_TRACE ("AcpiGetTable");
|
||||
|
||||
Status = AE_OK;
|
||||
|
||||
/* Parameter validation */
|
||||
|
||||
if (Instance == 0)
|
||||
/*
|
||||
* Must have a buffer
|
||||
*/
|
||||
if ((Instance == 0) ||
|
||||
(!RetBuffer) ||
|
||||
(!RetBuffer->Pointer) ||
|
||||
(!RetBuffer->Length))
|
||||
{
|
||||
return_ACPI_STATUS (AE_BAD_PARAMETER);
|
||||
}
|
||||
|
||||
Status = AcpiUtValidateBuffer (RetBuffer);
|
||||
if (ACPI_FAILURE (Status))
|
||||
{
|
||||
return_ACPI_STATUS (Status);
|
||||
}
|
||||
|
||||
/* Check the table type and instance */
|
||||
|
||||
if ((TableType > ACPI_TABLE_MAX) ||
|
||||
(ACPI_IS_SINGLE_TABLE (AcpiGbl_TableData[TableType].Flags) &&
|
||||
(AcpiGbl_AcpiTableData[TableType].Flags == ACPI_TABLE_SINGLE &&
|
||||
Instance > 1))
|
||||
{
|
||||
return_ACPI_STATUS (AE_BAD_PARAMETER);
|
||||
}
|
||||
|
||||
|
||||
/* Get a pointer to the entire table */
|
||||
|
||||
Status = AcpiTbGetTablePtr (TableType, Instance, &TblPtr);
|
||||
@ -498,39 +435,41 @@ AcpiGetTable (
|
||||
}
|
||||
|
||||
/*
|
||||
* AcpiTbGetTablePtr will return a NULL pointer if the
|
||||
* table is not loaded.
|
||||
* The function will return a NULL pointer if the table is not loaded
|
||||
*/
|
||||
if (TblPtr == NULL)
|
||||
{
|
||||
return_ACPI_STATUS (AE_NOT_EXIST);
|
||||
}
|
||||
|
||||
/* Get the table length */
|
||||
|
||||
/*
|
||||
* Got a table ptr, assume it's ok and copy it to the user's buffer
|
||||
*/
|
||||
if (TableType == ACPI_TABLE_RSDP)
|
||||
{
|
||||
/* RSD PTR is the only "table" without a header */
|
||||
|
||||
TableLength = sizeof (RSDP_DESCRIPTOR);
|
||||
/*
|
||||
* RSD PTR is the only "table" without a header
|
||||
*/
|
||||
RetBufLen = sizeof (ROOT_SYSTEM_DESCRIPTOR_POINTER);
|
||||
}
|
||||
else
|
||||
{
|
||||
TableLength = (ACPI_SIZE) TblPtr->Length;
|
||||
RetBufLen = TblPtr->Length;
|
||||
}
|
||||
|
||||
/* Validate/Allocate/Clear caller buffer */
|
||||
|
||||
Status = AcpiUtInitializeBuffer (RetBuffer, TableLength);
|
||||
if (ACPI_FAILURE (Status))
|
||||
/*
|
||||
* Verify we have space in the caller's buffer for the table
|
||||
*/
|
||||
if (RetBuffer->Length < RetBufLen)
|
||||
{
|
||||
return_ACPI_STATUS (Status);
|
||||
RetBuffer->Length = RetBufLen;
|
||||
return_ACPI_STATUS (AE_BUFFER_OVERFLOW);
|
||||
}
|
||||
|
||||
/* Copy the table to the buffer */
|
||||
RetBuffer->Length = RetBufLen;
|
||||
|
||||
MEMCPY ((void *) RetBuffer->Pointer, (void *) TblPtr, RetBufLen);
|
||||
|
||||
ACPI_MEMCPY ((void *) RetBuffer->Pointer, (void *) TblPtr, TableLength);
|
||||
return_ACPI_STATUS (AE_OK);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
|
||||
/******************************************************************************
|
||||
*
|
||||
* Module Name: tbfac - ACPI FAC* (FACP, FACS) utilities
|
||||
*
|
||||
* Module Name: tbtable - ACPI tables: FACP, FACS, and RSDP utilities
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
@ -38,9 +38,9 @@
|
||||
* The above copyright and patent license is granted only if the following
|
||||
* conditions are met:
|
||||
*
|
||||
* 3. Conditions
|
||||
* 3. Conditions
|
||||
*
|
||||
* 3.1. Redistribution of Source with Rights to Further Distribute Source.
|
||||
* 3.1. Redistribution of Source with Rights to Further Distribute Source.
|
||||
* Redistribution of source code of any substantial portion of the Covered
|
||||
* Code or modification with rights to further distribute source must include
|
||||
* the above Copyright Notice, the above License, this list of Conditions,
|
||||
@ -48,11 +48,11 @@
|
||||
* Licensee must cause all Covered Code to which Licensee contributes to
|
||||
* contain a file documenting the changes Licensee made to create that Covered
|
||||
* Code and the date of any change. Licensee must include in that file the
|
||||
* documentation of any changes made by any predecessor Licensee. Licensee
|
||||
* documentation of any changes made by any predecessor Licensee. Licensee
|
||||
* must include a prominent statement that the modification is derived,
|
||||
* directly or indirectly, from Original Intel Code.
|
||||
*
|
||||
* 3.2. Redistribution of Source with no Rights to Further Distribute Source.
|
||||
* 3.2. Redistribution of Source with no Rights to Further Distribute Source.
|
||||
* Redistribution of source code of any substantial portion of the Covered
|
||||
* Code or modification without rights to further distribute source must
|
||||
* include the following Disclaimer and Export Compliance provision in the
|
||||
@ -86,7 +86,7 @@
|
||||
* INSTALLATION, TRAINING OR OTHER SERVICES. INTEL WILL NOT PROVIDE ANY
|
||||
* UPDATES, ENHANCEMENTS OR EXTENSIONS. INTEL SPECIFICALLY DISCLAIMS ANY
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT AND FITNESS FOR A
|
||||
* PARTICULAR PURPOSE.
|
||||
* PARTICULAR PURPOSE.
|
||||
*
|
||||
* 4.2. IN NO EVENT SHALL INTEL HAVE ANY LIABILITY TO LICENSEE, ITS LICENSEES
|
||||
* OR ANY OTHER THIRD PARTY, FOR ANY LOST PROFITS, LOST DATA, LOSS OF USE OR
|
||||
@ -114,21 +114,182 @@
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
#define __TBFAC_C__
|
||||
#define __TBTABLE_C__
|
||||
|
||||
#include <acpi.h>
|
||||
#include <hardware.h>
|
||||
#include <tables.h>
|
||||
#include "acpi.h"
|
||||
#include "achware.h"
|
||||
#include "actables.h"
|
||||
|
||||
|
||||
#define _COMPONENT TABLE_MANAGER
|
||||
MODULE_NAME ("tbfac");
|
||||
MODULE_NAME ("tbtable");
|
||||
|
||||
|
||||
|
||||
/******************************************************************************
|
||||
/*******************************************************************************
|
||||
*
|
||||
* FUNCTION: TbGetTableFacs
|
||||
* FUNCTION: AcpiTbGetTableRsdt
|
||||
*
|
||||
* PARAMETERS: NumberOfTables - Where the table count is placed
|
||||
* TablePtr - Input buffer pointer, optional
|
||||
*
|
||||
* RETURN: Status
|
||||
*
|
||||
* DESCRIPTION: Load and validate the RSDP (ptr) and RSDT (table)
|
||||
*
|
||||
******************************************************************************/
|
||||
|
||||
ACPI_STATUS
|
||||
AcpiTbGetTableRsdt (
|
||||
UINT32 *NumberOfTables)
|
||||
{
|
||||
ACPI_STATUS Status = AE_OK;
|
||||
ACPI_TABLE_DESC TableInfo;
|
||||
|
||||
|
||||
FUNCTION_TRACE ("TbGetTableRsdt");
|
||||
|
||||
|
||||
/* Get the RSDP */
|
||||
|
||||
Status = AcpiTbFindRsdp (&TableInfo);
|
||||
if (ACPI_FAILURE (Status))
|
||||
{
|
||||
REPORT_WARNING ("RSDP structure not found");
|
||||
return_ACPI_STATUS (AE_NO_ACPI_TABLES);
|
||||
}
|
||||
|
||||
/* Save the table pointers and allocation info */
|
||||
|
||||
Status = AcpiTbInitTableDescriptor (ACPI_TABLE_RSDP, &TableInfo);
|
||||
if (ACPI_FAILURE (Status))
|
||||
{
|
||||
return_ACPI_STATUS (Status);
|
||||
}
|
||||
|
||||
AcpiGbl_RSDP = (ROOT_SYSTEM_DESCRIPTOR_POINTER *) TableInfo.Pointer;
|
||||
|
||||
|
||||
/*
|
||||
* RSDP structure was found; Now get the RSDT
|
||||
*/
|
||||
|
||||
DEBUG_PRINT (ACPI_INFO,
|
||||
("RSDP located at %p, RSDT physical=%p \n",
|
||||
AcpiGbl_RSDP, AcpiGbl_RSDP->RsdtPhysicalAddress));
|
||||
|
||||
Status = AcpiTbGetTable ((void *) AcpiGbl_RSDP->RsdtPhysicalAddress, NULL,
|
||||
&TableInfo);
|
||||
if (ACPI_FAILURE (Status))
|
||||
{
|
||||
DEBUG_PRINT (ACPI_ERROR,
|
||||
("GetRsdt: Could not get the RSDT, %s\n",
|
||||
AcpiCmFormatException (Status)));
|
||||
|
||||
if (Status == AE_BAD_SIGNATURE)
|
||||
{
|
||||
/* Invalid RSDT signature */
|
||||
|
||||
REPORT_ERROR ("Invalid signature where RSDP indicates RSDT should be located");
|
||||
|
||||
DUMP_BUFFER (AcpiGbl_RSDP, 20);
|
||||
|
||||
DEBUG_PRINT_RAW (ACPI_ERROR,
|
||||
("RSDP points to RSDT at %lXh, but RSDT signature is invalid\n",
|
||||
(void *) AcpiGbl_RSDP->RsdtPhysicalAddress));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* Always delete the RSDP mapping */
|
||||
|
||||
AcpiTbDeleteAcpiTable (ACPI_TABLE_RSDP);
|
||||
if (ACPI_FAILURE (Status))
|
||||
{
|
||||
return_ACPI_STATUS (Status);
|
||||
}
|
||||
|
||||
/* Save the table pointers and allocation info */
|
||||
|
||||
Status = AcpiTbInitTableDescriptor (ACPI_TABLE_RSDT, &TableInfo);
|
||||
if (ACPI_FAILURE (Status))
|
||||
{
|
||||
return_ACPI_STATUS (Status);
|
||||
}
|
||||
|
||||
AcpiGbl_RSDT = (ROOT_SYSTEM_DESCRIPTION_TABLE *) TableInfo.Pointer;
|
||||
|
||||
|
||||
/* Valid RSDT signature, verify the checksum */
|
||||
|
||||
DEBUG_PRINT (ACPI_INFO, ("RSDT located at %p\n", AcpiGbl_RSDT));
|
||||
|
||||
Status = AcpiTbVerifyTableChecksum ((ACPI_TABLE_HEADER *) AcpiGbl_RSDT);
|
||||
|
||||
/*
|
||||
* Determine the number of tables pointed to by the RSDT.
|
||||
* This is defined by the ACPI Specification to be the number of
|
||||
* pointers contained within the RSDT. The size of the pointers
|
||||
* is architecture-dependent.
|
||||
*/
|
||||
|
||||
*NumberOfTables = ((AcpiGbl_RSDT->header.Length -
|
||||
sizeof (ACPI_TABLE_HEADER)) / sizeof (void *));
|
||||
|
||||
|
||||
return_ACPI_STATUS (Status);
|
||||
}
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
*
|
||||
* FUNCTION: AcpiTbScanMemoryForRsdp
|
||||
*
|
||||
* PARAMETERS: StartAddress - Starting pointer for search
|
||||
* Length - Maximum length to search
|
||||
*
|
||||
* RETURN: Pointer to the RSDP if found, otherwise NULL.
|
||||
*
|
||||
* DESCRIPTION: Search a block of memory for the RSDP signature
|
||||
*
|
||||
******************************************************************************/
|
||||
|
||||
INT8 *
|
||||
AcpiTbScanMemoryForRsdp (
|
||||
INT8 *StartAddress,
|
||||
UINT32 Length)
|
||||
{
|
||||
UINT32 Offset;
|
||||
INT8 *MemRover;
|
||||
|
||||
|
||||
/* Search from given start addr for the requested length */
|
||||
|
||||
for (Offset = 0, MemRover = StartAddress;
|
||||
Offset < Length;
|
||||
Offset += RSDP_SCAN_STEP, MemRover += RSDP_SCAN_STEP)
|
||||
{
|
||||
|
||||
/* The signature and checksum must both be correct */
|
||||
|
||||
if (STRNCMP (MemRover, RSDP_SIG, sizeof (RSDP_SIG)-1) == 0 &&
|
||||
AcpiTbChecksum (MemRover,
|
||||
sizeof (ROOT_SYSTEM_DESCRIPTOR_POINTER)) == 0)
|
||||
{
|
||||
/* If so, we have found the RSDP */
|
||||
|
||||
return (MemRover);
|
||||
}
|
||||
}
|
||||
|
||||
/* Searched entire block, no RSDP was found */
|
||||
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
*
|
||||
* FUNCTION: AcpiTbFindRsdp
|
||||
*
|
||||
* PARAMETERS: *BufferPtr - If == NULL, read data from buffer
|
||||
* rather than searching memory
|
||||
@ -136,7 +297,158 @@
|
||||
*
|
||||
* RETURN: Status
|
||||
*
|
||||
* DESCRIPTION: Returns a pointer to the FACS as defined in FACP. This
|
||||
* DESCRIPTION: Search lower 1Mbyte of memory for the root system descriptor
|
||||
* pointer structure. If it is found, set *RSDP to point to it.
|
||||
*
|
||||
* NOTE: The RSDP must be either in the first 1K of the Extended
|
||||
* BIOS Data Area or between E0000 and FFFFF (ACPI 1.0 section
|
||||
* 5.2.2; assertion #421).
|
||||
*
|
||||
******************************************************************************/
|
||||
|
||||
ACPI_STATUS
|
||||
AcpiTbFindRsdp (
|
||||
ACPI_TABLE_DESC *TableInfo)
|
||||
{
|
||||
INT8 *TablePtr;
|
||||
INT8 *MemRover;
|
||||
ACPI_STATUS Status = AE_OK;
|
||||
|
||||
FUNCTION_TRACE ("TbFindRsdp");
|
||||
|
||||
if (AcpiGbl_AcpiInitData.RSDP_PhysicalAddress)
|
||||
{
|
||||
/*
|
||||
* RSDP address was supplied as part of the initialization data
|
||||
*/
|
||||
|
||||
Status = AcpiOsMapMemory(AcpiGbl_AcpiInitData.RSDP_PhysicalAddress,
|
||||
sizeof (ROOT_SYSTEM_DESCRIPTOR_POINTER),
|
||||
(void **)&TablePtr);
|
||||
|
||||
if (ACPI_FAILURE (Status))
|
||||
{
|
||||
return_ACPI_STATUS (Status);
|
||||
}
|
||||
|
||||
if (!TablePtr)
|
||||
{
|
||||
return_ACPI_STATUS (AE_NO_MEMORY);
|
||||
}
|
||||
|
||||
/*
|
||||
* The signature and checksum must both be correct
|
||||
*/
|
||||
|
||||
if (STRNCMP (TablePtr, RSDP_SIG, sizeof (RSDP_SIG)-1) != 0)
|
||||
{
|
||||
/* Nope, BAD Signature */
|
||||
|
||||
return_ACPI_STATUS (AE_BAD_SIGNATURE);
|
||||
}
|
||||
|
||||
/* The signature and checksum must both be correct */
|
||||
|
||||
if (AcpiTbChecksum (TablePtr,
|
||||
sizeof (ROOT_SYSTEM_DESCRIPTOR_POINTER)) != 0)
|
||||
{
|
||||
/* Nope, BAD Checksum */
|
||||
|
||||
return_ACPI_STATUS (AE_BAD_CHECKSUM);
|
||||
}
|
||||
|
||||
/* RSDP supplied is OK */
|
||||
/* If so, we have found the RSDP */
|
||||
|
||||
TableInfo->Pointer = (ACPI_TABLE_HEADER *) TablePtr;
|
||||
TableInfo->Length = sizeof (ROOT_SYSTEM_DESCRIPTOR_POINTER);
|
||||
TableInfo->Allocation = ACPI_MEM_MAPPED;
|
||||
TableInfo->BasePointer = TablePtr;
|
||||
|
||||
return_ACPI_STATUS (AE_OK);
|
||||
}
|
||||
|
||||
/*
|
||||
* Search memory for RSDP. First map low physical memory.
|
||||
*/
|
||||
|
||||
Status = AcpiOsMapMemory (LO_RSDP_WINDOW_BASE, LO_RSDP_WINDOW_SIZE,
|
||||
(void **)&TablePtr);
|
||||
|
||||
if (ACPI_FAILURE (Status))
|
||||
{
|
||||
return_ACPI_STATUS (Status);
|
||||
}
|
||||
|
||||
/*
|
||||
* 1) Search EBDA (low memory) paragraphs
|
||||
*/
|
||||
|
||||
if (NULL != (MemRover = AcpiTbScanMemoryForRsdp (TablePtr,
|
||||
LO_RSDP_WINDOW_SIZE)))
|
||||
{
|
||||
/* Found it, return pointer and don't delete the mapping */
|
||||
|
||||
TableInfo->Pointer = (ACPI_TABLE_HEADER *) MemRover;
|
||||
TableInfo->Length = LO_RSDP_WINDOW_SIZE;
|
||||
TableInfo->Allocation = ACPI_MEM_MAPPED;
|
||||
TableInfo->BasePointer = TablePtr;
|
||||
|
||||
return_ACPI_STATUS (AE_OK);
|
||||
}
|
||||
|
||||
/* This mapping is no longer needed */
|
||||
|
||||
AcpiOsUnmapMemory (TablePtr, LO_RSDP_WINDOW_SIZE);
|
||||
|
||||
|
||||
/*
|
||||
* 2) Search upper memory: 16-byte boundaries in E0000h-F0000h
|
||||
*/
|
||||
|
||||
Status = AcpiOsMapMemory (HI_RSDP_WINDOW_BASE, HI_RSDP_WINDOW_SIZE,
|
||||
(void **)&TablePtr);
|
||||
|
||||
if (ACPI_FAILURE (Status))
|
||||
{
|
||||
return_ACPI_STATUS (Status);
|
||||
}
|
||||
|
||||
if (NULL != (MemRover = AcpiTbScanMemoryForRsdp (TablePtr,
|
||||
HI_RSDP_WINDOW_SIZE)))
|
||||
{
|
||||
/* Found it, return pointer and don't delete the mapping */
|
||||
|
||||
TableInfo->Pointer = (ACPI_TABLE_HEADER *) MemRover;
|
||||
TableInfo->Length = HI_RSDP_WINDOW_SIZE;
|
||||
TableInfo->Allocation = ACPI_MEM_MAPPED;
|
||||
TableInfo->BasePointer = TablePtr;
|
||||
|
||||
return_ACPI_STATUS (AE_OK);
|
||||
}
|
||||
|
||||
/* This mapping is no longer needed */
|
||||
|
||||
AcpiOsUnmapMemory (TablePtr, HI_RSDP_WINDOW_SIZE);
|
||||
|
||||
|
||||
/* RSDP signature was not found */
|
||||
|
||||
return_ACPI_STATUS (AE_NOT_FOUND);
|
||||
}
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
*
|
||||
* FUNCTION: AcpiTbGetTableFacs
|
||||
*
|
||||
* PARAMETERS: *BufferPtr - If == NULL, read data from buffer
|
||||
* rather than searching memory
|
||||
* *TableInfo - Where the table info is returned
|
||||
*
|
||||
* RETURN: Status
|
||||
*
|
||||
* DESCRIPTION: Returns a pointer to the FACS as defined in FACP. This
|
||||
* function assumes the global variable FACP has been
|
||||
* correctly initialized. The value of FACP->FirmwareCtrl
|
||||
* into a far pointer which is returned.
|
||||
@ -144,14 +456,14 @@
|
||||
******************************************************************************/
|
||||
|
||||
ACPI_STATUS
|
||||
TbGetTableFacs (
|
||||
char *BufferPtr,
|
||||
AcpiTbGetTableFacs (
|
||||
INT8 *BufferPtr,
|
||||
ACPI_TABLE_DESC *TableInfo)
|
||||
{
|
||||
void *TablePtr = NULL;
|
||||
UINT32 Size;
|
||||
UINT8 Allocation;
|
||||
ACPI_STATUS Status = AE_OK;
|
||||
ACPI_STATUS Status = AE_OK;
|
||||
|
||||
|
||||
FUNCTION_TRACE ("TbGetTableFacs");
|
||||
@ -159,11 +471,11 @@ TbGetTableFacs (
|
||||
|
||||
/* Must have a valid FACP pointer */
|
||||
|
||||
if (!Gbl_FACP)
|
||||
if (!AcpiGbl_FACP)
|
||||
{
|
||||
return_ACPI_STATUS (AE_NO_ACPI_TABLES);
|
||||
}
|
||||
|
||||
|
||||
Size = sizeof (FIRMWARE_ACPI_CONTROL_STRUCTURE);
|
||||
if (BufferPtr)
|
||||
{
|
||||
@ -171,35 +483,30 @@ TbGetTableFacs (
|
||||
* Getting table from a file -- allocate a buffer and
|
||||
* read the table.
|
||||
*/
|
||||
TablePtr = CmAllocate (Size);
|
||||
TablePtr = AcpiCmAllocate (Size);
|
||||
if(!TablePtr)
|
||||
{
|
||||
return_ACPI_STATUS (AE_NO_MEMORY);
|
||||
}
|
||||
|
||||
MEMCPY (TablePtr, BufferPtr, Size);
|
||||
|
||||
|
||||
/* Save allocation type */
|
||||
|
||||
Allocation = ACPI_MEM_ALLOCATED;
|
||||
}
|
||||
|
||||
|
||||
else
|
||||
{
|
||||
/* Just map the physical memory to our address space */
|
||||
|
||||
Status = TbMapAcpiTable ((void *) Gbl_FACP->FirmwareCtrl, &Size, &TablePtr);
|
||||
|
||||
if (ACPI_FAILURE(Status))
|
||||
{
|
||||
return_ACPI_STATUS (Status);
|
||||
}
|
||||
|
||||
if (!TablePtr)
|
||||
Status = AcpiTbMapAcpiTable ((void *) AcpiGbl_FACP->FirmwareCtrl,
|
||||
&Size, &TablePtr);
|
||||
if (ACPI_FAILURE(Status))
|
||||
{
|
||||
return_ACPI_STATUS (AE_NO_MEMORY);
|
||||
return_ACPI_STATUS (Status);
|
||||
}
|
||||
|
||||
|
||||
/* Save allocation type */
|
||||
|
||||
Allocation = ACPI_MEM_MAPPED;
|
||||
@ -212,7 +519,7 @@ TbGetTableFacs (
|
||||
TableInfo->Length = Size;
|
||||
TableInfo->Allocation = Allocation;
|
||||
TableInfo->BasePointer = TablePtr;
|
||||
|
||||
|
||||
return_ACPI_STATUS (Status);
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user