Skip to content

Commit 6630cbc

Browse files
kirylbp3tk0v
authored andcommitted
x86/acpi: Rename fields in the acpi_madt_multiproc_wakeup structure
In order to support MADT wakeup structure version 1, provide more appropriate names for the fields in the structure. Rename 'mailbox_version' to 'version'. This field signifies the version of the structure and the related protocols, rather than the version of the mailbox. This field has not been utilized in the code thus far. Rename 'base_address' to 'mailbox_address' to clarify the kind of address it represents. In version 1, the structure includes the reset vector address. Clear and distinct naming helps to prevent any confusion. Signed-off-by: Kirill A. Shutemov <[email protected]> Signed-off-by: Borislav Petkov (AMD) <[email protected]> Reviewed-by: Kai Huang <[email protected]> Reviewed-by: Kuppuswamy Sathyanarayanan <[email protected]> Reviewed-by: Thomas Gleixner <[email protected]> Acked-by: Rafael J. Wysocki <[email protected]> Tested-by: Tao Liu <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 5574b36 commit 6630cbc

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

arch/x86/kernel/acpi/madt_wakeup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ int __init acpi_parse_mp_wake(union acpi_subtable_headers *header,
7575

7676
acpi_table_print_madt_entry(&header->common);
7777

78-
acpi_mp_wake_mailbox_paddr = mp_wake->base_address;
78+
acpi_mp_wake_mailbox_paddr = mp_wake->mailbox_address;
7979

8080
cpu_hotplug_disable_offlining();
8181

include/acpi/actbl2.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1194,9 +1194,9 @@ struct acpi_madt_generic_translator {
11941194

11951195
struct acpi_madt_multiproc_wakeup {
11961196
struct acpi_subtable_header header;
1197-
u16 mailbox_version;
1197+
u16 version;
11981198
u32 reserved; /* reserved - must be zero */
1199-
u64 base_address;
1199+
u64 mailbox_address;
12001200
};
12011201

12021202
#define ACPI_MULTIPROC_WAKEUP_MB_OS_SIZE 2032

0 commit comments

Comments
 (0)