RISC-V: ACPI: Update FADT and MADT versions
cover RISC-V: ACPI: Update FADT and MADT versions
Since RISC-V support is added only in ACPI 6.6, it should adhere to the expected FADT and MADT versions. Update them.
Sunil V L (3):
bios-tables-test-allowed-diff.h: Allow RISC-V FADT and MADT changes hw/riscv/virt-acpi-build.c: Update FADT and MADT versions tests/data/acpi/riscv64: Update expected FADT and MADT
hw/riscv/virt-acpi-build.c | 4 ++-- tests/data/acpi/riscv64/virt/APIC | Bin 116 -> 116 bytes tests/data/acpi/riscv64/virt/FACP | Bin 276 -> 276 bytes 3 files changed, 2 insertions(+), 2 deletions(-)
Signature · 1 line
2.43.0
PATCH 1/3 bios-tables-test-allowed-diff.h: Allow RISC-V FADT and MADT changes
--- tests/qtest/bios-tables-test-allowed-diff.h | 2 ++ 1 file changed, 2 insertions(+)
tests/qtest/bios-tables-test-allowed-diff.h +2 -0
@@ -1 +1,3 @@/* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/riscv64/virt/APIC" , +"tests/data/acpi/riscv64/virt/FACP",
Signature · 1 line
2.43.0
PATCH 2/3 hw/riscv/virt-acpi-build.c: Update FADT and MADT versions
In reply to Sunil V LRISC-V support is added only in ACPI 6.6. According to the ACPI 6.6 specification, the minor version of the Fixed ACPI Description Table (FADT) should be 6, and the Multiple APIC Description Table (MADT) should use revision 7. So, update the RISC-V FADT and MADT to reflect correct versions.
--- hw/riscv/virt-acpi-build.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
hw/riscv/virt-acpi-build.c +2 -2
@@ -429,7 +429,7 @@ static void build_fadt_rev6(GArray *table_data, {AcpiFadtData fadt = { .rev =6 , - .minor_ver =5 , + .minor_ver =6 , .flags =1 <<ACPI_FADT_F_HW_REDUCED_ACPI , .xdsdt_tbl_offset = &dsdt_tbl_offset, };
@@ -537,7 +537,7 @@ static void build_madt(GArray *table_data, hart_index_bits =imsic_num_bits (imsic_max_hart_per_socket); -AcpiTable table = { .sig ="APIC" , .rev =6 , .oem_id = s->oem_id, +AcpiTable table = { .sig ="APIC" , .rev =7 , .oem_id = s->oem_id, .oem_table_id = s->oem_table_id };acpi_table_begin (&table, table_data);
Signature · 1 line
2.43.0
Re: [PATCH 2/3] hw/riscv/virt-acpi-build.c: Update FADT and MADT versions
Quoted 25 lines · Sunil V L
RISC-V support is added only in ACPI 6.6. According to the ACPI 6.6 specification, the minor version of the Fixed ACPI Description Table (FADT) should be 6, and the Multiple APIC Description Table (MADT) should use revision 7. So, update the RISC-V FADT and MADT to reflect correct versions.
Signed-off-by Sunil V L <[email protected]>--- hw/riscv/virt-acpi-build.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)hw/riscv/virt-acpi-build.c +1
-1@@ -429,7 +429,7 @@ static void build_fadt_rev6(GArray *table_data, {AcpiFadtData fadt = { .rev =6 , - .minor_ver =5 , + .minor_ver =6 , .flags =1 <<ACPI_FADT_F_HW_REDUCED_ACPI , .xdsdt_tbl_offset = &dsdt_tbl_offset, };
hw/riscv/virt-acpi-build.c static void build_madt(GArray *table_data, · line 541
Quoted 6 lines
hw/riscv/virt-acpi-build.c +1
-1@@ -537,7 +537,7 @@ static void build_madt(GArray *table_data, hart_index_bits =imsic_num_bits (imsic_max_hart_per_socket); -AcpiTable table = { .sig ="APIC" , .rev =6 , .oem_id = s->oem_id, +AcpiTable table = { .sig ="APIC" , .rev =7 , .oem_id = s->oem_id, .oem_table_id = s->oem_table_id };
Add comments citing the spec version and chapter.
Quoted 3 lines
hw/riscv/virt-acpi-build.c +0
-0acpi_table_begin (&table, table_data);Signature · 1 line
2.43.0
PATCH 3/3 tests/data/acpi/riscv64: Update expected FADT and MADT
In reply to Sunil V LUpdate the expected tables for the version change.
/*
*
* ACPI Data Table [FACP]
*
* Format: [HexOffset DecimalOffset ByteLength] FieldName : FieldValue (in hex) */
[000h 0000 004h] Signature : "FACP" [Fixed ACPI Description Table (FADT)]
[004h 0004 004h] Table Length : 00000114
[008h 0008 001h] Revision : 06 -[009h 0009 001h] Checksum : 13 +[009h 0009 001h] Checksum : 12
[00Ah 0010 006h] Oem ID : "BOCHS "
[010h 0016 008h] Oem Table ID : "BXPC "
[018h 0024 004h] Oem Revision : 00000001
[01Ch 0028 004h] Asl Compiler ID : "BXPC"
[020h 0032 004h] Asl Compiler Revision : 00000001
[024h 0036 004h] FACS Address : 00000000
[028h 0040 004h] DSDT Address : 00000000
[02Ch 0044 001h] Model : 00
[02Dh 0045 001h] PM Profile : 00 [Unspecified]
[02Eh 0046 002h] SCI Interrupt : 0000
[030h 0048 004h] SMI Command Port : 00000000
[034h 0052 001h] ACPI Enable Value : 00
[035h 0053 001h] ACPI Disable Value : 00
[036h 0054 001h] S4BIOS Command : 00
[037h 0055 001h] P-State Control : 00
@@ -86,33 +86,33 @@
Use APIC Physical Destination Mode (V4) : 0
Hardware Reduced (V5) : 1
Low Power S0 Idle (V5) : 0
[074h 0116 00Ch] Reset Register : [Generic Address Structure]
[074h 0116 001h] Space ID : 00 [SystemMemory]
[075h 0117 001h] Bit Width : 00
[076h 0118 001h] Bit Offset : 00
[077h 0119 001h] Encoded Access Width : 00 [Undefined/Legacy]
[078h 0120 008h] Address : 0000000000000000
[080h 0128 001h] Value to cause reset : 00
[081h 0129 002h] ARM Flags (decoded below) : 0000
PSCI Compliant : 0
Must use HVC for PSCI : 0
-[083h 0131 001h] FADT Minor Revision : 05
+[083h 0131 001h] FADT Minor Revision : 06
[084h 0132 008h] FACS Address : 0000000000000000
[...]
/*
*
* ACPI Data Table [APIC]
*
* Format: [HexOffset DecimalOffset ByteLength] FieldName : FieldValue (in hex) */
[000h 0000 004h] Signature : "APIC" [Multiple APIC Description Table (MADT)]
[004h 0004 004h] Table Length : 00000074
-[008h 0008 001h] Revision : 06 -[009h 0009 001h] Checksum : B4 +[008h 0008 001h] Revision : 07 +[009h 0009 001h] Checksum : B3
[00Ah 0010 006h] Oem ID : "BOCHS "
[010h 0016 008h] Oem Table ID : "BXPC "
[...]
--- tests/data/acpi/riscv64/virt/APIC | Bin 116 -> 116 bytes tests/data/acpi/riscv64/virt/FACP | Bin 276 -> 276 bytes tests/qtest/bios-tables-test-allowed-diff.h | 2 -- 3 files changed, 2 deletions(-)
tests/data/acpi/riscv64/virt/APIC binary +0 -0
tests/data/acpi/riscv64/virt/FACP binary +0 -0
tests/qtest/bios-tables-test-allowed-diff.h +0 -2
@@ -1,3 +1 @@/* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/riscv64/virt/APIC" , -"tests/data/acpi/riscv64/virt/FACP",
Signature · 1 line
2.43.0
Quoted 2 lines · Sunil V L
Since RISC-V support is added only in ACPI 6.6, it should adhere to the expected FADT and MADT versions. Update them.
Seems legit
Risc maintainers, any feedback?
Quoted 12 lines
Sunil V L (3):
bios-tables-test-allowed-diff.h: Allow RISC-V FADT and MADT changeshw/riscv/virt-acpi-build.c: Update FADT and MADT versions tests/data/acpi/riscv64: Update expected FADT and MADThw/riscv/virt-acpi-build.c | 4 ++-- tests/data/acpi/riscv64/virt/APIC | Bin 116 -> 116 bytes tests/data/acpi/riscv64/virt/FACP | Bin 276 -> 276 bytes 3 files changed, 2 insertions(+), 2 deletions(-)Signature · 1 line
2.43.0