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 platforms that provide ACPI tables individually 

The ACPI API currently expects platforms to provide access to a single
contiguous ACPI table.  Some platforms (e.g. Linux userspace) do not
provide a convenient way to obtain the entire ACPI table, but do
provide access to individual tables.

All iPXE consumers of the ACPI API require access only to individual
tables.

Redefine the internal API to make acpi_find() an API method, with all
existing implementations delegating to the current RSDT-based
implementation.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
pull/310/head
Michael Brown 2021-03-01 00:08:23 +00:00
parent d175936b78
commit 9776f6ece1
8 changed files with 46 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/arch/x86/include/ipxe/rsdp.h
View File

@ -15,4 +15,17 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
#define ACPI_PREFIX_rsdp __rsdp_
#endif
/**
* 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
*/
static inline __attribute__ (( always_inline )) userptr_t
ACPI_INLINE ( rsdp, acpi_find ) ( uint32_t signature, unsigned int index ) {
return acpi_find_via_rsdt ( signature, index );
}
#endif /* _IPXE_RSDP_H */

1
src/arch/x86/interface/pcbios/rsdp.c
View File

@ -123,3 +123,4 @@ static userptr_t rsdp_find_rsdt ( void ) {
}
PROVIDE_ACPI ( rsdp, acpi_find_rsdt, rsdp_find_rsdt );
PROVIDE_ACPI_INLINE ( rsdp, acpi_find );

4
src/core/acpi.c
View File

@ -83,13 +83,13 @@ void acpi_fix_checksum ( struct acpi_header *acpi ) {
}
/**
* Locate ACPI table
* Locate ACPI table via RSDT
*
* @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_find ( uint32_t signature, unsigned int index ) {
userptr_t acpi_find_via_rsdt ( uint32_t signature, unsigned int index ) {
struct acpi_header acpi;
struct acpi_rsdt *rsdtab;
typeof ( rsdtab->entry[0] ) entry;

2
src/core/null_acpi.c
View File

@ -1,3 +1,3 @@
#include <ipxe/acpi.h>
PROVIDE_ACPI_INLINE ( null, acpi_find_rsdt );
PROVIDE_ACPI_INLINE ( null, acpi_find );

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

@ -355,6 +355,8 @@ struct acpi_model {
#define PROVIDE_ACPI_INLINE( _subsys, _api_func ) \
PROVIDE_SINGLE_API_INLINE ( ACPI_PREFIX_ ## _subsys, _api_func )
extern userptr_t acpi_find_via_rsdt ( uint32_t signature, unsigned int index );
/* Include all architecture-independent ACPI API headers */
#include <ipxe/null_acpi.h>
#include <ipxe/efi/efi_acpi.h>
@ -369,13 +371,21 @@ struct acpi_model {
*/
userptr_t acpi_find_rsdt ( void );
/**
* 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_find ( uint32_t signature, unsigned int index );
extern struct acpi_descriptor *
acpi_describe ( struct interface *interface );
#define acpi_describe_TYPE( object_type ) \
typeof ( struct acpi_descriptor * ( object_type ) )
extern void acpi_fix_checksum ( struct acpi_header *acpi );
extern userptr_t acpi_find ( uint32_t signature, unsigned int index );
extern int acpi_sx ( uint32_t signature );
extern void acpi_add ( struct acpi_descriptor *desc );
extern void acpi_del ( struct acpi_descriptor *desc );

13
src/include/ipxe/efi/efi_acpi.h
View File

@ -15,4 +15,17 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
#define ACPI_PREFIX_efi __efi_
#endif
/**
* 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
*/
static inline __attribute__ (( always_inline )) userptr_t
ACPI_INLINE ( efi, acpi_find ) ( uint32_t signature, unsigned int index ) {
return acpi_find_via_rsdt ( signature, index );
}
#endif /* _IPXE_EFI_ACPI_H */

6
src/include/ipxe/null_acpi.h
View File

@ -15,8 +15,10 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
#define ACPI_PREFIX_null __null_
#endif
static inline __always_inline userptr_t
ACPI_INLINE ( null, acpi_find_rsdt ) ( void ) {
static inline __attribute__ (( always_inline )) userptr_t
ACPI_INLINE ( null, acpi_find ) ( uint32_t signature __unused,
unsigned int index __unused ) {
return UNULL;
}

1
src/interface/efi/efi_acpi.c
View File

@ -54,3 +54,4 @@ static userptr_t efi_find_rsdt ( void ) {
}
PROVIDE_ACPI ( efi, acpi_find_rsdt, efi_find_rsdt );
PROVIDE_ACPI_INLINE ( efi, acpi_find );