narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[acpi] Allow for the possibility of overriding ACPI tables at link time 

Allow for linked-in code to override the mechanism used to locate an
ACPI table, thereby opening up the possibility of ACPI self-tests.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
pull/631/head
Michael Brown 2022-03-23 14:39:11 +00:00
parent dd35475438
commit 27825e5557
5 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/arch/x86/interface/pcbios/acpi_timer.c
View File

@ -107,7 +107,7 @@ static int acpi_timer_probe ( void ) {
unsigned int pm_tmr_blk;
/* Locate FADT */
fadt = acpi_find ( FADT_SIGNATURE, 0 );
fadt = acpi_table ( FADT_SIGNATURE, 0 );
if ( ! fadt ) {
DBGC ( &acpi_timer, "ACPI could not find FADT\n" );
return -ENOENT;

2
src/arch/x86/interface/pcbios/acpipwr.c
View File

@ -123,7 +123,7 @@ int acpi_poweroff ( void ) {
int rc;
/* Locate FADT */
fadt = acpi_find ( FADT_SIGNATURE, 0 );
fadt = acpi_table ( FADT_SIGNATURE, 0 );
if ( ! fadt ) {
DBGC ( colour, "ACPI could not find FADT\n" );
return -ENOENT;

22
src/core/acpi.c
View File

@ -38,6 +38,12 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
/** Colour for debug messages */
#define colour FADT_SIGNATURE
/** ACPI table finder
*
* May be overridden at link time to inject tables for testing.
*/
typeof ( acpi_find ) *acpi_finder __attribute__ (( weak )) = acpi_find;
/******************************************************************************
*
* Utility functions
@ -82,6 +88,18 @@ void acpi_fix_checksum ( struct acpi_header *acpi ) {
acpi->checksum -= acpi_checksum ( virt_to_user ( acpi ) );
}
/**
* Locate ACPI table
*
* @v signature Requested table signature
* @v index Requested index of table with this signature
* @ret table Table, or UNULL if not found
*/
userptr_t acpi_table ( uint32_t signature, unsigned int index ) {
return ( *acpi_finder ) ( signature, index );
}
/**
* Locate ACPI table via RSDT
*
@ -230,7 +248,7 @@ int acpi_extract ( uint32_t signature, void *data,
int rc;
/* Try DSDT first */
fadt = acpi_find ( FADT_SIGNATURE, 0 );
fadt = acpi_table ( FADT_SIGNATURE, 0 );
if ( fadt ) {
copy_from_user ( &fadtab, fadt, 0, sizeof ( fadtab ) );
dsdt = phys_to_user ( fadtab.dsdt );
@ -241,7 +259,7 @@ int acpi_extract ( uint32_t signature, void *data,
/* Try all SSDTs */
for ( i = 0 ; ; i++ ) {
ssdt = acpi_find ( SSDT_SIGNATURE, i );
ssdt = acpi_table ( SSDT_SIGNATURE, i );
if ( ! ssdt )
break;
if ( ( rc = acpi_zsdt ( ssdt, signature, data,

2
src/core/acpi_settings.c
View File

@ -88,7 +88,7 @@ static int acpi_settings_fetch ( struct settings *settings,
acpi_name ( tag_signature ), tag_index, tag_offset, tag_len );
/* Locate ACPI table */
table = acpi_find ( tag_signature, tag_index );
table = acpi_table ( tag_signature, tag_index );
if ( ! table )
return -ENOENT;

3
src/include/ipxe/acpi.h
View File

@ -386,7 +386,10 @@ acpi_describe ( struct interface *interface );
#define acpi_describe_TYPE( object_type ) \
typeof ( struct acpi_descriptor * ( object_type ) )
extern userptr_t ( * acpi_finder ) ( uint32_t signature, unsigned int index );
extern void acpi_fix_checksum ( struct acpi_header *acpi );
extern userptr_t acpi_table ( uint32_t signature, unsigned int index );
extern int acpi_extract ( uint32_t signature, void *data,
int ( * extract ) ( userptr_t zsdt, size_t len,
size_t offset, void *data ) );