From: Nikos Nikoleris <nikos.nikoleris@arm.com>
To: kvm@vger.kernel.org, kvmarm@lists.linux.dev, andrew.jones@linux.dev
Cc: Alexandru Elisei <alexandru.elisei@arm.com>,
pbonzini@redhat.com, ricarkol@google.com
Subject: [PATCH v4 06/30] lib/acpi: Convert table names to Linux style
Date: Mon, 13 Feb 2023 10:17:35 +0000 [thread overview]
Message-ID: <20230213101759.2577077-7-nikos.nikoleris@arm.com> (raw)
In-Reply-To: <20230213101759.2577077-1-nikos.nikoleris@arm.com>
From: Alexandru Elisei <alexandru.elisei@arm.com>
kvm-unit-tests is about to import several table struct definitions from
Linux, convert the names of the existing tables to follow the Linux style.
This is purely a cosmetic change and no functional change is intended.
Signed-off-by: Nikos Nikoleris <nikos.nikoleris@arm.com>
---
lib/acpi.c | 16 ++++++++--------
lib/acpi.h | 10 +++++-----
lib/x86/setup.c | 2 +-
x86/s3.c | 4 ++--
x86/vmexit.c | 2 +-
5 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/lib/acpi.c b/lib/acpi.c
index 3f87711a..166ffd14 100644
--- a/lib/acpi.c
+++ b/lib/acpi.c
@@ -2,14 +2,14 @@
#include "acpi.h"
#ifdef CONFIG_EFI
-struct rsdp_descriptor *efi_rsdp = NULL;
+struct acpi_table_rsdp *efi_rsdp = NULL;
-void set_efi_rsdp(struct rsdp_descriptor *rsdp)
+void set_efi_rsdp(struct acpi_table_rsdp *rsdp)
{
efi_rsdp = rsdp;
}
-static struct rsdp_descriptor *get_rsdp(void)
+static struct acpi_table_rsdp *get_rsdp(void)
{
if (efi_rsdp == NULL)
printf("Can't find RSDP from UEFI, maybe set_efi_rsdp() was not called\n");
@@ -17,9 +17,9 @@ static struct rsdp_descriptor *get_rsdp(void)
return efi_rsdp;
}
#else
-static struct rsdp_descriptor *get_rsdp(void)
+static struct acpi_table_rsdp *get_rsdp(void)
{
- struct rsdp_descriptor *rsdp;
+ struct acpi_table_rsdp *rsdp;
unsigned long addr;
for (addr = 0xe0000; addr < 0x100000; addr += 16) {
@@ -37,14 +37,14 @@ static struct rsdp_descriptor *get_rsdp(void)
void *find_acpi_table_addr(u32 sig)
{
- struct rsdt_descriptor_rev1 *rsdt;
- struct rsdp_descriptor *rsdp;
+ struct acpi_table_rsdt_rev1 *rsdt;
+ struct acpi_table_rsdp *rsdp;
void *end;
int i;
/* FACS is special... */
if (sig == FACS_SIGNATURE) {
- struct fadt_descriptor_rev1 *fadt;
+ struct acpi_table_fadt_rev1 *fadt;
fadt = find_acpi_table_addr(FACP_SIGNATURE);
if (!fadt)
diff --git a/lib/acpi.h b/lib/acpi.h
index fad28792..229a6391 100644
--- a/lib/acpi.h
+++ b/lib/acpi.h
@@ -17,7 +17,7 @@
#define RSDP_SIGNATURE_8BYTE (ACPI_SIGNATURE_8BYTE('R', 'S', 'D', ' ', 'P', 'T', 'R', ' '))
-struct rsdp_descriptor { /* Root System Descriptor Pointer */
+struct acpi_table_rsdp { /* Root System Descriptor Pointer */
u64 signature; /* ACPI signature, contains "RSD PTR " */
u8 checksum; /* To make sum of struct == 0 */
u8 oem_id[6]; /* OEM identification */
@@ -45,12 +45,12 @@ struct acpi_table {
char data[];
};
-struct rsdt_descriptor_rev1 {
+struct acpi_table_rsdt_rev1 {
ACPI_TABLE_HEADER_DEF
u32 table_offset_entry[];
};
-struct fadt_descriptor_rev1 {
+struct acpi_table_fadt_rev1 {
ACPI_TABLE_HEADER_DEF /* ACPI common table header */
u32 firmware_ctrl; /* Physical address of FACS */
u32 dsdt; /* Physical address of DSDT */
@@ -92,7 +92,7 @@ struct fadt_descriptor_rev1 {
u8 reserved4b; /* Reserved */
};
-struct facs_descriptor_rev1 {
+struct acpi_table_facs_rev1 {
u32 signature; /* ACPI Signature */
u32 length; /* Length of structure, in bytes */
u32 hardware_signature; /* Hardware configuration signature */
@@ -103,7 +103,7 @@ struct facs_descriptor_rev1 {
u8 reserved3[40]; /* Reserved - must be zero */
};
-void set_efi_rsdp(struct rsdp_descriptor *rsdp);
+void set_efi_rsdp(struct acpi_table_rsdp *rsdp);
void *find_acpi_table_addr(u32 sig);
#endif
diff --git a/lib/x86/setup.c b/lib/x86/setup.c
index dd150300..d509a248 100644
--- a/lib/x86/setup.c
+++ b/lib/x86/setup.c
@@ -245,7 +245,7 @@ static efi_status_t setup_memory_allocator(efi_bootinfo_t *efi_bootinfo)
static efi_status_t setup_rsdp(efi_bootinfo_t *efi_bootinfo)
{
efi_status_t status;
- struct rsdp_descriptor *rsdp;
+ struct acpi_table_rsdp *rsdp;
/*
* RSDP resides in an EFI_ACPI_RECLAIM_MEMORY region, which is not used
diff --git a/x86/s3.c b/x86/s3.c
index 378d37ae..96db728c 100644
--- a/x86/s3.c
+++ b/x86/s3.c
@@ -4,7 +4,7 @@
static u32* find_resume_vector_addr(void)
{
- struct facs_descriptor_rev1 *facs = find_acpi_table_addr(FACS_SIGNATURE);
+ struct acpi_table_facs_rev1 *facs = find_acpi_table_addr(FACS_SIGNATURE);
if (!facs)
return 0;
printf("FACS is at %p\n", facs);
@@ -39,7 +39,7 @@ extern char resume_start, resume_end;
int main(int argc, char **argv)
{
- struct fadt_descriptor_rev1 *fadt = find_acpi_table_addr(FACP_SIGNATURE);
+ struct acpi_table_fadt_rev1 *fadt = find_acpi_table_addr(FACP_SIGNATURE);
volatile u32 *resume_vector_ptr = find_resume_vector_addr();
char *addr, *resume_vec = (void*)0x1000;
diff --git a/x86/vmexit.c b/x86/vmexit.c
index 865ccf6b..6987aca0 100644
--- a/x86/vmexit.c
+++ b/x86/vmexit.c
@@ -206,7 +206,7 @@ int pm_tmr_blk;
static void inl_pmtimer(void)
{
if (!pm_tmr_blk) {
- struct fadt_descriptor_rev1 *fadt;
+ struct acpi_table_fadt_rev1 *fadt;
fadt = find_acpi_table_addr(FACP_SIGNATURE);
pm_tmr_blk = fadt->pm_tmr_blk;
--
2.25.1
next prev parent reply other threads:[~2023-02-13 10:18 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-13 10:17 [PATCH v4 00/30] EFI and ACPI support for arm64 Nikos Nikoleris
2023-02-13 10:17 ` [PATCH v4 01/30] lib: Move acpi header and implementation to lib Nikos Nikoleris
2023-02-13 10:17 ` [PATCH v4 02/30] x86: Move x86_64-specific EFI CFLAGS to x86_64 Makefile Nikos Nikoleris
2023-02-13 10:17 ` [PATCH v4 03/30] arm/Makefile.common: Compile lib/acpi.c if CONFIG_EFI=y Nikos Nikoleris
2023-02-13 10:17 ` [PATCH v4 04/30] lib: Apply Lindent to acpi.{c,h} Nikos Nikoleris
2023-03-09 7:11 ` Shaoqin Huang
2023-03-21 17:32 ` Andrew Jones
2023-03-22 10:05 ` Nikos Nikoleris
2023-02-13 10:17 ` [PATCH v4 05/30] lib: Fix style for acpi.{c,h} Nikos Nikoleris
2023-02-13 10:17 ` Nikos Nikoleris [this message]
2023-02-13 10:17 ` [PATCH v4 07/30] x86: Avoid references to fields of ACPI tables Nikos Nikoleris
2023-02-13 10:17 ` [PATCH v4 08/30] lib/acpi: Ensure all struct definition for ACPI tables are packed Nikos Nikoleris
2023-02-13 10:17 ` [PATCH v4 09/30] lib/acpi: Add support for the XSDT table Nikos Nikoleris
2023-02-13 10:17 ` [PATCH v4 10/30] lib/acpi: Extend the definition of the FADT table Nikos Nikoleris
2023-02-13 10:17 ` [PATCH v4 11/30] devicetree: Check that fdt is not NULL in dt_available() Nikos Nikoleris
2023-02-13 10:17 ` [PATCH v4 12/30] arm64: Add support for setting up the PSCI conduit through ACPI Nikos Nikoleris
2023-03-21 17:31 ` Andrew Jones
2023-02-13 10:17 ` [PATCH v4 13/30] arm64: Add support for discovering the UART " Nikos Nikoleris
2023-02-13 10:17 ` [PATCH v4 14/30] arm64: Add support for timer initialization " Nikos Nikoleris
2023-02-13 10:17 ` [PATCH v4 15/30] arm64: Add support for cpu " Nikos Nikoleris
2023-02-13 10:17 ` [PATCH v4 16/30] arm64: Add support for gic " Nikos Nikoleris
2023-03-30 6:46 ` Shaoqin Huang
2023-02-13 10:17 ` [PATCH v4 17/30] lib/printf: Support for precision modifier in printf Nikos Nikoleris
2023-02-13 10:17 ` [PATCH v4 18/30] lib/printf: Add support for printing wide strings Nikos Nikoleris
2023-02-13 10:17 ` [PATCH v4 19/30] lib/efi: Add support for getting the cmdline Nikos Nikoleris
2023-02-13 10:17 ` [PATCH v4 20/30] arm/arm64: Rename etext to _etext Nikos Nikoleris
2023-02-13 10:17 ` [PATCH v4 21/30] lib: Avoid ms_abi for calls related to EFI on arm64 Nikos Nikoleris
2023-02-13 10:17 ` [PATCH v4 22/30] arm64: Add a new type of memory type flag MR_F_RESERVED Nikos Nikoleris
2023-02-13 10:17 ` [PATCH v4 23/30] arm64: Add a setup sequence for systems that boot through EFI Nikos Nikoleris
2023-04-25 7:04 ` Shaoqin Huang
2023-04-25 9:09 ` Nikos Nikoleris
2023-04-25 18:31 ` Andrew Jones
2023-02-13 10:17 ` [PATCH v4 24/30] arm64: Copy code from GNU-EFI Nikos Nikoleris
2023-02-13 10:17 ` [PATCH v4 25/30] arm64: Change GNU-EFI imported code to use defined types Nikos Nikoleris
2023-03-30 6:49 ` Shaoqin Huang
2023-02-13 10:17 ` [PATCH v4 26/30] arm64: Use code from the gnu-efi when booting with EFI Nikos Nikoleris
2023-02-13 10:17 ` [PATCH v4 27/30] lib: Avoid external dependency in libelf Nikos Nikoleris
2023-02-13 10:17 ` [PATCH v4 28/30] arm64: Add support for efi in Makefile Nikos Nikoleris
2023-03-21 18:21 ` Andrew Jones
2023-02-13 10:17 ` [PATCH v4 29/30] lib: arm: Print test exit status Nikos Nikoleris
2023-02-13 10:17 ` [PATCH v4 30/30] arm64: Add an efi/run script Nikos Nikoleris
2023-03-21 18:41 ` Andrew Jones
2023-03-22 10:02 ` Nikos Nikoleris
2023-03-22 11:24 ` Andrew Jones
2023-03-22 11:57 ` Nikos Nikoleris
2023-03-22 12:32 ` Andrew Jones
2023-03-22 19:09 ` Nikos Nikoleris
2023-03-23 17:52 ` Andrew Jones
2023-03-28 9:03 ` Alexandru Elisei
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230213101759.2577077-7-nikos.nikoleris@arm.com \
--to=nikos.nikoleris@arm.com \
--cc=alexandru.elisei@arm.com \
--cc=andrew.jones@linux.dev \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.linux.dev \
--cc=pbonzini@redhat.com \
--cc=ricarkol@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).