* [Qemu-devel] [PATCH v3 00/13] tests: acpi: add UEFI (ARM) testing support
@ 2019-04-25 5:34 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-04-25 5:34 UTC (permalink / raw)
To: qemu-devel
Cc: Laszlo Ersek, Michael S. Tsirkin, Gonglei,
Philippe Mathieu-Daudé,
Shannon Zhao, Wei Yang, Andrew Jones, Shameer Kolothum,
Ben Warren
Changelog:
- from v2:
* rebase on top current master (with UEFI blobs merged)
* added a Makefile rule to include bios-tables-test to aarch64 tests by
default into 11/13 (kept Reviewed-bys)
* other trivial fixes and cleanups (see per patch changelogs)
- from v1:
* rebase on top
(1) [PATCH for-4.1 v3 00/12] bundle edk2 platform firmware with QEMU
let me to drop edk2 images and drop Makefile magic to unpack them,
Laszlo's series conveniently does it all for me.
* use new path/names for firmware images as supplied by [1]
* reorder patches a bit so that UEFI parts would go after generic changes
Series adds support for ACPI tables located above 4G. It adds 64-bit handling
necessary for testing arm/virt board (i.e. might be not complete wrt spec) and
uses recently merged UEFI (AVMF) firmware/test disk image which provides
an entry point[1] for fetching ACPI tables (RSDP pointer).
Git tree for testing:
https://github.com/imammedo/qemu.git acpi_arm_tests_v3
Ref to previos vesrsion:
[Qemu-devel] [PATCH for 4.1 v2 00/13] tests: acpi: add UEFI (ARM) testing support
https://www.mail-archive.com/qemu-devel@nongnu.org/msg607564.html
CC: Laszlo Ersek <lersek@redhat.com>
CC: "Michael S. Tsirkin" <mst@redhat.com>
CC: Gonglei <arei.gonglei@huawei.com>
CC: Philippe Mathieu-Daudé <philmd@redhat.com>
CC: Shannon Zhao <shannon.zhaosl@gmail.com>
CC: Wei Yang <richardw.yang@linux.intel.com>
CC: Andrew Jones <drjones@redhat.com>
CC: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
CC: Ben Warren <ben@skyportsystems.com>
Igor Mammedov (13):
tests: acpi: make RSDT test routine handle XSDT
tests: acpi: rename acpi_parse_rsdp_table() into
acpi_fetch_rsdp_table()
tests: acpi: make pointer to RSDP 64bit
tests: acpi: fetch X_DSDT if pointer to DSDT is 0
tests: acpi: skip FACS table if board uses hw reduced ACPI profile
tests: acpi: move boot_sector_init() into x86 tests branch
tests: acpi: add acpi_find_rsdp_address_uefi() helper
tests: acpi: add a way to start tests with UEFI firmware
tests: acpi: ignore SMBIOS tests when UEFI firmware is used
tests: add expected ACPI tables for arm/virt board
tests: acpi: add simple arm/virt testcase
tests: acpi: refactor rebuild-expected-aml.sh to dump ACPI tables for
a specified list of targets
tests: acpi: print error unable to dump ACPI table during rebuild
tests/acpi-utils.h | 5 +-
tests/Makefile.include | 1 +
tests/acpi-utils.c | 58 ++++++++++----
tests/bios-tables-test.c | 133 ++++++++++++++++++++++++--------
tests/data/acpi/rebuild-expected-aml.sh | 23 +++---
tests/data/acpi/virt/APIC | Bin 0 -> 168 bytes
tests/data/acpi/virt/DSDT | Bin 0 -> 18476 bytes
tests/data/acpi/virt/FACP | Bin 0 -> 268 bytes
tests/data/acpi/virt/GTDT | Bin 0 -> 96 bytes
tests/data/acpi/virt/MCFG | Bin 0 -> 60 bytes
tests/data/acpi/virt/SPCR | Bin 0 -> 80 bytes
tests/vmgenid-test.c | 2 +-
12 files changed, 162 insertions(+), 60 deletions(-)
create mode 100644 tests/data/acpi/virt/APIC
create mode 100644 tests/data/acpi/virt/DSDT
create mode 100644 tests/data/acpi/virt/FACP
create mode 100644 tests/data/acpi/virt/GTDT
create mode 100644 tests/data/acpi/virt/MCFG
create mode 100644 tests/data/acpi/virt/SPCR
--
2.7.4
^ permalink raw reply [flat|nested] 88+ messages in thread
* [Qemu-devel] [PATCH v3 00/13] tests: acpi: add UEFI (ARM) testing support
@ 2019-04-25 5:34 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-04-25 5:34 UTC (permalink / raw)
To: qemu-devel
Cc: Andrew Jones, Ben Warren, Michael S. Tsirkin, Laszlo Ersek,
Shameer Kolothum, Shannon Zhao, Gonglei, Wei Yang,
Philippe Mathieu-Daudé
Changelog:
- from v2:
* rebase on top current master (with UEFI blobs merged)
* added a Makefile rule to include bios-tables-test to aarch64 tests by
default into 11/13 (kept Reviewed-bys)
* other trivial fixes and cleanups (see per patch changelogs)
- from v1:
* rebase on top
(1) [PATCH for-4.1 v3 00/12] bundle edk2 platform firmware with QEMU
let me to drop edk2 images and drop Makefile magic to unpack them,
Laszlo's series conveniently does it all for me.
* use new path/names for firmware images as supplied by [1]
* reorder patches a bit so that UEFI parts would go after generic changes
Series adds support for ACPI tables located above 4G. It adds 64-bit handling
necessary for testing arm/virt board (i.e. might be not complete wrt spec) and
uses recently merged UEFI (AVMF) firmware/test disk image which provides
an entry point[1] for fetching ACPI tables (RSDP pointer).
Git tree for testing:
https://github.com/imammedo/qemu.git acpi_arm_tests_v3
Ref to previos vesrsion:
[Qemu-devel] [PATCH for 4.1 v2 00/13] tests: acpi: add UEFI (ARM) testing support
https://www.mail-archive.com/qemu-devel@nongnu.org/msg607564.html
CC: Laszlo Ersek <lersek@redhat.com>
CC: "Michael S. Tsirkin" <mst@redhat.com>
CC: Gonglei <arei.gonglei@huawei.com>
CC: Philippe Mathieu-Daudé <philmd@redhat.com>
CC: Shannon Zhao <shannon.zhaosl@gmail.com>
CC: Wei Yang <richardw.yang@linux.intel.com>
CC: Andrew Jones <drjones@redhat.com>
CC: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
CC: Ben Warren <ben@skyportsystems.com>
Igor Mammedov (13):
tests: acpi: make RSDT test routine handle XSDT
tests: acpi: rename acpi_parse_rsdp_table() into
acpi_fetch_rsdp_table()
tests: acpi: make pointer to RSDP 64bit
tests: acpi: fetch X_DSDT if pointer to DSDT is 0
tests: acpi: skip FACS table if board uses hw reduced ACPI profile
tests: acpi: move boot_sector_init() into x86 tests branch
tests: acpi: add acpi_find_rsdp_address_uefi() helper
tests: acpi: add a way to start tests with UEFI firmware
tests: acpi: ignore SMBIOS tests when UEFI firmware is used
tests: add expected ACPI tables for arm/virt board
tests: acpi: add simple arm/virt testcase
tests: acpi: refactor rebuild-expected-aml.sh to dump ACPI tables for
a specified list of targets
tests: acpi: print error unable to dump ACPI table during rebuild
tests/acpi-utils.h | 5 +-
tests/Makefile.include | 1 +
tests/acpi-utils.c | 58 ++++++++++----
tests/bios-tables-test.c | 133 ++++++++++++++++++++++++--------
tests/data/acpi/rebuild-expected-aml.sh | 23 +++---
tests/data/acpi/virt/APIC | Bin 0 -> 168 bytes
tests/data/acpi/virt/DSDT | Bin 0 -> 18476 bytes
tests/data/acpi/virt/FACP | Bin 0 -> 268 bytes
tests/data/acpi/virt/GTDT | Bin 0 -> 96 bytes
tests/data/acpi/virt/MCFG | Bin 0 -> 60 bytes
tests/data/acpi/virt/SPCR | Bin 0 -> 80 bytes
tests/vmgenid-test.c | 2 +-
12 files changed, 162 insertions(+), 60 deletions(-)
create mode 100644 tests/data/acpi/virt/APIC
create mode 100644 tests/data/acpi/virt/DSDT
create mode 100644 tests/data/acpi/virt/FACP
create mode 100644 tests/data/acpi/virt/GTDT
create mode 100644 tests/data/acpi/virt/MCFG
create mode 100644 tests/data/acpi/virt/SPCR
--
2.7.4
^ permalink raw reply [flat|nested] 88+ messages in thread
* [Qemu-devel] [PATCH v3 01/13] tests: acpi: make RSDT test routine handle XSDT
@ 2019-04-25 5:34 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-04-25 5:34 UTC (permalink / raw)
To: qemu-devel
Cc: Laszlo Ersek, Michael S. Tsirkin, Gonglei,
Philippe Mathieu-Daudé,
Shannon Zhao, Wei Yang, Andrew Jones, Shameer Kolothum,
Ben Warren
If RSDP revision is more than 0 fetch table pointed by XSDT
and fallback to legacy RSDT table otherwise.
While at it drop unused acpi_get_xsdt_address().
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
PS:
it doesn't affect existing pc/q35 machines as they use RSDP.revision == 0
but it will be used by followup patch to enable testing arm/virt
board which uses provides XSDT table.
---
tests/acpi-utils.h | 3 +--
tests/acpi-utils.c | 14 +-------------
tests/bios-tables-test.c | 18 +++++++++++++-----
3 files changed, 15 insertions(+), 20 deletions(-)
diff --git a/tests/acpi-utils.h b/tests/acpi-utils.h
index ef388bb..8c68201 100644
--- a/tests/acpi-utils.h
+++ b/tests/acpi-utils.h
@@ -46,8 +46,7 @@ typedef struct {
uint8_t acpi_calc_checksum(const uint8_t *data, int len);
uint32_t acpi_find_rsdp_address(QTestState *qts);
-uint64_t acpi_get_xsdt_address(uint8_t *rsdp_table);
-void acpi_parse_rsdp_table(QTestState *qts, uint32_t addr, uint8_t *rsdp_table);
+void acpi_parse_rsdp_table(QTestState *qts, uint64_t addr, uint8_t *rsdp_table);
void acpi_fetch_table(QTestState *qts, uint8_t **aml, uint32_t *aml_len,
const uint8_t *addr_ptr, const char *sig,
bool verify_checksum);
diff --git a/tests/acpi-utils.c b/tests/acpi-utils.c
index cc33b46..9a6d1d3 100644
--- a/tests/acpi-utils.c
+++ b/tests/acpi-utils.c
@@ -51,19 +51,7 @@ uint32_t acpi_find_rsdp_address(QTestState *qts)
return off;
}
-uint64_t acpi_get_xsdt_address(uint8_t *rsdp_table)
-{
- uint64_t xsdt_physical_address;
- uint8_t revision = rsdp_table[15 /* Revision offset */];
-
- /* We must have revision 2 if we're looking for an XSDT pointer */
- g_assert(revision == 2);
-
- memcpy(&xsdt_physical_address, &rsdp_table[24 /* XsdtAddress offset */], 8);
- return le64_to_cpu(xsdt_physical_address);
-}
-
-void acpi_parse_rsdp_table(QTestState *qts, uint32_t addr, uint8_t *rsdp_table)
+void acpi_parse_rsdp_table(QTestState *qts, uint64_t addr, uint8_t *rsdp_table)
{
uint8_t revision;
diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
index a506dcb..24bd102 100644
--- a/tests/bios-tables-test.c
+++ b/tests/bios-tables-test.c
@@ -107,17 +107,25 @@ static void test_acpi_rsdp_table(test_data *data)
}
}
-static void test_acpi_rsdt_table(test_data *data)
+static void test_acpi_rxsdt_table(test_data *data)
{
+ const char *sig = "RSDT";
AcpiSdtTable rsdt = {};
+ int entry_size = 4;
+ int addr_off = 16 /* RsdtAddress */;
uint8_t *ent;
- /* read RSDT table */
+ if (data->rsdp_table[15 /* Revision offset */] != 0) {
+ addr_off = 24 /* XsdtAddress */;
+ entry_size = 8;
+ sig = "XSDT";
+ }
+ /* read [RX]SDT table */
acpi_fetch_table(data->qts, &rsdt.aml, &rsdt.aml_len,
- &data->rsdp_table[16 /* RsdtAddress */], "RSDT", true);
+ &data->rsdp_table[addr_off], sig, true);
/* Load all tables and add to test list directly RSDT referenced tables */
- ACPI_FOREACH_RSDT_ENTRY(rsdt.aml, rsdt.aml_len, ent, 4 /* Entry size */) {
+ ACPI_FOREACH_RSDT_ENTRY(rsdt.aml, rsdt.aml_len, ent, entry_size) {
AcpiSdtTable ssdt_table = {};
acpi_fetch_table(data->qts, &ssdt_table.aml, &ssdt_table.aml_len, ent,
@@ -521,7 +529,7 @@ static void test_acpi_one(const char *params, test_data *data)
data->tables = g_array_new(false, true, sizeof(AcpiSdtTable));
test_acpi_rsdp_address(data);
test_acpi_rsdp_table(data);
- test_acpi_rsdt_table(data);
+ test_acpi_rxsdt_table(data);
test_acpi_fadt_table(data);
if (iasl) {
--
2.7.4
^ permalink raw reply related [flat|nested] 88+ messages in thread
* [Qemu-devel] [PATCH v3 01/13] tests: acpi: make RSDT test routine handle XSDT
@ 2019-04-25 5:34 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-04-25 5:34 UTC (permalink / raw)
To: qemu-devel
Cc: Andrew Jones, Ben Warren, Michael S. Tsirkin, Laszlo Ersek,
Shameer Kolothum, Shannon Zhao, Gonglei, Wei Yang,
Philippe Mathieu-Daudé
If RSDP revision is more than 0 fetch table pointed by XSDT
and fallback to legacy RSDT table otherwise.
While at it drop unused acpi_get_xsdt_address().
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
PS:
it doesn't affect existing pc/q35 machines as they use RSDP.revision == 0
but it will be used by followup patch to enable testing arm/virt
board which uses provides XSDT table.
---
tests/acpi-utils.h | 3 +--
tests/acpi-utils.c | 14 +-------------
tests/bios-tables-test.c | 18 +++++++++++++-----
3 files changed, 15 insertions(+), 20 deletions(-)
diff --git a/tests/acpi-utils.h b/tests/acpi-utils.h
index ef388bb..8c68201 100644
--- a/tests/acpi-utils.h
+++ b/tests/acpi-utils.h
@@ -46,8 +46,7 @@ typedef struct {
uint8_t acpi_calc_checksum(const uint8_t *data, int len);
uint32_t acpi_find_rsdp_address(QTestState *qts);
-uint64_t acpi_get_xsdt_address(uint8_t *rsdp_table);
-void acpi_parse_rsdp_table(QTestState *qts, uint32_t addr, uint8_t *rsdp_table);
+void acpi_parse_rsdp_table(QTestState *qts, uint64_t addr, uint8_t *rsdp_table);
void acpi_fetch_table(QTestState *qts, uint8_t **aml, uint32_t *aml_len,
const uint8_t *addr_ptr, const char *sig,
bool verify_checksum);
diff --git a/tests/acpi-utils.c b/tests/acpi-utils.c
index cc33b46..9a6d1d3 100644
--- a/tests/acpi-utils.c
+++ b/tests/acpi-utils.c
@@ -51,19 +51,7 @@ uint32_t acpi_find_rsdp_address(QTestState *qts)
return off;
}
-uint64_t acpi_get_xsdt_address(uint8_t *rsdp_table)
-{
- uint64_t xsdt_physical_address;
- uint8_t revision = rsdp_table[15 /* Revision offset */];
-
- /* We must have revision 2 if we're looking for an XSDT pointer */
- g_assert(revision == 2);
-
- memcpy(&xsdt_physical_address, &rsdp_table[24 /* XsdtAddress offset */], 8);
- return le64_to_cpu(xsdt_physical_address);
-}
-
-void acpi_parse_rsdp_table(QTestState *qts, uint32_t addr, uint8_t *rsdp_table)
+void acpi_parse_rsdp_table(QTestState *qts, uint64_t addr, uint8_t *rsdp_table)
{
uint8_t revision;
diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
index a506dcb..24bd102 100644
--- a/tests/bios-tables-test.c
+++ b/tests/bios-tables-test.c
@@ -107,17 +107,25 @@ static void test_acpi_rsdp_table(test_data *data)
}
}
-static void test_acpi_rsdt_table(test_data *data)
+static void test_acpi_rxsdt_table(test_data *data)
{
+ const char *sig = "RSDT";
AcpiSdtTable rsdt = {};
+ int entry_size = 4;
+ int addr_off = 16 /* RsdtAddress */;
uint8_t *ent;
- /* read RSDT table */
+ if (data->rsdp_table[15 /* Revision offset */] != 0) {
+ addr_off = 24 /* XsdtAddress */;
+ entry_size = 8;
+ sig = "XSDT";
+ }
+ /* read [RX]SDT table */
acpi_fetch_table(data->qts, &rsdt.aml, &rsdt.aml_len,
- &data->rsdp_table[16 /* RsdtAddress */], "RSDT", true);
+ &data->rsdp_table[addr_off], sig, true);
/* Load all tables and add to test list directly RSDT referenced tables */
- ACPI_FOREACH_RSDT_ENTRY(rsdt.aml, rsdt.aml_len, ent, 4 /* Entry size */) {
+ ACPI_FOREACH_RSDT_ENTRY(rsdt.aml, rsdt.aml_len, ent, entry_size) {
AcpiSdtTable ssdt_table = {};
acpi_fetch_table(data->qts, &ssdt_table.aml, &ssdt_table.aml_len, ent,
@@ -521,7 +529,7 @@ static void test_acpi_one(const char *params, test_data *data)
data->tables = g_array_new(false, true, sizeof(AcpiSdtTable));
test_acpi_rsdp_address(data);
test_acpi_rsdp_table(data);
- test_acpi_rsdt_table(data);
+ test_acpi_rxsdt_table(data);
test_acpi_fadt_table(data);
if (iasl) {
--
2.7.4
^ permalink raw reply related [flat|nested] 88+ messages in thread
* [Qemu-devel] [PATCH v3 02/13] tests: acpi: rename acpi_parse_rsdp_table() into acpi_fetch_rsdp_table()
@ 2019-04-25 5:34 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-04-25 5:34 UTC (permalink / raw)
To: qemu-devel
Cc: Laszlo Ersek, Michael S. Tsirkin, Gonglei,
Philippe Mathieu-Daudé,
Shannon Zhao, Wei Yang, Andrew Jones, Shameer Kolothum,
Ben Warren
so name would reflect what the function does
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
tests/acpi-utils.h | 2 +-
tests/acpi-utils.c | 2 +-
tests/bios-tables-test.c | 2 +-
tests/vmgenid-test.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/acpi-utils.h b/tests/acpi-utils.h
index 8c68201..75f78f2 100644
--- a/tests/acpi-utils.h
+++ b/tests/acpi-utils.h
@@ -46,7 +46,7 @@ typedef struct {
uint8_t acpi_calc_checksum(const uint8_t *data, int len);
uint32_t acpi_find_rsdp_address(QTestState *qts);
-void acpi_parse_rsdp_table(QTestState *qts, uint64_t addr, uint8_t *rsdp_table);
+void acpi_fetch_rsdp_table(QTestState *qts, uint64_t addr, uint8_t *rsdp_table);
void acpi_fetch_table(QTestState *qts, uint8_t **aml, uint32_t *aml_len,
const uint8_t *addr_ptr, const char *sig,
bool verify_checksum);
diff --git a/tests/acpi-utils.c b/tests/acpi-utils.c
index 9a6d1d3..2dd4fe0 100644
--- a/tests/acpi-utils.c
+++ b/tests/acpi-utils.c
@@ -51,7 +51,7 @@ uint32_t acpi_find_rsdp_address(QTestState *qts)
return off;
}
-void acpi_parse_rsdp_table(QTestState *qts, uint64_t addr, uint8_t *rsdp_table)
+void acpi_fetch_rsdp_table(QTestState *qts, uint64_t addr, uint8_t *rsdp_table)
{
uint8_t revision;
diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
index 24bd102..2ee044c 100644
--- a/tests/bios-tables-test.c
+++ b/tests/bios-tables-test.c
@@ -89,7 +89,7 @@ static void test_acpi_rsdp_table(test_data *data)
uint8_t *rsdp_table = data->rsdp_table, revision;
uint32_t addr = data->rsdp_addr;
- acpi_parse_rsdp_table(data->qts, addr, rsdp_table);
+ acpi_fetch_rsdp_table(data->qts, addr, rsdp_table);
revision = rsdp_table[15 /* Revision offset */];
switch (revision) {
diff --git a/tests/vmgenid-test.c b/tests/vmgenid-test.c
index ae38ee5..f400184 100644
--- a/tests/vmgenid-test.c
+++ b/tests/vmgenid-test.c
@@ -40,7 +40,7 @@ static uint32_t acpi_find_vgia(QTestState *qts)
g_assert_cmphex(rsdp_offset, <, RSDP_ADDR_INVALID);
- acpi_parse_rsdp_table(qts, rsdp_offset, rsdp_table);
+ acpi_fetch_rsdp_table(qts, rsdp_offset, rsdp_table);
acpi_fetch_table(qts, &rsdt, &rsdt_len, &rsdp_table[16 /* RsdtAddress */],
"RSDT", true);
--
2.7.4
^ permalink raw reply related [flat|nested] 88+ messages in thread
* [Qemu-devel] [PATCH v3 02/13] tests: acpi: rename acpi_parse_rsdp_table() into acpi_fetch_rsdp_table()
@ 2019-04-25 5:34 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-04-25 5:34 UTC (permalink / raw)
To: qemu-devel
Cc: Andrew Jones, Ben Warren, Michael S. Tsirkin, Laszlo Ersek,
Shameer Kolothum, Shannon Zhao, Gonglei, Wei Yang,
Philippe Mathieu-Daudé
so name would reflect what the function does
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
tests/acpi-utils.h | 2 +-
tests/acpi-utils.c | 2 +-
tests/bios-tables-test.c | 2 +-
tests/vmgenid-test.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/acpi-utils.h b/tests/acpi-utils.h
index 8c68201..75f78f2 100644
--- a/tests/acpi-utils.h
+++ b/tests/acpi-utils.h
@@ -46,7 +46,7 @@ typedef struct {
uint8_t acpi_calc_checksum(const uint8_t *data, int len);
uint32_t acpi_find_rsdp_address(QTestState *qts);
-void acpi_parse_rsdp_table(QTestState *qts, uint64_t addr, uint8_t *rsdp_table);
+void acpi_fetch_rsdp_table(QTestState *qts, uint64_t addr, uint8_t *rsdp_table);
void acpi_fetch_table(QTestState *qts, uint8_t **aml, uint32_t *aml_len,
const uint8_t *addr_ptr, const char *sig,
bool verify_checksum);
diff --git a/tests/acpi-utils.c b/tests/acpi-utils.c
index 9a6d1d3..2dd4fe0 100644
--- a/tests/acpi-utils.c
+++ b/tests/acpi-utils.c
@@ -51,7 +51,7 @@ uint32_t acpi_find_rsdp_address(QTestState *qts)
return off;
}
-void acpi_parse_rsdp_table(QTestState *qts, uint64_t addr, uint8_t *rsdp_table)
+void acpi_fetch_rsdp_table(QTestState *qts, uint64_t addr, uint8_t *rsdp_table)
{
uint8_t revision;
diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
index 24bd102..2ee044c 100644
--- a/tests/bios-tables-test.c
+++ b/tests/bios-tables-test.c
@@ -89,7 +89,7 @@ static void test_acpi_rsdp_table(test_data *data)
uint8_t *rsdp_table = data->rsdp_table, revision;
uint32_t addr = data->rsdp_addr;
- acpi_parse_rsdp_table(data->qts, addr, rsdp_table);
+ acpi_fetch_rsdp_table(data->qts, addr, rsdp_table);
revision = rsdp_table[15 /* Revision offset */];
switch (revision) {
diff --git a/tests/vmgenid-test.c b/tests/vmgenid-test.c
index ae38ee5..f400184 100644
--- a/tests/vmgenid-test.c
+++ b/tests/vmgenid-test.c
@@ -40,7 +40,7 @@ static uint32_t acpi_find_vgia(QTestState *qts)
g_assert_cmphex(rsdp_offset, <, RSDP_ADDR_INVALID);
- acpi_parse_rsdp_table(qts, rsdp_offset, rsdp_table);
+ acpi_fetch_rsdp_table(qts, rsdp_offset, rsdp_table);
acpi_fetch_table(qts, &rsdt, &rsdt_len, &rsdp_table[16 /* RsdtAddress */],
"RSDT", true);
--
2.7.4
^ permalink raw reply related [flat|nested] 88+ messages in thread
* [Qemu-devel] [PATCH v3 03/13] tests: acpi: make pointer to RSDP 64bit
@ 2019-04-25 5:34 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-04-25 5:34 UTC (permalink / raw)
To: qemu-devel
Cc: Laszlo Ersek, Michael S. Tsirkin, Gonglei,
Philippe Mathieu-Daudé,
Shannon Zhao, Wei Yang, Andrew Jones, Shameer Kolothum,
Ben Warren
In case of UEFI, RSDP doesn't have to be located in lowmem,
it could be placed at any address. Make sure that test won't
break if it is placed above the first 4Gb of address space.
PS:
While at it cleanup some local variables as we don't really
need them.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
v2:
- s/In case of UEFI/In case of UEFI,/ (Laszlo Ersek <lersek@redhat.com>)
---
tests/bios-tables-test.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
index 2ee044c..c29dcf4 100644
--- a/tests/bios-tables-test.c
+++ b/tests/bios-tables-test.c
@@ -26,7 +26,7 @@
typedef struct {
const char *machine;
const char *variant;
- uint32_t rsdp_addr;
+ uint64_t rsdp_addr;
uint8_t rsdp_table[36 /* ACPI 2.0+ RSDP size */];
GArray *tables;
uint32_t smbios_ep_addr;
@@ -86,13 +86,11 @@ static void test_acpi_rsdp_address(test_data *data)
static void test_acpi_rsdp_table(test_data *data)
{
- uint8_t *rsdp_table = data->rsdp_table, revision;
- uint32_t addr = data->rsdp_addr;
+ uint8_t *rsdp_table = data->rsdp_table;
- acpi_fetch_rsdp_table(data->qts, addr, rsdp_table);
- revision = rsdp_table[15 /* Revision offset */];
+ acpi_fetch_rsdp_table(data->qts, data->rsdp_addr, rsdp_table);
- switch (revision) {
+ switch (rsdp_table[15 /* Revision offset */]) {
case 0: /* ACPI 1.0 RSDP */
/* With rev 1, checksum is only for the first 20 bytes */
g_assert(!acpi_calc_checksum(rsdp_table, 20));
--
2.7.4
^ permalink raw reply related [flat|nested] 88+ messages in thread
* [Qemu-devel] [PATCH v3 03/13] tests: acpi: make pointer to RSDP 64bit
@ 2019-04-25 5:34 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-04-25 5:34 UTC (permalink / raw)
To: qemu-devel
Cc: Andrew Jones, Ben Warren, Michael S. Tsirkin, Laszlo Ersek,
Shameer Kolothum, Shannon Zhao, Gonglei, Wei Yang,
Philippe Mathieu-Daudé
In case of UEFI, RSDP doesn't have to be located in lowmem,
it could be placed at any address. Make sure that test won't
break if it is placed above the first 4Gb of address space.
PS:
While at it cleanup some local variables as we don't really
need them.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
v2:
- s/In case of UEFI/In case of UEFI,/ (Laszlo Ersek <lersek@redhat.com>)
---
tests/bios-tables-test.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
index 2ee044c..c29dcf4 100644
--- a/tests/bios-tables-test.c
+++ b/tests/bios-tables-test.c
@@ -26,7 +26,7 @@
typedef struct {
const char *machine;
const char *variant;
- uint32_t rsdp_addr;
+ uint64_t rsdp_addr;
uint8_t rsdp_table[36 /* ACPI 2.0+ RSDP size */];
GArray *tables;
uint32_t smbios_ep_addr;
@@ -86,13 +86,11 @@ static void test_acpi_rsdp_address(test_data *data)
static void test_acpi_rsdp_table(test_data *data)
{
- uint8_t *rsdp_table = data->rsdp_table, revision;
- uint32_t addr = data->rsdp_addr;
+ uint8_t *rsdp_table = data->rsdp_table;
- acpi_fetch_rsdp_table(data->qts, addr, rsdp_table);
- revision = rsdp_table[15 /* Revision offset */];
+ acpi_fetch_rsdp_table(data->qts, data->rsdp_addr, rsdp_table);
- switch (revision) {
+ switch (rsdp_table[15 /* Revision offset */]) {
case 0: /* ACPI 1.0 RSDP */
/* With rev 1, checksum is only for the first 20 bytes */
g_assert(!acpi_calc_checksum(rsdp_table, 20));
--
2.7.4
^ permalink raw reply related [flat|nested] 88+ messages in thread
* [Qemu-devel] [PATCH v3 04/13] tests: acpi: fetch X_DSDT if pointer to DSDT is 0
@ 2019-04-25 5:34 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-04-25 5:34 UTC (permalink / raw)
To: qemu-devel
Cc: Laszlo Ersek, Michael S. Tsirkin, Gonglei,
Philippe Mathieu-Daudé,
Shannon Zhao, Wei Yang, Andrew Jones, Shameer Kolothum,
Ben Warren
that way it would be possible to test a DSDT pointed by
64bit X_DSDT field in FADT.
PS:
it will allow to enable testing arm/virt board, which sets
only newer X_DSDT field.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
v2:
add 'val = le32_to_cpu(val)' even if it doesn't necessary
it works as reminder that value copied from table is in
little-endian format (Philippe Mathieu-Daudé <philmd@redhat.com>)
---
tests/bios-tables-test.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
index c29dcf4..ed62a17 100644
--- a/tests/bios-tables-test.c
+++ b/tests/bios-tables-test.c
@@ -140,6 +140,8 @@ static void test_acpi_fadt_table(test_data *data)
AcpiSdtTable table = g_array_index(data->tables, typeof(table), 0);
uint8_t *fadt_aml = table.aml;
uint32_t fadt_len = table.aml_len;
+ uint32_t val;
+ int dsdt_offset = 40 /* DSDT */;
g_assert(compare_signature(&table, "FACP"));
@@ -148,8 +150,13 @@ static void test_acpi_fadt_table(test_data *data)
fadt_aml + 36 /* FIRMWARE_CTRL */, "FACS", false);
g_array_append_val(data->tables, table);
+ memcpy(&val, fadt_aml + dsdt_offset, 4);
+ val = le32_to_cpu(val);
+ if (!val) {
+ dsdt_offset = 140 /* X_DSDT */;
+ }
acpi_fetch_table(data->qts, &table.aml, &table.aml_len,
- fadt_aml + 40 /* DSDT */, "DSDT", true);
+ fadt_aml + dsdt_offset, "DSDT", true);
g_array_append_val(data->tables, table);
memset(fadt_aml + 36, 0, 4); /* sanitize FIRMWARE_CTRL ptr */
--
2.7.4
^ permalink raw reply related [flat|nested] 88+ messages in thread
* [Qemu-devel] [PATCH v3 04/13] tests: acpi: fetch X_DSDT if pointer to DSDT is 0
@ 2019-04-25 5:34 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-04-25 5:34 UTC (permalink / raw)
To: qemu-devel
Cc: Andrew Jones, Ben Warren, Michael S. Tsirkin, Laszlo Ersek,
Shameer Kolothum, Shannon Zhao, Gonglei, Wei Yang,
Philippe Mathieu-Daudé
that way it would be possible to test a DSDT pointed by
64bit X_DSDT field in FADT.
PS:
it will allow to enable testing arm/virt board, which sets
only newer X_DSDT field.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
v2:
add 'val = le32_to_cpu(val)' even if it doesn't necessary
it works as reminder that value copied from table is in
little-endian format (Philippe Mathieu-Daudé <philmd@redhat.com>)
---
tests/bios-tables-test.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
index c29dcf4..ed62a17 100644
--- a/tests/bios-tables-test.c
+++ b/tests/bios-tables-test.c
@@ -140,6 +140,8 @@ static void test_acpi_fadt_table(test_data *data)
AcpiSdtTable table = g_array_index(data->tables, typeof(table), 0);
uint8_t *fadt_aml = table.aml;
uint32_t fadt_len = table.aml_len;
+ uint32_t val;
+ int dsdt_offset = 40 /* DSDT */;
g_assert(compare_signature(&table, "FACP"));
@@ -148,8 +150,13 @@ static void test_acpi_fadt_table(test_data *data)
fadt_aml + 36 /* FIRMWARE_CTRL */, "FACS", false);
g_array_append_val(data->tables, table);
+ memcpy(&val, fadt_aml + dsdt_offset, 4);
+ val = le32_to_cpu(val);
+ if (!val) {
+ dsdt_offset = 140 /* X_DSDT */;
+ }
acpi_fetch_table(data->qts, &table.aml, &table.aml_len,
- fadt_aml + 40 /* DSDT */, "DSDT", true);
+ fadt_aml + dsdt_offset, "DSDT", true);
g_array_append_val(data->tables, table);
memset(fadt_aml + 36, 0, 4); /* sanitize FIRMWARE_CTRL ptr */
--
2.7.4
^ permalink raw reply related [flat|nested] 88+ messages in thread
* [Qemu-devel] [PATCH v3 05/13] tests: acpi: skip FACS table if board uses hw reduced ACPI profile
@ 2019-04-25 5:34 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-04-25 5:34 UTC (permalink / raw)
To: qemu-devel
Cc: Laszlo Ersek, Michael S. Tsirkin, Gonglei,
Philippe Mathieu-Daudé,
Shannon Zhao, Wei Yang, Andrew Jones, Shameer Kolothum,
Ben Warren
If FADT has HW_REDUCED_ACPI flag set, do not attempt to fetch
FACS as it's not provided by the board.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
tests/bios-tables-test.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
index ed62a17..e944d00 100644
--- a/tests/bios-tables-test.c
+++ b/tests/bios-tables-test.c
@@ -146,9 +146,13 @@ static void test_acpi_fadt_table(test_data *data)
g_assert(compare_signature(&table, "FACP"));
/* Since DSDT/FACS isn't in RSDT, add them to ASL test list manually */
- acpi_fetch_table(data->qts, &table.aml, &table.aml_len,
- fadt_aml + 36 /* FIRMWARE_CTRL */, "FACS", false);
- g_array_append_val(data->tables, table);
+ memcpy(&val, fadt_aml + 112 /* Flags */, 4);
+ val = le32_to_cpu(val);
+ if (!(val & 1UL << 20 /* HW_REDUCED_ACPI */)) {
+ acpi_fetch_table(data->qts, &table.aml, &table.aml_len,
+ fadt_aml + 36 /* FIRMWARE_CTRL */, "FACS", false);
+ g_array_append_val(data->tables, table);
+ }
memcpy(&val, fadt_aml + dsdt_offset, 4);
val = le32_to_cpu(val);
--
2.7.4
^ permalink raw reply related [flat|nested] 88+ messages in thread
* [Qemu-devel] [PATCH v3 05/13] tests: acpi: skip FACS table if board uses hw reduced ACPI profile
@ 2019-04-25 5:34 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-04-25 5:34 UTC (permalink / raw)
To: qemu-devel
Cc: Andrew Jones, Ben Warren, Michael S. Tsirkin, Laszlo Ersek,
Shameer Kolothum, Shannon Zhao, Gonglei, Wei Yang,
Philippe Mathieu-Daudé
If FADT has HW_REDUCED_ACPI flag set, do not attempt to fetch
FACS as it's not provided by the board.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
tests/bios-tables-test.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
index ed62a17..e944d00 100644
--- a/tests/bios-tables-test.c
+++ b/tests/bios-tables-test.c
@@ -146,9 +146,13 @@ static void test_acpi_fadt_table(test_data *data)
g_assert(compare_signature(&table, "FACP"));
/* Since DSDT/FACS isn't in RSDT, add them to ASL test list manually */
- acpi_fetch_table(data->qts, &table.aml, &table.aml_len,
- fadt_aml + 36 /* FIRMWARE_CTRL */, "FACS", false);
- g_array_append_val(data->tables, table);
+ memcpy(&val, fadt_aml + 112 /* Flags */, 4);
+ val = le32_to_cpu(val);
+ if (!(val & 1UL << 20 /* HW_REDUCED_ACPI */)) {
+ acpi_fetch_table(data->qts, &table.aml, &table.aml_len,
+ fadt_aml + 36 /* FIRMWARE_CTRL */, "FACS", false);
+ g_array_append_val(data->tables, table);
+ }
memcpy(&val, fadt_aml + dsdt_offset, 4);
val = le32_to_cpu(val);
--
2.7.4
^ permalink raw reply related [flat|nested] 88+ messages in thread
* [Qemu-devel] [PATCH v3 06/13] tests: acpi: move boot_sector_init() into x86 tests branch
@ 2019-04-25 5:34 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-04-25 5:34 UTC (permalink / raw)
To: qemu-devel
Cc: Laszlo Ersek, Michael S. Tsirkin, Gonglei,
Philippe Mathieu-Daudé,
Shannon Zhao, Wei Yang, Andrew Jones, Shameer Kolothum,
Ben Warren
boot_sector_init() won't be used by arm/virt board, so move it from
global scope to x86 branch that uses it.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
v3:
- fix checkpatch errors triggered by moved old code (ident/space/braces)
---
tests/bios-tables-test.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
index e944d00..5790ee4 100644
--- a/tests/bios-tables-test.c
+++ b/tests/bios-tables-test.c
@@ -786,13 +786,14 @@ int main(int argc, char *argv[])
const char *arch = qtest_get_arch();
int ret;
- ret = boot_sector_init(disk);
- if(ret)
- return ret;
-
g_test_init(&argc, &argv, NULL);
if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) {
+ ret = boot_sector_init(disk);
+ if (ret) {
+ return ret;
+ }
+
qtest_add_func("acpi/piix4", test_acpi_piix4_tcg);
qtest_add_func("acpi/piix4/bridge", test_acpi_piix4_tcg_bridge);
qtest_add_func("acpi/q35", test_acpi_q35_tcg);
--
2.7.4
^ permalink raw reply related [flat|nested] 88+ messages in thread
* [Qemu-devel] [PATCH v3 06/13] tests: acpi: move boot_sector_init() into x86 tests branch
@ 2019-04-25 5:34 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-04-25 5:34 UTC (permalink / raw)
To: qemu-devel
Cc: Andrew Jones, Ben Warren, Michael S. Tsirkin, Laszlo Ersek,
Shameer Kolothum, Shannon Zhao, Gonglei, Wei Yang,
Philippe Mathieu-Daudé
boot_sector_init() won't be used by arm/virt board, so move it from
global scope to x86 branch that uses it.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
v3:
- fix checkpatch errors triggered by moved old code (ident/space/braces)
---
tests/bios-tables-test.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
index e944d00..5790ee4 100644
--- a/tests/bios-tables-test.c
+++ b/tests/bios-tables-test.c
@@ -786,13 +786,14 @@ int main(int argc, char *argv[])
const char *arch = qtest_get_arch();
int ret;
- ret = boot_sector_init(disk);
- if(ret)
- return ret;
-
g_test_init(&argc, &argv, NULL);
if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) {
+ ret = boot_sector_init(disk);
+ if (ret) {
+ return ret;
+ }
+
qtest_add_func("acpi/piix4", test_acpi_piix4_tcg);
qtest_add_func("acpi/piix4/bridge", test_acpi_piix4_tcg_bridge);
qtest_add_func("acpi/q35", test_acpi_q35_tcg);
--
2.7.4
^ permalink raw reply related [flat|nested] 88+ messages in thread
* [Qemu-devel] [PATCH v3 07/13] tests: acpi: add acpi_find_rsdp_address_uefi() helper
@ 2019-04-25 5:34 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-04-25 5:34 UTC (permalink / raw)
To: qemu-devel
Cc: Laszlo Ersek, Michael S. Tsirkin, Gonglei,
Philippe Mathieu-Daudé,
Shannon Zhao, Wei Yang, Andrew Jones, Shameer Kolothum,
Ben Warren
introduce UEFI specific counterpart to acpi_find_rsdp_address()
that will help to find RSDP address when [OA]VMF is used as
firmware. It requires guest firmware or other guest app to place
1Mb aligned UefiTestSupport structure (defined in this patch)
in RAM with UefiTestSupport::signature_guid set to
AB87A6B1-2034-BDA0-71BD-375007757785
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
---
v3:
* fix checkpatch error (separate opening brace from values in AcpiTestSupportGuid initializer)
v2:
* Laszlo Ersek <lersek@redhat.com>
- s/uefi_find_rsdp_addr/acpi_find_rsdp_address_uefi/
- use GUID_SIZE instead of opencodding size
- make AcpiTestSupportGuid const
- s/TCI/TCG/
---
tests/acpi-utils.h | 2 ++
tests/acpi-utils.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 46 insertions(+)
diff --git a/tests/acpi-utils.h b/tests/acpi-utils.h
index 75f78f2..dcfa721 100644
--- a/tests/acpi-utils.h
+++ b/tests/acpi-utils.h
@@ -46,6 +46,8 @@ typedef struct {
uint8_t acpi_calc_checksum(const uint8_t *data, int len);
uint32_t acpi_find_rsdp_address(QTestState *qts);
+uint64_t acpi_find_rsdp_address_uefi(QTestState *qts, uint64_t start,
+ uint64_t size);
void acpi_fetch_rsdp_table(QTestState *qts, uint64_t addr, uint8_t *rsdp_table);
void acpi_fetch_table(QTestState *qts, uint8_t **aml, uint32_t *aml_len,
const uint8_t *addr_ptr, const char *sig,
diff --git a/tests/acpi-utils.c b/tests/acpi-utils.c
index 2dd4fe0..197af82 100644
--- a/tests/acpi-utils.c
+++ b/tests/acpi-utils.c
@@ -99,3 +99,47 @@ void acpi_fetch_table(QTestState *qts, uint8_t **aml, uint32_t *aml_len,
g_assert(!acpi_calc_checksum(*aml, *aml_len));
}
}
+
+#define GUID_SIZE 16
+static const uint8_t AcpiTestSupportGuid[GUID_SIZE] = {
+ 0xb1, 0xa6, 0x87, 0xab,
+ 0x34, 0x20,
+ 0xa0, 0xbd,
+ 0x71, 0xbd, 0x37, 0x50, 0x07, 0x75, 0x77, 0x85 };
+
+typedef struct {
+ uint8_t signature_guid[GUID_SIZE];
+ uint64_t rsdp10;
+ uint64_t rsdp20;
+} __attribute__((packed)) UefiTestSupport;
+
+/* Wait at most 600 seconds (test is slow with TCG and --enable-debug) */
+#define TEST_DELAY (1 * G_USEC_PER_SEC / 10)
+#define TEST_CYCLES MAX((600 * G_USEC_PER_SEC / TEST_DELAY), 1)
+#define MB 0x100000ULL
+uint64_t acpi_find_rsdp_address_uefi(QTestState *qts, uint64_t start,
+ uint64_t size)
+{
+ int i, j;
+ uint8_t data[GUID_SIZE];
+
+ for (i = 0; i < TEST_CYCLES; ++i) {
+ for (j = 0; j < size / MB; j++) {
+ /* look for GUID at every 1Mb block */
+ uint64_t addr = start + j * MB;
+
+ qtest_memread(qts, addr, data, sizeof(data));
+ if (!memcmp(AcpiTestSupportGuid, data, sizeof(data))) {
+ UefiTestSupport ret;
+
+ qtest_memread(qts, addr, &ret, sizeof(ret));
+ ret.rsdp10 = le64_to_cpu(ret.rsdp10);
+ ret.rsdp20 = le64_to_cpu(ret.rsdp20);
+ return ret.rsdp20 ? ret.rsdp20 : ret.rsdp10;
+ }
+ }
+ g_usleep(TEST_DELAY);
+ }
+ g_assert_not_reached();
+ return 0;
+}
--
2.7.4
^ permalink raw reply related [flat|nested] 88+ messages in thread
* [Qemu-devel] [PATCH v3 07/13] tests: acpi: add acpi_find_rsdp_address_uefi() helper
@ 2019-04-25 5:34 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-04-25 5:34 UTC (permalink / raw)
To: qemu-devel
Cc: Andrew Jones, Ben Warren, Michael S. Tsirkin, Laszlo Ersek,
Shameer Kolothum, Shannon Zhao, Gonglei, Wei Yang,
Philippe Mathieu-Daudé
introduce UEFI specific counterpart to acpi_find_rsdp_address()
that will help to find RSDP address when [OA]VMF is used as
firmware. It requires guest firmware or other guest app to place
1Mb aligned UefiTestSupport structure (defined in this patch)
in RAM with UefiTestSupport::signature_guid set to
AB87A6B1-2034-BDA0-71BD-375007757785
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
---
v3:
* fix checkpatch error (separate opening brace from values in AcpiTestSupportGuid initializer)
v2:
* Laszlo Ersek <lersek@redhat.com>
- s/uefi_find_rsdp_addr/acpi_find_rsdp_address_uefi/
- use GUID_SIZE instead of opencodding size
- make AcpiTestSupportGuid const
- s/TCI/TCG/
---
tests/acpi-utils.h | 2 ++
tests/acpi-utils.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 46 insertions(+)
diff --git a/tests/acpi-utils.h b/tests/acpi-utils.h
index 75f78f2..dcfa721 100644
--- a/tests/acpi-utils.h
+++ b/tests/acpi-utils.h
@@ -46,6 +46,8 @@ typedef struct {
uint8_t acpi_calc_checksum(const uint8_t *data, int len);
uint32_t acpi_find_rsdp_address(QTestState *qts);
+uint64_t acpi_find_rsdp_address_uefi(QTestState *qts, uint64_t start,
+ uint64_t size);
void acpi_fetch_rsdp_table(QTestState *qts, uint64_t addr, uint8_t *rsdp_table);
void acpi_fetch_table(QTestState *qts, uint8_t **aml, uint32_t *aml_len,
const uint8_t *addr_ptr, const char *sig,
diff --git a/tests/acpi-utils.c b/tests/acpi-utils.c
index 2dd4fe0..197af82 100644
--- a/tests/acpi-utils.c
+++ b/tests/acpi-utils.c
@@ -99,3 +99,47 @@ void acpi_fetch_table(QTestState *qts, uint8_t **aml, uint32_t *aml_len,
g_assert(!acpi_calc_checksum(*aml, *aml_len));
}
}
+
+#define GUID_SIZE 16
+static const uint8_t AcpiTestSupportGuid[GUID_SIZE] = {
+ 0xb1, 0xa6, 0x87, 0xab,
+ 0x34, 0x20,
+ 0xa0, 0xbd,
+ 0x71, 0xbd, 0x37, 0x50, 0x07, 0x75, 0x77, 0x85 };
+
+typedef struct {
+ uint8_t signature_guid[GUID_SIZE];
+ uint64_t rsdp10;
+ uint64_t rsdp20;
+} __attribute__((packed)) UefiTestSupport;
+
+/* Wait at most 600 seconds (test is slow with TCG and --enable-debug) */
+#define TEST_DELAY (1 * G_USEC_PER_SEC / 10)
+#define TEST_CYCLES MAX((600 * G_USEC_PER_SEC / TEST_DELAY), 1)
+#define MB 0x100000ULL
+uint64_t acpi_find_rsdp_address_uefi(QTestState *qts, uint64_t start,
+ uint64_t size)
+{
+ int i, j;
+ uint8_t data[GUID_SIZE];
+
+ for (i = 0; i < TEST_CYCLES; ++i) {
+ for (j = 0; j < size / MB; j++) {
+ /* look for GUID at every 1Mb block */
+ uint64_t addr = start + j * MB;
+
+ qtest_memread(qts, addr, data, sizeof(data));
+ if (!memcmp(AcpiTestSupportGuid, data, sizeof(data))) {
+ UefiTestSupport ret;
+
+ qtest_memread(qts, addr, &ret, sizeof(ret));
+ ret.rsdp10 = le64_to_cpu(ret.rsdp10);
+ ret.rsdp20 = le64_to_cpu(ret.rsdp20);
+ return ret.rsdp20 ? ret.rsdp20 : ret.rsdp10;
+ }
+ }
+ g_usleep(TEST_DELAY);
+ }
+ g_assert_not_reached();
+ return 0;
+}
--
2.7.4
^ permalink raw reply related [flat|nested] 88+ messages in thread
* [Qemu-devel] [PATCH v3 08/13] tests: acpi: add a way to start tests with UEFI firmware
@ 2019-04-25 5:34 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-04-25 5:34 UTC (permalink / raw)
To: qemu-devel
Cc: Laszlo Ersek, Michael S. Tsirkin, Gonglei,
Philippe Mathieu-Daudé,
Shannon Zhao, Wei Yang, Andrew Jones, Shameer Kolothum,
Ben Warren
For testcase to use UEFI firmware, one needs to provide and specify
firmwarei and varstore blobs names in test_data { uefi_fl1, uefi_fl2) }
fields respectively and RAM start address plus size where to look for
test structure signature. Additionally testcase should specify
bootable cdrom image uefi-boot-images EFI test utility.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
---
v3:
* drop data_dir prefix and firmware will come from pc-bios directly
* add cdrom option so test could use it for providing boot cdrom image
* add TODO comment convert '-drive if=pflash' to new syntax (Laszlo)
v2:
* move RAM start address and size to test_data, as it could differ
between boards (and even versions)
---
tests/bios-tables-test.c | 44 ++++++++++++++++++++++++++++++++++----------
1 file changed, 34 insertions(+), 10 deletions(-)
diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
index 5790ee4..0f24540 100644
--- a/tests/bios-tables-test.c
+++ b/tests/bios-tables-test.c
@@ -26,6 +26,11 @@
typedef struct {
const char *machine;
const char *variant;
+ const char *uefi_fl1;
+ const char *uefi_fl2;
+ const char *cd;
+ const uint64_t ram_start;
+ const uint64_t scan_len;
uint64_t rsdp_addr;
uint8_t rsdp_table[36 /* ACPI 2.0+ RSDP size */];
GArray *tables;
@@ -522,21 +527,40 @@ static void test_smbios_structs(test_data *data)
static void test_acpi_one(const char *params, test_data *data)
{
char *args;
-
- /* Disable kernel irqchip to be able to override apic irq0. */
- args = g_strdup_printf("-machine %s,accel=%s,kernel-irqchip=off "
- "-net none -display none %s "
- "-drive id=hd0,if=none,file=%s,format=raw "
- "-device ide-hd,drive=hd0 ",
- data->machine, "kvm:tcg",
- params ? params : "", disk);
+ bool use_uefi = data->uefi_fl1 && data->uefi_fl2;
+
+ if (use_uefi) {
+ /*
+ * TODO: convert '-drive if=pflash' to new syntax (see e33763be7cd3)
+ * when arm/virt boad starts to support it.
+ */
+ args = g_strdup_printf("-machine %s,accel=%s -nodefaults -nographic "
+ "-drive if=pflash,format=raw,file=%s,readonly "
+ "-drive if=pflash,format=raw,file=%s,snapshot=on -cdrom %s %s",
+ data->machine, "kvm:tcg", data->uefi_fl1, data->uefi_fl2,
+ data->cd, params ? params : "");
+
+ } else {
+ /* Disable kernel irqchip to be able to override apic irq0. */
+ args = g_strdup_printf("-machine %s,accel=%s,kernel-irqchip=off "
+ "-net none -display none %s "
+ "-drive id=hd0,if=none,file=%s,format=raw "
+ "-device ide-hd,drive=hd0 ",
+ data->machine, "kvm:tcg", params ? params : "", disk);
+ }
data->qts = qtest_init(args);
- boot_sector_test(data->qts);
+ if (use_uefi) {
+ g_assert(data->scan_len);
+ data->rsdp_addr = acpi_find_rsdp_address_uefi(data->qts,
+ data->ram_start, data->scan_len);
+ } else {
+ boot_sector_test(data->qts);
+ test_acpi_rsdp_address(data);
+ }
data->tables = g_array_new(false, true, sizeof(AcpiSdtTable));
- test_acpi_rsdp_address(data);
test_acpi_rsdp_table(data);
test_acpi_rxsdt_table(data);
test_acpi_fadt_table(data);
--
2.7.4
^ permalink raw reply related [flat|nested] 88+ messages in thread
* [Qemu-devel] [PATCH v3 08/13] tests: acpi: add a way to start tests with UEFI firmware
@ 2019-04-25 5:34 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-04-25 5:34 UTC (permalink / raw)
To: qemu-devel
Cc: Andrew Jones, Ben Warren, Michael S. Tsirkin, Laszlo Ersek,
Shameer Kolothum, Shannon Zhao, Gonglei, Wei Yang,
Philippe Mathieu-Daudé
For testcase to use UEFI firmware, one needs to provide and specify
firmwarei and varstore blobs names in test_data { uefi_fl1, uefi_fl2) }
fields respectively and RAM start address plus size where to look for
test structure signature. Additionally testcase should specify
bootable cdrom image uefi-boot-images EFI test utility.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
---
v3:
* drop data_dir prefix and firmware will come from pc-bios directly
* add cdrom option so test could use it for providing boot cdrom image
* add TODO comment convert '-drive if=pflash' to new syntax (Laszlo)
v2:
* move RAM start address and size to test_data, as it could differ
between boards (and even versions)
---
tests/bios-tables-test.c | 44 ++++++++++++++++++++++++++++++++++----------
1 file changed, 34 insertions(+), 10 deletions(-)
diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
index 5790ee4..0f24540 100644
--- a/tests/bios-tables-test.c
+++ b/tests/bios-tables-test.c
@@ -26,6 +26,11 @@
typedef struct {
const char *machine;
const char *variant;
+ const char *uefi_fl1;
+ const char *uefi_fl2;
+ const char *cd;
+ const uint64_t ram_start;
+ const uint64_t scan_len;
uint64_t rsdp_addr;
uint8_t rsdp_table[36 /* ACPI 2.0+ RSDP size */];
GArray *tables;
@@ -522,21 +527,40 @@ static void test_smbios_structs(test_data *data)
static void test_acpi_one(const char *params, test_data *data)
{
char *args;
-
- /* Disable kernel irqchip to be able to override apic irq0. */
- args = g_strdup_printf("-machine %s,accel=%s,kernel-irqchip=off "
- "-net none -display none %s "
- "-drive id=hd0,if=none,file=%s,format=raw "
- "-device ide-hd,drive=hd0 ",
- data->machine, "kvm:tcg",
- params ? params : "", disk);
+ bool use_uefi = data->uefi_fl1 && data->uefi_fl2;
+
+ if (use_uefi) {
+ /*
+ * TODO: convert '-drive if=pflash' to new syntax (see e33763be7cd3)
+ * when arm/virt boad starts to support it.
+ */
+ args = g_strdup_printf("-machine %s,accel=%s -nodefaults -nographic "
+ "-drive if=pflash,format=raw,file=%s,readonly "
+ "-drive if=pflash,format=raw,file=%s,snapshot=on -cdrom %s %s",
+ data->machine, "kvm:tcg", data->uefi_fl1, data->uefi_fl2,
+ data->cd, params ? params : "");
+
+ } else {
+ /* Disable kernel irqchip to be able to override apic irq0. */
+ args = g_strdup_printf("-machine %s,accel=%s,kernel-irqchip=off "
+ "-net none -display none %s "
+ "-drive id=hd0,if=none,file=%s,format=raw "
+ "-device ide-hd,drive=hd0 ",
+ data->machine, "kvm:tcg", params ? params : "", disk);
+ }
data->qts = qtest_init(args);
- boot_sector_test(data->qts);
+ if (use_uefi) {
+ g_assert(data->scan_len);
+ data->rsdp_addr = acpi_find_rsdp_address_uefi(data->qts,
+ data->ram_start, data->scan_len);
+ } else {
+ boot_sector_test(data->qts);
+ test_acpi_rsdp_address(data);
+ }
data->tables = g_array_new(false, true, sizeof(AcpiSdtTable));
- test_acpi_rsdp_address(data);
test_acpi_rsdp_table(data);
test_acpi_rxsdt_table(data);
test_acpi_fadt_table(data);
--
2.7.4
^ permalink raw reply related [flat|nested] 88+ messages in thread
* [Qemu-devel] [PATCH v3 09/13] tests: acpi: ignore SMBIOS tests when UEFI firmware is used
@ 2019-04-25 5:34 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-04-25 5:34 UTC (permalink / raw)
To: qemu-devel
Cc: Laszlo Ersek, Michael S. Tsirkin, Gonglei,
Philippe Mathieu-Daudé,
Shannon Zhao, Wei Yang, Andrew Jones, Shameer Kolothum,
Ben Warren
once FW provides a pointer to SMBIOS entry point like it does for
RSDP it should be possible to enable this one the same way.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
---
v3:
- add ref to a uefi-test-tools feature req into comment (Laszlo)
---
tests/bios-tables-test.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
index 0f24540..1be55a1 100644
--- a/tests/bios-tables-test.c
+++ b/tests/bios-tables-test.c
@@ -573,8 +573,15 @@ static void test_acpi_one(const char *params, test_data *data)
}
}
- test_smbios_entry_point(data);
- test_smbios_structs(data);
+ /*
+ * TODO: make SMBIOS tests work with UEFI firmware,
+ * Bug on uefi-test-tools to provide entry point:
+ * https://bugs.launchpad.net/qemu/+bug/1821884
+ */
+ if (!use_uefi) {
+ test_smbios_entry_point(data);
+ test_smbios_structs(data);
+ }
assert(!global_qtest);
qtest_quit(data->qts);
--
2.7.4
^ permalink raw reply related [flat|nested] 88+ messages in thread
* [Qemu-devel] [PATCH v3 09/13] tests: acpi: ignore SMBIOS tests when UEFI firmware is used
@ 2019-04-25 5:34 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-04-25 5:34 UTC (permalink / raw)
To: qemu-devel
Cc: Andrew Jones, Ben Warren, Michael S. Tsirkin, Laszlo Ersek,
Shameer Kolothum, Shannon Zhao, Gonglei, Wei Yang,
Philippe Mathieu-Daudé
once FW provides a pointer to SMBIOS entry point like it does for
RSDP it should be possible to enable this one the same way.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
---
v3:
- add ref to a uefi-test-tools feature req into comment (Laszlo)
---
tests/bios-tables-test.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
index 0f24540..1be55a1 100644
--- a/tests/bios-tables-test.c
+++ b/tests/bios-tables-test.c
@@ -573,8 +573,15 @@ static void test_acpi_one(const char *params, test_data *data)
}
}
- test_smbios_entry_point(data);
- test_smbios_structs(data);
+ /*
+ * TODO: make SMBIOS tests work with UEFI firmware,
+ * Bug on uefi-test-tools to provide entry point:
+ * https://bugs.launchpad.net/qemu/+bug/1821884
+ */
+ if (!use_uefi) {
+ test_smbios_entry_point(data);
+ test_smbios_structs(data);
+ }
assert(!global_qtest);
qtest_quit(data->qts);
--
2.7.4
^ permalink raw reply related [flat|nested] 88+ messages in thread
* [Qemu-devel] [PATCH v3 10/13] tests: add expected ACPI tables for arm/virt board
@ 2019-04-25 5:34 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-04-25 5:34 UTC (permalink / raw)
To: qemu-devel
Cc: Laszlo Ersek, Michael S. Tsirkin, Gonglei,
Philippe Mathieu-Daudé,
Shannon Zhao, Wei Yang, Andrew Jones, Shameer Kolothum,
Ben Warren
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
this patch is ahead fo "tests: acpi: add simple arm/virt testcase"
to keep 'make check' working during bisection and not to pollute
code with binary blobs which are not reviewable.
---
tests/data/acpi/virt/APIC | Bin 0 -> 168 bytes
tests/data/acpi/virt/DSDT | Bin 0 -> 18476 bytes
tests/data/acpi/virt/FACP | Bin 0 -> 268 bytes
tests/data/acpi/virt/GTDT | Bin 0 -> 96 bytes
tests/data/acpi/virt/MCFG | Bin 0 -> 60 bytes
tests/data/acpi/virt/SPCR | Bin 0 -> 80 bytes
6 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 tests/data/acpi/virt/APIC
create mode 100644 tests/data/acpi/virt/DSDT
create mode 100644 tests/data/acpi/virt/FACP
create mode 100644 tests/data/acpi/virt/GTDT
create mode 100644 tests/data/acpi/virt/MCFG
create mode 100644 tests/data/acpi/virt/SPCR
diff --git a/tests/data/acpi/virt/APIC b/tests/data/acpi/virt/APIC
new file mode 100644
index 0000000000000000000000000000000000000000..797dfde2841c51b7e72065602e99ce1714347f0d
GIT binary patch
literal 168
zcmZ<^@N{0mz`($~*~#D8BUr&HBEZ=ZD8>jB1F=Cg4Dd+6SPUF6788)c?E~X6Fu>G{
hBZPn~MyPrgD9sGlkD?67;f3451Xcqw&w(L;0RYV=2>}2A
literal 0
HcmV?d00001
diff --git a/tests/data/acpi/virt/DSDT b/tests/data/acpi/virt/DSDT
new file mode 100644
index 0000000000000000000000000000000000000000..20e85c7f89f645c69935c615c07084e221419960
GIT binary patch
literal 18476
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
literal 0
HcmV?d00001
diff --git a/tests/data/acpi/virt/FACP b/tests/data/acpi/virt/FACP
new file mode 100644
index 0000000000000000000000000000000000000000..27de99f51bfe846b1f8796ace49d83f5b33a1aed
GIT binary patch
literal 268
ycmZ>BbPnKQWME+3?d0$55v<@85#a0w6axw|fY>0Kx<CNcIA#XwTY+i=(L4a*H3tCz
literal 0
HcmV?d00001
diff --git a/tests/data/acpi/virt/GTDT b/tests/data/acpi/virt/GTDT
new file mode 100644
index 0000000000000000000000000000000000000000..10107a65e958ff6495bb8c17d63d0539690f59f6
GIT binary patch
literal 96
zcmZ<{aS2IaU|?Xn>E!S15v<@85#a0&6k`O6f!H7#8OTC8azL5|h^3)?DJYFj0RVOU
B2mt^9
literal 0
HcmV?d00001
diff --git a/tests/data/acpi/virt/MCFG b/tests/data/acpi/virt/MCFG
new file mode 100644
index 0000000000000000000000000000000000000000..e8987e1af0ec3829770bf4fe11fab02b06160dd2
GIT binary patch
literal 60
scmeZuc5}C3U|?YMck*}k2v%^42ypfViZKGkKx`0=1Oyx)oc|yS05YNo0RR91
literal 0
HcmV?d00001
diff --git a/tests/data/acpi/virt/SPCR b/tests/data/acpi/virt/SPCR
new file mode 100644
index 0000000000000000000000000000000000000000..377271a0e7817cc21a28c02123a89facad63604f
GIT binary patch
literal 80
zcmWFza1IJ!U|?VpcJg=j2v%^42yhMtiZKGkKx`1r48#l^3?L>agsBLmm>C$E7#RKo
I0Z0r60QF4^0RR91
literal 0
HcmV?d00001
--
2.7.4
^ permalink raw reply [flat|nested] 88+ messages in thread
* [Qemu-devel] [PATCH v3 10/13] tests: add expected ACPI tables for arm/virt board
@ 2019-04-25 5:34 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-04-25 5:34 UTC (permalink / raw)
To: qemu-devel
Cc: Andrew Jones, Ben Warren, Michael S. Tsirkin, Laszlo Ersek,
Shameer Kolothum, Shannon Zhao, Gonglei, Wei Yang,
Philippe Mathieu-Daudé
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
this patch is ahead fo "tests: acpi: add simple arm/virt testcase"
to keep 'make check' working during bisection and not to pollute
code with binary blobs which are not reviewable.
---
tests/data/acpi/virt/APIC | Bin 0 -> 168 bytes
tests/data/acpi/virt/DSDT | Bin 0 -> 18476 bytes
tests/data/acpi/virt/FACP | Bin 0 -> 268 bytes
tests/data/acpi/virt/GTDT | Bin 0 -> 96 bytes
tests/data/acpi/virt/MCFG | Bin 0 -> 60 bytes
tests/data/acpi/virt/SPCR | Bin 0 -> 80 bytes
6 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 tests/data/acpi/virt/APIC
create mode 100644 tests/data/acpi/virt/DSDT
create mode 100644 tests/data/acpi/virt/FACP
create mode 100644 tests/data/acpi/virt/GTDT
create mode 100644 tests/data/acpi/virt/MCFG
create mode 100644 tests/data/acpi/virt/SPCR
diff --git a/tests/data/acpi/virt/APIC b/tests/data/acpi/virt/APIC
new file mode 100644
index 0000000000000000000000000000000000000000..797dfde2841c51b7e72065602e99ce1714347f0d
GIT binary patch
literal 168
zcmZ<^@N{0mz`($~*~#D8BUr&HBEZ=ZD8>jB1F=Cg4Dd+6SPUF6788)c?E~X6Fu>G{
hBZPn~MyPrgD9sGlkD?67;f3451Xcqw&w(L;0RYV=2>}2A
literal 0
HcmV?d00001
diff --git a/tests/data/acpi/virt/DSDT b/tests/data/acpi/virt/DSDT
new file mode 100644
index 0000000000000000000000000000000000000000..20e85c7f89f645c69935c615c07084e221419960
GIT binary patch
literal 18476
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
literal 0
HcmV?d00001
diff --git a/tests/data/acpi/virt/FACP b/tests/data/acpi/virt/FACP
new file mode 100644
index 0000000000000000000000000000000000000000..27de99f51bfe846b1f8796ace49d83f5b33a1aed
GIT binary patch
literal 268
ycmZ>BbPnKQWME+3?d0$55v<@85#a0w6axw|fY>0Kx<CNcIA#XwTY+i=(L4a*H3tCz
literal 0
HcmV?d00001
diff --git a/tests/data/acpi/virt/GTDT b/tests/data/acpi/virt/GTDT
new file mode 100644
index 0000000000000000000000000000000000000000..10107a65e958ff6495bb8c17d63d0539690f59f6
GIT binary patch
literal 96
zcmZ<{aS2IaU|?Xn>E!S15v<@85#a0&6k`O6f!H7#8OTC8azL5|h^3)?DJYFj0RVOU
B2mt^9
literal 0
HcmV?d00001
diff --git a/tests/data/acpi/virt/MCFG b/tests/data/acpi/virt/MCFG
new file mode 100644
index 0000000000000000000000000000000000000000..e8987e1af0ec3829770bf4fe11fab02b06160dd2
GIT binary patch
literal 60
scmeZuc5}C3U|?YMck*}k2v%^42ypfViZKGkKx`0=1Oyx)oc|yS05YNo0RR91
literal 0
HcmV?d00001
diff --git a/tests/data/acpi/virt/SPCR b/tests/data/acpi/virt/SPCR
new file mode 100644
index 0000000000000000000000000000000000000000..377271a0e7817cc21a28c02123a89facad63604f
GIT binary patch
literal 80
zcmWFza1IJ!U|?VpcJg=j2v%^42yhMtiZKGkKx`1r48#l^3?L>agsBLmm>C$E7#RKo
I0Z0r60QF4^0RR91
literal 0
HcmV?d00001
--
2.7.4
^ permalink raw reply [flat|nested] 88+ messages in thread
* [Qemu-devel] [PATCH v3 11/13] tests: acpi: add simple arm/virt testcase
@ 2019-04-25 5:34 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-04-25 5:34 UTC (permalink / raw)
To: qemu-devel
Cc: Laszlo Ersek, Michael S. Tsirkin, Gonglei,
Philippe Mathieu-Daudé,
Shannon Zhao, Wei Yang, Andrew Jones, Shameer Kolothum,
Ben Warren
adds simple arm/virt test case that starts guest with
bios-tables-test.aarch64.iso.qcow2 boot image which
initializes UefiTestSupport* structure in RAM once
guest is booted.
* see commit: tests: acpi: add acpi_find_rsdp_address_uefi() helper
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
v3:
* use firmware blobs directly from pc-bios directory
* use bios-tables-test.aarch64.iso.qcow2 as test boot image
* drop leftover qtest-uefi-images-aarch64 iMakefile rule from
previos version (Laszlo)
* add Makefile rule to include bios-tables-test into
check-qtest-aarch64 target
v2:
* specify in test_data where board's RAM starts and RAM size
---
tests/Makefile.include | 1 +
tests/bios-tables-test.c | 17 +++++++++++++++++
2 files changed, 18 insertions(+)
diff --git a/tests/Makefile.include b/tests/Makefile.include
index e2432d5..983c8b1 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -267,6 +267,7 @@ check-qtest-arm-y += tests/hexloader-test$(EXESUF)
check-qtest-aarch64-y = tests/numa-test$(EXESUF)
check-qtest-aarch64-y += tests/boot-serial-test$(EXESUF)
check-qtest-aarch64-y += tests/migration-test$(EXESUF)
+check-qtest-aarch64-y += tests/bios-tables-test$(EXESUF)
check-qtest-microblazeel-y += $(check-qtest-microblaze-y)
diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
index 1be55a1..f117461 100644
--- a/tests/bios-tables-test.c
+++ b/tests/bios-tables-test.c
@@ -812,6 +812,21 @@ static void test_acpi_piix4_tcg_dimm_pxm(void)
test_acpi_tcg_dimm_pxm(MACHINE_PC);
}
+static void test_acpi_virt_tcg(void)
+{
+ test_data data = {
+ .machine = "virt",
+ .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
+ .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
+ .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
+ .ram_start = 0x40000000ULL,
+ .scan_len = 128ULL * 1024 * 1024,
+ };
+
+ test_acpi_one("-cpu cortex-a57 ", &data);
+ free_test_data(&data);
+}
+
int main(int argc, char *argv[])
{
const char *arch = qtest_get_arch();
@@ -840,6 +855,8 @@ int main(int argc, char *argv[])
qtest_add_func("acpi/q35/numamem", test_acpi_q35_tcg_numamem);
qtest_add_func("acpi/piix4/dimmpxm", test_acpi_piix4_tcg_dimm_pxm);
qtest_add_func("acpi/q35/dimmpxm", test_acpi_q35_tcg_dimm_pxm);
+ } else if (strcmp(arch, "aarch64") == 0) {
+ qtest_add_func("acpi/virt", test_acpi_virt_tcg);
}
ret = g_test_run();
boot_sector_cleanup(disk);
--
2.7.4
^ permalink raw reply related [flat|nested] 88+ messages in thread
* [Qemu-devel] [PATCH v3 11/13] tests: acpi: add simple arm/virt testcase
@ 2019-04-25 5:34 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-04-25 5:34 UTC (permalink / raw)
To: qemu-devel
Cc: Andrew Jones, Ben Warren, Michael S. Tsirkin, Laszlo Ersek,
Shameer Kolothum, Shannon Zhao, Gonglei, Wei Yang,
Philippe Mathieu-Daudé
adds simple arm/virt test case that starts guest with
bios-tables-test.aarch64.iso.qcow2 boot image which
initializes UefiTestSupport* structure in RAM once
guest is booted.
* see commit: tests: acpi: add acpi_find_rsdp_address_uefi() helper
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
v3:
* use firmware blobs directly from pc-bios directory
* use bios-tables-test.aarch64.iso.qcow2 as test boot image
* drop leftover qtest-uefi-images-aarch64 iMakefile rule from
previos version (Laszlo)
* add Makefile rule to include bios-tables-test into
check-qtest-aarch64 target
v2:
* specify in test_data where board's RAM starts and RAM size
---
tests/Makefile.include | 1 +
tests/bios-tables-test.c | 17 +++++++++++++++++
2 files changed, 18 insertions(+)
diff --git a/tests/Makefile.include b/tests/Makefile.include
index e2432d5..983c8b1 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -267,6 +267,7 @@ check-qtest-arm-y += tests/hexloader-test$(EXESUF)
check-qtest-aarch64-y = tests/numa-test$(EXESUF)
check-qtest-aarch64-y += tests/boot-serial-test$(EXESUF)
check-qtest-aarch64-y += tests/migration-test$(EXESUF)
+check-qtest-aarch64-y += tests/bios-tables-test$(EXESUF)
check-qtest-microblazeel-y += $(check-qtest-microblaze-y)
diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
index 1be55a1..f117461 100644
--- a/tests/bios-tables-test.c
+++ b/tests/bios-tables-test.c
@@ -812,6 +812,21 @@ static void test_acpi_piix4_tcg_dimm_pxm(void)
test_acpi_tcg_dimm_pxm(MACHINE_PC);
}
+static void test_acpi_virt_tcg(void)
+{
+ test_data data = {
+ .machine = "virt",
+ .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
+ .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
+ .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
+ .ram_start = 0x40000000ULL,
+ .scan_len = 128ULL * 1024 * 1024,
+ };
+
+ test_acpi_one("-cpu cortex-a57 ", &data);
+ free_test_data(&data);
+}
+
int main(int argc, char *argv[])
{
const char *arch = qtest_get_arch();
@@ -840,6 +855,8 @@ int main(int argc, char *argv[])
qtest_add_func("acpi/q35/numamem", test_acpi_q35_tcg_numamem);
qtest_add_func("acpi/piix4/dimmpxm", test_acpi_piix4_tcg_dimm_pxm);
qtest_add_func("acpi/q35/dimmpxm", test_acpi_q35_tcg_dimm_pxm);
+ } else if (strcmp(arch, "aarch64") == 0) {
+ qtest_add_func("acpi/virt", test_acpi_virt_tcg);
}
ret = g_test_run();
boot_sector_cleanup(disk);
--
2.7.4
^ permalink raw reply related [flat|nested] 88+ messages in thread
* [Qemu-devel] [PATCH v3 12/13] tests: acpi: refactor rebuild-expected-aml.sh to dump ACPI tables for a specified list of targets
@ 2019-04-25 5:34 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-04-25 5:34 UTC (permalink / raw)
To: qemu-devel
Cc: Laszlo Ersek, Michael S. Tsirkin, Gonglei,
Philippe Mathieu-Daudé,
Shannon Zhao, Wei Yang, Andrew Jones, Shameer Kolothum,
Ben Warren
Make initial list contain aarch64 and x86_64 targets.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
v2:
* fix up error message (Philippe Mathieu-Daudé <philmd@redhat.com>)
---
tests/data/acpi/rebuild-expected-aml.sh | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/tests/data/acpi/rebuild-expected-aml.sh b/tests/data/acpi/rebuild-expected-aml.sh
index abdff70..52793f3 100755
--- a/tests/data/acpi/rebuild-expected-aml.sh
+++ b/tests/data/acpi/rebuild-expected-aml.sh
@@ -7,21 +7,12 @@
#
# Authors:
# Marcel Apfelbaum <marcel.a@redhat.com>
+# Igor Mammedov <imammedo@redhat.com>
#
# This work is licensed under the terms of the GNU GPLv2.
# See the COPYING.LIB file in the top-level directory.
-qemu=
-
-if [ -e x86_64-softmmu/qemu-system-x86_64 ]; then
- qemu="x86_64-softmmu/qemu-system-x86_64"
-elif [ -e i386-softmmu/qemu-system-i386 ]; then
- qemu="i386-softmmu/qemu-system-i386"
-else
- echo "Run 'make' to build the qemu exectutable!"
- echo "Run this script from the build directory."
- exit 1;
-fi
+qemu_bins="aarch64-softmmu/qemu-system-aarch64 x86_64-softmmu/qemu-system-x86_64"
if [ ! -e "tests/bios-tables-test" ]; then
echo "Test: bios-tables-test is required! Run make check before this script."
@@ -29,6 +20,14 @@ if [ ! -e "tests/bios-tables-test" ]; then
exit 1;
fi
-TEST_ACPI_REBUILD_AML=y QTEST_QEMU_BINARY=$qemu tests/bios-tables-test
+for qemu in $qemu_bins; do
+ if [ ! -e $qemu ]; then
+ echo "Run 'make' to build the following QEMU exectutables: $qemu_bins"
+ echo "Also, run this script from the build directory."
+ exit 1;
+ fi
+ TEST_ACPI_REBUILD_AML=y QTEST_QEMU_BINARY=$qemu tests/bios-tables-test
+done
+
echo "The files were rebuilt and can be added to git."
--
2.7.4
^ permalink raw reply related [flat|nested] 88+ messages in thread
* [Qemu-devel] [PATCH v3 12/13] tests: acpi: refactor rebuild-expected-aml.sh to dump ACPI tables for a specified list of targets
@ 2019-04-25 5:34 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-04-25 5:34 UTC (permalink / raw)
To: qemu-devel
Cc: Andrew Jones, Ben Warren, Michael S. Tsirkin, Laszlo Ersek,
Shameer Kolothum, Shannon Zhao, Gonglei, Wei Yang,
Philippe Mathieu-Daudé
Make initial list contain aarch64 and x86_64 targets.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
v2:
* fix up error message (Philippe Mathieu-Daudé <philmd@redhat.com>)
---
tests/data/acpi/rebuild-expected-aml.sh | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/tests/data/acpi/rebuild-expected-aml.sh b/tests/data/acpi/rebuild-expected-aml.sh
index abdff70..52793f3 100755
--- a/tests/data/acpi/rebuild-expected-aml.sh
+++ b/tests/data/acpi/rebuild-expected-aml.sh
@@ -7,21 +7,12 @@
#
# Authors:
# Marcel Apfelbaum <marcel.a@redhat.com>
+# Igor Mammedov <imammedo@redhat.com>
#
# This work is licensed under the terms of the GNU GPLv2.
# See the COPYING.LIB file in the top-level directory.
-qemu=
-
-if [ -e x86_64-softmmu/qemu-system-x86_64 ]; then
- qemu="x86_64-softmmu/qemu-system-x86_64"
-elif [ -e i386-softmmu/qemu-system-i386 ]; then
- qemu="i386-softmmu/qemu-system-i386"
-else
- echo "Run 'make' to build the qemu exectutable!"
- echo "Run this script from the build directory."
- exit 1;
-fi
+qemu_bins="aarch64-softmmu/qemu-system-aarch64 x86_64-softmmu/qemu-system-x86_64"
if [ ! -e "tests/bios-tables-test" ]; then
echo "Test: bios-tables-test is required! Run make check before this script."
@@ -29,6 +20,14 @@ if [ ! -e "tests/bios-tables-test" ]; then
exit 1;
fi
-TEST_ACPI_REBUILD_AML=y QTEST_QEMU_BINARY=$qemu tests/bios-tables-test
+for qemu in $qemu_bins; do
+ if [ ! -e $qemu ]; then
+ echo "Run 'make' to build the following QEMU exectutables: $qemu_bins"
+ echo "Also, run this script from the build directory."
+ exit 1;
+ fi
+ TEST_ACPI_REBUILD_AML=y QTEST_QEMU_BINARY=$qemu tests/bios-tables-test
+done
+
echo "The files were rebuilt and can be added to git."
--
2.7.4
^ permalink raw reply related [flat|nested] 88+ messages in thread
* [Qemu-devel] [PATCH v3 13/13] tests: acpi: print error unable to dump ACPI table during rebuild
@ 2019-04-25 5:34 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-04-25 5:34 UTC (permalink / raw)
To: qemu-devel
Cc: Laszlo Ersek, Michael S. Tsirkin, Gonglei,
Philippe Mathieu-Daudé,
Shannon Zhao, Wei Yang, Andrew Jones, Shameer Kolothum,
Ben Warren
Instead of just asserting print the error that lead to assert first.
While at it move assert into rebuild branch, which removes reduntant
check done in case of !rebuild branch is taken (the later is taken
care of by g_assert_no_error).
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
tests/bios-tables-test.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
index f117461..5a5d036 100644
--- a/tests/bios-tables-test.c
+++ b/tests/bios-tables-test.c
@@ -199,11 +199,14 @@ static void dump_aml_files(test_data *data, bool rebuild)
sdt->aml, ext);
fd = g_open(aml_file, O_WRONLY|O_TRUNC|O_CREAT,
S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH);
+ if (fd < 0) {
+ perror(aml_file);
+ }
+ g_assert(fd >= 0);
} else {
fd = g_file_open_tmp("aml-XXXXXX", &sdt->aml_file, &error);
g_assert_no_error(error);
}
- g_assert(fd >= 0);
ret = qemu_write_full(fd, sdt->aml, sdt->aml_len);
g_assert(ret == sdt->aml_len);
--
2.7.4
^ permalink raw reply related [flat|nested] 88+ messages in thread
* [Qemu-devel] [PATCH v3 13/13] tests: acpi: print error unable to dump ACPI table during rebuild
@ 2019-04-25 5:34 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-04-25 5:34 UTC (permalink / raw)
To: qemu-devel
Cc: Andrew Jones, Ben Warren, Michael S. Tsirkin, Laszlo Ersek,
Shameer Kolothum, Shannon Zhao, Gonglei, Wei Yang,
Philippe Mathieu-Daudé
Instead of just asserting print the error that lead to assert first.
While at it move assert into rebuild branch, which removes reduntant
check done in case of !rebuild branch is taken (the later is taken
care of by g_assert_no_error).
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
tests/bios-tables-test.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
index f117461..5a5d036 100644
--- a/tests/bios-tables-test.c
+++ b/tests/bios-tables-test.c
@@ -199,11 +199,14 @@ static void dump_aml_files(test_data *data, bool rebuild)
sdt->aml, ext);
fd = g_open(aml_file, O_WRONLY|O_TRUNC|O_CREAT,
S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH);
+ if (fd < 0) {
+ perror(aml_file);
+ }
+ g_assert(fd >= 0);
} else {
fd = g_file_open_tmp("aml-XXXXXX", &sdt->aml_file, &error);
g_assert_no_error(error);
}
- g_assert(fd >= 0);
ret = qemu_write_full(fd, sdt->aml, sdt->aml_len);
g_assert(ret == sdt->aml_len);
--
2.7.4
^ permalink raw reply related [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 01/13] tests: acpi: make RSDT test routine handle XSDT
@ 2019-04-25 7:22 ` Wei Yang
0 siblings, 0 replies; 88+ messages in thread
From: Wei Yang @ 2019-04-25 7:22 UTC (permalink / raw)
To: Igor Mammedov
Cc: qemu-devel, Laszlo Ersek, Michael S. Tsirkin, Gonglei,
Philippe Mathieu-Daudé,
Shannon Zhao, Wei Yang, Andrew Jones, Shameer Kolothum,
Ben Warren
On Thu, Apr 25, 2019 at 07:34:37AM +0200, Igor Mammedov wrote:
>If RSDP revision is more than 0 fetch table pointed by XSDT
>and fallback to legacy RSDT table otherwise.
>
>While at it drop unused acpi_get_xsdt_address().
Would it be proper to split this into another patch?
>
>Signed-off-by: Igor Mammedov <imammedo@redhat.com>
>---
>PS:
> it doesn't affect existing pc/q35 machines as they use RSDP.revision == 0
> but it will be used by followup patch to enable testing arm/virt
> board which uses provides XSDT table.
>---
> tests/acpi-utils.h | 3 +--
> tests/acpi-utils.c | 14 +-------------
> tests/bios-tables-test.c | 18 +++++++++++++-----
> 3 files changed, 15 insertions(+), 20 deletions(-)
>
>diff --git a/tests/acpi-utils.h b/tests/acpi-utils.h
>index ef388bb..8c68201 100644
>--- a/tests/acpi-utils.h
>+++ b/tests/acpi-utils.h
>@@ -46,8 +46,7 @@ typedef struct {
>
> uint8_t acpi_calc_checksum(const uint8_t *data, int len);
> uint32_t acpi_find_rsdp_address(QTestState *qts);
>-uint64_t acpi_get_xsdt_address(uint8_t *rsdp_table);
>-void acpi_parse_rsdp_table(QTestState *qts, uint32_t addr, uint8_t *rsdp_table);
>+void acpi_parse_rsdp_table(QTestState *qts, uint64_t addr, uint8_t *rsdp_table);
Would you mind giving some hint of this change?
> void acpi_fetch_table(QTestState *qts, uint8_t **aml, uint32_t *aml_len,
> const uint8_t *addr_ptr, const char *sig,
> bool verify_checksum);
>diff --git a/tests/acpi-utils.c b/tests/acpi-utils.c
>index cc33b46..9a6d1d3 100644
>--- a/tests/acpi-utils.c
>+++ b/tests/acpi-utils.c
>@@ -51,19 +51,7 @@ uint32_t acpi_find_rsdp_address(QTestState *qts)
> return off;
> }
>
>-uint64_t acpi_get_xsdt_address(uint8_t *rsdp_table)
>-{
>- uint64_t xsdt_physical_address;
>- uint8_t revision = rsdp_table[15 /* Revision offset */];
>-
>- /* We must have revision 2 if we're looking for an XSDT pointer */
>- g_assert(revision == 2);
>-
>- memcpy(&xsdt_physical_address, &rsdp_table[24 /* XsdtAddress offset */], 8);
>- return le64_to_cpu(xsdt_physical_address);
>-}
>-
>-void acpi_parse_rsdp_table(QTestState *qts, uint32_t addr, uint8_t *rsdp_table)
>+void acpi_parse_rsdp_table(QTestState *qts, uint64_t addr, uint8_t *rsdp_table)
> {
> uint8_t revision;
>
>diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
>index a506dcb..24bd102 100644
>--- a/tests/bios-tables-test.c
>+++ b/tests/bios-tables-test.c
>@@ -107,17 +107,25 @@ static void test_acpi_rsdp_table(test_data *data)
> }
> }
>
>-static void test_acpi_rsdt_table(test_data *data)
>+static void test_acpi_rxsdt_table(test_data *data)
> {
>+ const char *sig = "RSDT";
> AcpiSdtTable rsdt = {};
>+ int entry_size = 4;
>+ int addr_off = 16 /* RsdtAddress */;
> uint8_t *ent;
>
>- /* read RSDT table */
>+ if (data->rsdp_table[15 /* Revision offset */] != 0) {
>+ addr_off = 24 /* XsdtAddress */;
>+ entry_size = 8;
>+ sig = "XSDT";
>+ }
>+ /* read [RX]SDT table */
> acpi_fetch_table(data->qts, &rsdt.aml, &rsdt.aml_len,
>- &data->rsdp_table[16 /* RsdtAddress */], "RSDT", true);
>+ &data->rsdp_table[addr_off], sig, true);
>
> /* Load all tables and add to test list directly RSDT referenced tables */
>- ACPI_FOREACH_RSDT_ENTRY(rsdt.aml, rsdt.aml_len, ent, 4 /* Entry size */) {
>+ ACPI_FOREACH_RSDT_ENTRY(rsdt.aml, rsdt.aml_len, ent, entry_size) {
> AcpiSdtTable ssdt_table = {};
>
> acpi_fetch_table(data->qts, &ssdt_table.aml, &ssdt_table.aml_len, ent,
>@@ -521,7 +529,7 @@ static void test_acpi_one(const char *params, test_data *data)
> data->tables = g_array_new(false, true, sizeof(AcpiSdtTable));
> test_acpi_rsdp_address(data);
> test_acpi_rsdp_table(data);
>- test_acpi_rsdt_table(data);
>+ test_acpi_rxsdt_table(data);
> test_acpi_fadt_table(data);
>
> if (iasl) {
>--
>2.7.4
--
Wei Yang
Help you, Help me
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 01/13] tests: acpi: make RSDT test routine handle XSDT
@ 2019-04-25 7:22 ` Wei Yang
0 siblings, 0 replies; 88+ messages in thread
From: Wei Yang @ 2019-04-25 7:22 UTC (permalink / raw)
To: Igor Mammedov
Cc: Andrew Jones, Ben Warren, Michael S. Tsirkin, Laszlo Ersek,
qemu-devel, Shameer Kolothum, Shannon Zhao, Gonglei, Wei Yang,
Philippe Mathieu-Daudé
On Thu, Apr 25, 2019 at 07:34:37AM +0200, Igor Mammedov wrote:
>If RSDP revision is more than 0 fetch table pointed by XSDT
>and fallback to legacy RSDT table otherwise.
>
>While at it drop unused acpi_get_xsdt_address().
Would it be proper to split this into another patch?
>
>Signed-off-by: Igor Mammedov <imammedo@redhat.com>
>---
>PS:
> it doesn't affect existing pc/q35 machines as they use RSDP.revision == 0
> but it will be used by followup patch to enable testing arm/virt
> board which uses provides XSDT table.
>---
> tests/acpi-utils.h | 3 +--
> tests/acpi-utils.c | 14 +-------------
> tests/bios-tables-test.c | 18 +++++++++++++-----
> 3 files changed, 15 insertions(+), 20 deletions(-)
>
>diff --git a/tests/acpi-utils.h b/tests/acpi-utils.h
>index ef388bb..8c68201 100644
>--- a/tests/acpi-utils.h
>+++ b/tests/acpi-utils.h
>@@ -46,8 +46,7 @@ typedef struct {
>
> uint8_t acpi_calc_checksum(const uint8_t *data, int len);
> uint32_t acpi_find_rsdp_address(QTestState *qts);
>-uint64_t acpi_get_xsdt_address(uint8_t *rsdp_table);
>-void acpi_parse_rsdp_table(QTestState *qts, uint32_t addr, uint8_t *rsdp_table);
>+void acpi_parse_rsdp_table(QTestState *qts, uint64_t addr, uint8_t *rsdp_table);
Would you mind giving some hint of this change?
> void acpi_fetch_table(QTestState *qts, uint8_t **aml, uint32_t *aml_len,
> const uint8_t *addr_ptr, const char *sig,
> bool verify_checksum);
>diff --git a/tests/acpi-utils.c b/tests/acpi-utils.c
>index cc33b46..9a6d1d3 100644
>--- a/tests/acpi-utils.c
>+++ b/tests/acpi-utils.c
>@@ -51,19 +51,7 @@ uint32_t acpi_find_rsdp_address(QTestState *qts)
> return off;
> }
>
>-uint64_t acpi_get_xsdt_address(uint8_t *rsdp_table)
>-{
>- uint64_t xsdt_physical_address;
>- uint8_t revision = rsdp_table[15 /* Revision offset */];
>-
>- /* We must have revision 2 if we're looking for an XSDT pointer */
>- g_assert(revision == 2);
>-
>- memcpy(&xsdt_physical_address, &rsdp_table[24 /* XsdtAddress offset */], 8);
>- return le64_to_cpu(xsdt_physical_address);
>-}
>-
>-void acpi_parse_rsdp_table(QTestState *qts, uint32_t addr, uint8_t *rsdp_table)
>+void acpi_parse_rsdp_table(QTestState *qts, uint64_t addr, uint8_t *rsdp_table)
> {
> uint8_t revision;
>
>diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
>index a506dcb..24bd102 100644
>--- a/tests/bios-tables-test.c
>+++ b/tests/bios-tables-test.c
>@@ -107,17 +107,25 @@ static void test_acpi_rsdp_table(test_data *data)
> }
> }
>
>-static void test_acpi_rsdt_table(test_data *data)
>+static void test_acpi_rxsdt_table(test_data *data)
> {
>+ const char *sig = "RSDT";
> AcpiSdtTable rsdt = {};
>+ int entry_size = 4;
>+ int addr_off = 16 /* RsdtAddress */;
> uint8_t *ent;
>
>- /* read RSDT table */
>+ if (data->rsdp_table[15 /* Revision offset */] != 0) {
>+ addr_off = 24 /* XsdtAddress */;
>+ entry_size = 8;
>+ sig = "XSDT";
>+ }
>+ /* read [RX]SDT table */
> acpi_fetch_table(data->qts, &rsdt.aml, &rsdt.aml_len,
>- &data->rsdp_table[16 /* RsdtAddress */], "RSDT", true);
>+ &data->rsdp_table[addr_off], sig, true);
>
> /* Load all tables and add to test list directly RSDT referenced tables */
>- ACPI_FOREACH_RSDT_ENTRY(rsdt.aml, rsdt.aml_len, ent, 4 /* Entry size */) {
>+ ACPI_FOREACH_RSDT_ENTRY(rsdt.aml, rsdt.aml_len, ent, entry_size) {
> AcpiSdtTable ssdt_table = {};
>
> acpi_fetch_table(data->qts, &ssdt_table.aml, &ssdt_table.aml_len, ent,
>@@ -521,7 +529,7 @@ static void test_acpi_one(const char *params, test_data *data)
> data->tables = g_array_new(false, true, sizeof(AcpiSdtTable));
> test_acpi_rsdp_address(data);
> test_acpi_rsdp_table(data);
>- test_acpi_rsdt_table(data);
>+ test_acpi_rxsdt_table(data);
> test_acpi_fadt_table(data);
>
> if (iasl) {
>--
>2.7.4
--
Wei Yang
Help you, Help me
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 02/13] tests: acpi: rename acpi_parse_rsdp_table() into acpi_fetch_rsdp_table()
@ 2019-04-25 7:24 ` Wei Yang
0 siblings, 0 replies; 88+ messages in thread
From: Wei Yang @ 2019-04-25 7:24 UTC (permalink / raw)
To: Igor Mammedov
Cc: qemu-devel, Laszlo Ersek, Michael S. Tsirkin, Gonglei,
Philippe Mathieu-Daudé,
Shannon Zhao, Wei Yang, Andrew Jones, Shameer Kolothum,
Ben Warren
On Thu, Apr 25, 2019 at 07:34:38AM +0200, Igor Mammedov wrote:
>so name would reflect what the function does
>
>Signed-off-by: Igor Mammedov <imammedo@redhat.com>
>Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Wei Yang <richardw.yang@linux.intel.com>
>---
> tests/acpi-utils.h | 2 +-
> tests/acpi-utils.c | 2 +-
> tests/bios-tables-test.c | 2 +-
> tests/vmgenid-test.c | 2 +-
> 4 files changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/tests/acpi-utils.h b/tests/acpi-utils.h
>index 8c68201..75f78f2 100644
>--- a/tests/acpi-utils.h
>+++ b/tests/acpi-utils.h
>@@ -46,7 +46,7 @@ typedef struct {
>
> uint8_t acpi_calc_checksum(const uint8_t *data, int len);
> uint32_t acpi_find_rsdp_address(QTestState *qts);
>-void acpi_parse_rsdp_table(QTestState *qts, uint64_t addr, uint8_t *rsdp_table);
>+void acpi_fetch_rsdp_table(QTestState *qts, uint64_t addr, uint8_t *rsdp_table);
> void acpi_fetch_table(QTestState *qts, uint8_t **aml, uint32_t *aml_len,
> const uint8_t *addr_ptr, const char *sig,
> bool verify_checksum);
>diff --git a/tests/acpi-utils.c b/tests/acpi-utils.c
>index 9a6d1d3..2dd4fe0 100644
>--- a/tests/acpi-utils.c
>+++ b/tests/acpi-utils.c
>@@ -51,7 +51,7 @@ uint32_t acpi_find_rsdp_address(QTestState *qts)
> return off;
> }
>
>-void acpi_parse_rsdp_table(QTestState *qts, uint64_t addr, uint8_t *rsdp_table)
>+void acpi_fetch_rsdp_table(QTestState *qts, uint64_t addr, uint8_t *rsdp_table)
> {
> uint8_t revision;
>
>diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
>index 24bd102..2ee044c 100644
>--- a/tests/bios-tables-test.c
>+++ b/tests/bios-tables-test.c
>@@ -89,7 +89,7 @@ static void test_acpi_rsdp_table(test_data *data)
> uint8_t *rsdp_table = data->rsdp_table, revision;
> uint32_t addr = data->rsdp_addr;
>
>- acpi_parse_rsdp_table(data->qts, addr, rsdp_table);
>+ acpi_fetch_rsdp_table(data->qts, addr, rsdp_table);
> revision = rsdp_table[15 /* Revision offset */];
>
> switch (revision) {
>diff --git a/tests/vmgenid-test.c b/tests/vmgenid-test.c
>index ae38ee5..f400184 100644
>--- a/tests/vmgenid-test.c
>+++ b/tests/vmgenid-test.c
>@@ -40,7 +40,7 @@ static uint32_t acpi_find_vgia(QTestState *qts)
> g_assert_cmphex(rsdp_offset, <, RSDP_ADDR_INVALID);
>
>
>- acpi_parse_rsdp_table(qts, rsdp_offset, rsdp_table);
>+ acpi_fetch_rsdp_table(qts, rsdp_offset, rsdp_table);
> acpi_fetch_table(qts, &rsdt, &rsdt_len, &rsdp_table[16 /* RsdtAddress */],
> "RSDT", true);
>
>--
>2.7.4
--
Wei Yang
Help you, Help me
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 02/13] tests: acpi: rename acpi_parse_rsdp_table() into acpi_fetch_rsdp_table()
@ 2019-04-25 7:24 ` Wei Yang
0 siblings, 0 replies; 88+ messages in thread
From: Wei Yang @ 2019-04-25 7:24 UTC (permalink / raw)
To: Igor Mammedov
Cc: Andrew Jones, Ben Warren, Michael S. Tsirkin, Laszlo Ersek,
qemu-devel, Shameer Kolothum, Shannon Zhao, Gonglei, Wei Yang,
Philippe Mathieu-Daudé
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="UTF-8", Size: 2626 bytes --]
On Thu, Apr 25, 2019 at 07:34:38AM +0200, Igor Mammedov wrote:
>so name would reflect what the function does
>
>Signed-off-by: Igor Mammedov <imammedo@redhat.com>
>Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Wei Yang <richardw.yang@linux.intel.com>
>---
> tests/acpi-utils.h | 2 +-
> tests/acpi-utils.c | 2 +-
> tests/bios-tables-test.c | 2 +-
> tests/vmgenid-test.c | 2 +-
> 4 files changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/tests/acpi-utils.h b/tests/acpi-utils.h
>index 8c68201..75f78f2 100644
>--- a/tests/acpi-utils.h
>+++ b/tests/acpi-utils.h
>@@ -46,7 +46,7 @@ typedef struct {
>
> uint8_t acpi_calc_checksum(const uint8_t *data, int len);
> uint32_t acpi_find_rsdp_address(QTestState *qts);
>-void acpi_parse_rsdp_table(QTestState *qts, uint64_t addr, uint8_t *rsdp_table);
>+void acpi_fetch_rsdp_table(QTestState *qts, uint64_t addr, uint8_t *rsdp_table);
> void acpi_fetch_table(QTestState *qts, uint8_t **aml, uint32_t *aml_len,
> const uint8_t *addr_ptr, const char *sig,
> bool verify_checksum);
>diff --git a/tests/acpi-utils.c b/tests/acpi-utils.c
>index 9a6d1d3..2dd4fe0 100644
>--- a/tests/acpi-utils.c
>+++ b/tests/acpi-utils.c
>@@ -51,7 +51,7 @@ uint32_t acpi_find_rsdp_address(QTestState *qts)
> return off;
> }
>
>-void acpi_parse_rsdp_table(QTestState *qts, uint64_t addr, uint8_t *rsdp_table)
>+void acpi_fetch_rsdp_table(QTestState *qts, uint64_t addr, uint8_t *rsdp_table)
> {
> uint8_t revision;
>
>diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
>index 24bd102..2ee044c 100644
>--- a/tests/bios-tables-test.c
>+++ b/tests/bios-tables-test.c
>@@ -89,7 +89,7 @@ static void test_acpi_rsdp_table(test_data *data)
> uint8_t *rsdp_table = data->rsdp_table, revision;
> uint32_t addr = data->rsdp_addr;
>
>- acpi_parse_rsdp_table(data->qts, addr, rsdp_table);
>+ acpi_fetch_rsdp_table(data->qts, addr, rsdp_table);
> revision = rsdp_table[15 /* Revision offset */];
>
> switch (revision) {
>diff --git a/tests/vmgenid-test.c b/tests/vmgenid-test.c
>index ae38ee5..f400184 100644
>--- a/tests/vmgenid-test.c
>+++ b/tests/vmgenid-test.c
>@@ -40,7 +40,7 @@ static uint32_t acpi_find_vgia(QTestState *qts)
> g_assert_cmphex(rsdp_offset, <, RSDP_ADDR_INVALID);
>
>
>- acpi_parse_rsdp_table(qts, rsdp_offset, rsdp_table);
>+ acpi_fetch_rsdp_table(qts, rsdp_offset, rsdp_table);
> acpi_fetch_table(qts, &rsdt, &rsdt_len, &rsdp_table[16 /* RsdtAddress */],
> "RSDT", true);
>
>--
>2.7.4
--
Wei Yang
Help you, Help me
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 03/13] tests: acpi: make pointer to RSDP 64bit
@ 2019-04-25 7:31 ` Wei Yang
0 siblings, 0 replies; 88+ messages in thread
From: Wei Yang @ 2019-04-25 7:31 UTC (permalink / raw)
To: Igor Mammedov
Cc: qemu-devel, Laszlo Ersek, Michael S. Tsirkin, Gonglei,
Philippe Mathieu-Daudé,
Shannon Zhao, Wei Yang, Andrew Jones, Shameer Kolothum,
Ben Warren
On Thu, Apr 25, 2019 at 07:34:39AM +0200, Igor Mammedov wrote:
>In case of UEFI, RSDP doesn't have to be located in lowmem,
>it could be placed at any address. Make sure that test won't
>break if it is placed above the first 4Gb of address space.
>
>PS:
>While at it cleanup some local variables as we don't really
>need them.
>
>Signed-off-by: Igor Mammedov <imammedo@redhat.com>
>Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>---
>v2:
> - s/In case of UEFI/In case of UEFI,/ (Laszlo Ersek <lersek@redhat.com>)
>---
> tests/bios-tables-test.c | 10 ++++------
> 1 file changed, 4 insertions(+), 6 deletions(-)
>
>diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
>index 2ee044c..c29dcf4 100644
>--- a/tests/bios-tables-test.c
>+++ b/tests/bios-tables-test.c
>@@ -26,7 +26,7 @@
> typedef struct {
> const char *machine;
> const char *variant;
>- uint32_t rsdp_addr;
>+ uint64_t rsdp_addr;
> uint8_t rsdp_table[36 /* ACPI 2.0+ RSDP size */];
> GArray *tables;
> uint32_t smbios_ep_addr;
>@@ -86,13 +86,11 @@ static void test_acpi_rsdp_address(test_data *data)
>
> static void test_acpi_rsdp_table(test_data *data)
> {
>- uint8_t *rsdp_table = data->rsdp_table, revision;
>- uint32_t addr = data->rsdp_addr;
>+ uint8_t *rsdp_table = data->rsdp_table;
>
>- acpi_fetch_rsdp_table(data->qts, addr, rsdp_table);
>- revision = rsdp_table[15 /* Revision offset */];
>+ acpi_fetch_rsdp_table(data->qts, data->rsdp_addr, rsdp_table);
Ok, I think this is the reason you change the second parameter from uint32_t
to uint64_t in 1st patch.
Maybe we need to move that on to this one?
>
>- switch (revision) {
>+ switch (rsdp_table[15 /* Revision offset */]) {
> case 0: /* ACPI 1.0 RSDP */
> /* With rev 1, checksum is only for the first 20 bytes */
> g_assert(!acpi_calc_checksum(rsdp_table, 20));
>--
>2.7.4
--
Wei Yang
Help you, Help me
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 03/13] tests: acpi: make pointer to RSDP 64bit
@ 2019-04-25 7:31 ` Wei Yang
0 siblings, 0 replies; 88+ messages in thread
From: Wei Yang @ 2019-04-25 7:31 UTC (permalink / raw)
To: Igor Mammedov
Cc: Andrew Jones, Ben Warren, Michael S. Tsirkin, Laszlo Ersek,
qemu-devel, Shameer Kolothum, Shannon Zhao, Gonglei, Wei Yang,
Philippe Mathieu-Daudé
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="UTF-8", Size: 1933 bytes --]
On Thu, Apr 25, 2019 at 07:34:39AM +0200, Igor Mammedov wrote:
>In case of UEFI, RSDP doesn't have to be located in lowmem,
>it could be placed at any address. Make sure that test won't
>break if it is placed above the first 4Gb of address space.
>
>PS:
>While at it cleanup some local variables as we don't really
>need them.
>
>Signed-off-by: Igor Mammedov <imammedo@redhat.com>
>Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>---
>v2:
> - s/In case of UEFI/In case of UEFI,/ (Laszlo Ersek <lersek@redhat.com>)
>---
> tests/bios-tables-test.c | 10 ++++------
> 1 file changed, 4 insertions(+), 6 deletions(-)
>
>diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
>index 2ee044c..c29dcf4 100644
>--- a/tests/bios-tables-test.c
>+++ b/tests/bios-tables-test.c
>@@ -26,7 +26,7 @@
> typedef struct {
> const char *machine;
> const char *variant;
>- uint32_t rsdp_addr;
>+ uint64_t rsdp_addr;
> uint8_t rsdp_table[36 /* ACPI 2.0+ RSDP size */];
> GArray *tables;
> uint32_t smbios_ep_addr;
>@@ -86,13 +86,11 @@ static void test_acpi_rsdp_address(test_data *data)
>
> static void test_acpi_rsdp_table(test_data *data)
> {
>- uint8_t *rsdp_table = data->rsdp_table, revision;
>- uint32_t addr = data->rsdp_addr;
>+ uint8_t *rsdp_table = data->rsdp_table;
>
>- acpi_fetch_rsdp_table(data->qts, addr, rsdp_table);
>- revision = rsdp_table[15 /* Revision offset */];
>+ acpi_fetch_rsdp_table(data->qts, data->rsdp_addr, rsdp_table);
Ok, I think this is the reason you change the second parameter from uint32_t
to uint64_t in 1st patch.
Maybe we need to move that on to this one?
>
>- switch (revision) {
>+ switch (rsdp_table[15 /* Revision offset */]) {
> case 0: /* ACPI 1.0 RSDP */
> /* With rev 1, checksum is only for the first 20 bytes */
> g_assert(!acpi_calc_checksum(rsdp_table, 20));
>--
>2.7.4
--
Wei Yang
Help you, Help me
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 04/13] tests: acpi: fetch X_DSDT if pointer to DSDT is 0
@ 2019-04-25 7:44 ` Wei Yang
0 siblings, 0 replies; 88+ messages in thread
From: Wei Yang @ 2019-04-25 7:44 UTC (permalink / raw)
To: Igor Mammedov
Cc: qemu-devel, Laszlo Ersek, Michael S. Tsirkin, Gonglei,
Philippe Mathieu-Daudé,
Shannon Zhao, Wei Yang, Andrew Jones, Shameer Kolothum,
Ben Warren
On Thu, Apr 25, 2019 at 07:34:40AM +0200, Igor Mammedov wrote:
>that way it would be possible to test a DSDT pointed by
>64bit X_DSDT field in FADT.
>
>PS:
>it will allow to enable testing arm/virt board, which sets
>only newer X_DSDT field.
>
>Signed-off-by: Igor Mammedov <imammedo@redhat.com>
>Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Wei Yang <richardw.yang@linux.intel.com>
>---
>v2:
> add 'val = le32_to_cpu(val)' even if it doesn't necessary
> it works as reminder that value copied from table is in
> little-endian format (Philippe Mathieu-Daudé <philmd@redhat.com>)
>---
> tests/bios-tables-test.c | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
>diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
>index c29dcf4..ed62a17 100644
>--- a/tests/bios-tables-test.c
>+++ b/tests/bios-tables-test.c
>@@ -140,6 +140,8 @@ static void test_acpi_fadt_table(test_data *data)
> AcpiSdtTable table = g_array_index(data->tables, typeof(table), 0);
> uint8_t *fadt_aml = table.aml;
> uint32_t fadt_len = table.aml_len;
>+ uint32_t val;
>+ int dsdt_offset = 40 /* DSDT */;
>
> g_assert(compare_signature(&table, "FACP"));
>
>@@ -148,8 +150,13 @@ static void test_acpi_fadt_table(test_data *data)
> fadt_aml + 36 /* FIRMWARE_CTRL */, "FACS", false);
> g_array_append_val(data->tables, table);
>
>+ memcpy(&val, fadt_aml + dsdt_offset, 4);
>+ val = le32_to_cpu(val);
>+ if (!val) {
>+ dsdt_offset = 140 /* X_DSDT */;
>+ }
> acpi_fetch_table(data->qts, &table.aml, &table.aml_len,
>- fadt_aml + 40 /* DSDT */, "DSDT", true);
>+ fadt_aml + dsdt_offset, "DSDT", true);
> g_array_append_val(data->tables, table);
>
> memset(fadt_aml + 36, 0, 4); /* sanitize FIRMWARE_CTRL ptr */
>--
>2.7.4
--
Wei Yang
Help you, Help me
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 04/13] tests: acpi: fetch X_DSDT if pointer to DSDT is 0
@ 2019-04-25 7:44 ` Wei Yang
0 siblings, 0 replies; 88+ messages in thread
From: Wei Yang @ 2019-04-25 7:44 UTC (permalink / raw)
To: Igor Mammedov
Cc: Andrew Jones, Ben Warren, Michael S. Tsirkin, Laszlo Ersek,
qemu-devel, Shameer Kolothum, Shannon Zhao, Gonglei, Wei Yang,
Philippe Mathieu-Daudé
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="UTF-8", Size: 1897 bytes --]
On Thu, Apr 25, 2019 at 07:34:40AM +0200, Igor Mammedov wrote:
>that way it would be possible to test a DSDT pointed by
>64bit X_DSDT field in FADT.
>
>PS:
>it will allow to enable testing arm/virt board, which sets
>only newer X_DSDT field.
>
>Signed-off-by: Igor Mammedov <imammedo@redhat.com>
>Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Wei Yang <richardw.yang@linux.intel.com>
>---
>v2:
> add 'val = le32_to_cpu(val)' even if it doesn't necessary
> it works as reminder that value copied from table is in
> little-endian format (Philippe Mathieu-Daudé <philmd@redhat.com>)
>---
> tests/bios-tables-test.c | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
>diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
>index c29dcf4..ed62a17 100644
>--- a/tests/bios-tables-test.c
>+++ b/tests/bios-tables-test.c
>@@ -140,6 +140,8 @@ static void test_acpi_fadt_table(test_data *data)
> AcpiSdtTable table = g_array_index(data->tables, typeof(table), 0);
> uint8_t *fadt_aml = table.aml;
> uint32_t fadt_len = table.aml_len;
>+ uint32_t val;
>+ int dsdt_offset = 40 /* DSDT */;
>
> g_assert(compare_signature(&table, "FACP"));
>
>@@ -148,8 +150,13 @@ static void test_acpi_fadt_table(test_data *data)
> fadt_aml + 36 /* FIRMWARE_CTRL */, "FACS", false);
> g_array_append_val(data->tables, table);
>
>+ memcpy(&val, fadt_aml + dsdt_offset, 4);
>+ val = le32_to_cpu(val);
>+ if (!val) {
>+ dsdt_offset = 140 /* X_DSDT */;
>+ }
> acpi_fetch_table(data->qts, &table.aml, &table.aml_len,
>- fadt_aml + 40 /* DSDT */, "DSDT", true);
>+ fadt_aml + dsdt_offset, "DSDT", true);
> g_array_append_val(data->tables, table);
>
> memset(fadt_aml + 36, 0, 4); /* sanitize FIRMWARE_CTRL ptr */
>--
>2.7.4
--
Wei Yang
Help you, Help me
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 05/13] tests: acpi: skip FACS table if board uses hw reduced ACPI profile
@ 2019-04-25 7:48 ` Wei Yang
0 siblings, 0 replies; 88+ messages in thread
From: Wei Yang @ 2019-04-25 7:48 UTC (permalink / raw)
To: Igor Mammedov
Cc: qemu-devel, Laszlo Ersek, Michael S. Tsirkin, Gonglei,
Philippe Mathieu-Daudé,
Shannon Zhao, Wei Yang, Andrew Jones, Shameer Kolothum,
Ben Warren
On Thu, Apr 25, 2019 at 07:34:41AM +0200, Igor Mammedov wrote:
>If FADT has HW_REDUCED_ACPI flag set, do not attempt to fetch
>FACS as it's not provided by the board.
>
>Signed-off-by: Igor Mammedov <imammedo@redhat.com>
>Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Wei Yang <richardw.yang@linux.intel.com>
>---
> tests/bios-tables-test.c | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
>diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
>index ed62a17..e944d00 100644
>--- a/tests/bios-tables-test.c
>+++ b/tests/bios-tables-test.c
>@@ -146,9 +146,13 @@ static void test_acpi_fadt_table(test_data *data)
> g_assert(compare_signature(&table, "FACP"));
>
> /* Since DSDT/FACS isn't in RSDT, add them to ASL test list manually */
>- acpi_fetch_table(data->qts, &table.aml, &table.aml_len,
>- fadt_aml + 36 /* FIRMWARE_CTRL */, "FACS", false);
>- g_array_append_val(data->tables, table);
>+ memcpy(&val, fadt_aml + 112 /* Flags */, 4);
>+ val = le32_to_cpu(val);
>+ if (!(val & 1UL << 20 /* HW_REDUCED_ACPI */)) {
>+ acpi_fetch_table(data->qts, &table.aml, &table.aml_len,
>+ fadt_aml + 36 /* FIRMWARE_CTRL */, "FACS", false);
>+ g_array_append_val(data->tables, table);
>+ }
>
> memcpy(&val, fadt_aml + dsdt_offset, 4);
> val = le32_to_cpu(val);
>--
>2.7.4
--
Wei Yang
Help you, Help me
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 05/13] tests: acpi: skip FACS table if board uses hw reduced ACPI profile
@ 2019-04-25 7:48 ` Wei Yang
0 siblings, 0 replies; 88+ messages in thread
From: Wei Yang @ 2019-04-25 7:48 UTC (permalink / raw)
To: Igor Mammedov
Cc: Andrew Jones, Ben Warren, Michael S. Tsirkin, Laszlo Ersek,
qemu-devel, Shameer Kolothum, Shannon Zhao, Gonglei, Wei Yang,
Philippe Mathieu-Daudé
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="UTF-8", Size: 1445 bytes --]
On Thu, Apr 25, 2019 at 07:34:41AM +0200, Igor Mammedov wrote:
>If FADT has HW_REDUCED_ACPI flag set, do not attempt to fetch
>FACS as it's not provided by the board.
>
>Signed-off-by: Igor Mammedov <imammedo@redhat.com>
>Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Wei Yang <richardw.yang@linux.intel.com>
>---
> tests/bios-tables-test.c | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
>diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
>index ed62a17..e944d00 100644
>--- a/tests/bios-tables-test.c
>+++ b/tests/bios-tables-test.c
>@@ -146,9 +146,13 @@ static void test_acpi_fadt_table(test_data *data)
> g_assert(compare_signature(&table, "FACP"));
>
> /* Since DSDT/FACS isn't in RSDT, add them to ASL test list manually */
>- acpi_fetch_table(data->qts, &table.aml, &table.aml_len,
>- fadt_aml + 36 /* FIRMWARE_CTRL */, "FACS", false);
>- g_array_append_val(data->tables, table);
>+ memcpy(&val, fadt_aml + 112 /* Flags */, 4);
>+ val = le32_to_cpu(val);
>+ if (!(val & 1UL << 20 /* HW_REDUCED_ACPI */)) {
>+ acpi_fetch_table(data->qts, &table.aml, &table.aml_len,
>+ fadt_aml + 36 /* FIRMWARE_CTRL */, "FACS", false);
>+ g_array_append_val(data->tables, table);
>+ }
>
> memcpy(&val, fadt_aml + dsdt_offset, 4);
> val = le32_to_cpu(val);
>--
>2.7.4
--
Wei Yang
Help you, Help me
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 07/13] tests: acpi: add acpi_find_rsdp_address_uefi() helper
@ 2019-04-25 8:00 ` Wei Yang
0 siblings, 0 replies; 88+ messages in thread
From: Wei Yang @ 2019-04-25 8:00 UTC (permalink / raw)
To: Igor Mammedov
Cc: qemu-devel, Laszlo Ersek, Michael S. Tsirkin, Gonglei,
Philippe Mathieu-Daudé,
Shannon Zhao, Wei Yang, Andrew Jones, Shameer Kolothum,
Ben Warren
On Thu, Apr 25, 2019 at 07:34:43AM +0200, Igor Mammedov wrote:
>introduce UEFI specific counterpart to acpi_find_rsdp_address()
>that will help to find RSDP address when [OA]VMF is used as
>firmware. It requires guest firmware or other guest app to place
>1Mb aligned UefiTestSupport structure (defined in this patch)
>in RAM with UefiTestSupport::signature_guid set to
>AB87A6B1-2034-BDA0-71BD-375007757785
Just curious about where we get this signature? Randomly generated?
>
>Signed-off-by: Igor Mammedov <imammedo@redhat.com>
>Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Wei Yang <richardw.yang@linux.intel.com>
>---
>v3:
> * fix checkpatch error (separate opening brace from values in AcpiTestSupportGuid initializer)
>v2:
> * Laszlo Ersek <lersek@redhat.com>
> - s/uefi_find_rsdp_addr/acpi_find_rsdp_address_uefi/
> - use GUID_SIZE instead of opencodding size
> - make AcpiTestSupportGuid const
> - s/TCI/TCG/
>---
> tests/acpi-utils.h | 2 ++
> tests/acpi-utils.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 46 insertions(+)
>
>diff --git a/tests/acpi-utils.h b/tests/acpi-utils.h
>index 75f78f2..dcfa721 100644
>--- a/tests/acpi-utils.h
>+++ b/tests/acpi-utils.h
>@@ -46,6 +46,8 @@ typedef struct {
>
> uint8_t acpi_calc_checksum(const uint8_t *data, int len);
> uint32_t acpi_find_rsdp_address(QTestState *qts);
>+uint64_t acpi_find_rsdp_address_uefi(QTestState *qts, uint64_t start,
>+ uint64_t size);
> void acpi_fetch_rsdp_table(QTestState *qts, uint64_t addr, uint8_t *rsdp_table);
> void acpi_fetch_table(QTestState *qts, uint8_t **aml, uint32_t *aml_len,
> const uint8_t *addr_ptr, const char *sig,
>diff --git a/tests/acpi-utils.c b/tests/acpi-utils.c
>index 2dd4fe0..197af82 100644
>--- a/tests/acpi-utils.c
>+++ b/tests/acpi-utils.c
>@@ -99,3 +99,47 @@ void acpi_fetch_table(QTestState *qts, uint8_t **aml, uint32_t *aml_len,
> g_assert(!acpi_calc_checksum(*aml, *aml_len));
> }
> }
>+
>+#define GUID_SIZE 16
>+static const uint8_t AcpiTestSupportGuid[GUID_SIZE] = {
>+ 0xb1, 0xa6, 0x87, 0xab,
>+ 0x34, 0x20,
>+ 0xa0, 0xbd,
>+ 0x71, 0xbd, 0x37, 0x50, 0x07, 0x75, 0x77, 0x85 };
>+
>+typedef struct {
>+ uint8_t signature_guid[GUID_SIZE];
>+ uint64_t rsdp10;
>+ uint64_t rsdp20;
>+} __attribute__((packed)) UefiTestSupport;
>+
>+/* Wait at most 600 seconds (test is slow with TCG and --enable-debug) */
>+#define TEST_DELAY (1 * G_USEC_PER_SEC / 10)
>+#define TEST_CYCLES MAX((600 * G_USEC_PER_SEC / TEST_DELAY), 1)
>+#define MB 0x100000ULL
>+uint64_t acpi_find_rsdp_address_uefi(QTestState *qts, uint64_t start,
>+ uint64_t size)
>+{
>+ int i, j;
>+ uint8_t data[GUID_SIZE];
>+
>+ for (i = 0; i < TEST_CYCLES; ++i) {
>+ for (j = 0; j < size / MB; j++) {
>+ /* look for GUID at every 1Mb block */
>+ uint64_t addr = start + j * MB;
>+
>+ qtest_memread(qts, addr, data, sizeof(data));
>+ if (!memcmp(AcpiTestSupportGuid, data, sizeof(data))) {
>+ UefiTestSupport ret;
>+
>+ qtest_memread(qts, addr, &ret, sizeof(ret));
>+ ret.rsdp10 = le64_to_cpu(ret.rsdp10);
>+ ret.rsdp20 = le64_to_cpu(ret.rsdp20);
>+ return ret.rsdp20 ? ret.rsdp20 : ret.rsdp10;
>+ }
>+ }
>+ g_usleep(TEST_DELAY);
>+ }
>+ g_assert_not_reached();
>+ return 0;
>+}
>--
>2.7.4
--
Wei Yang
Help you, Help me
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 07/13] tests: acpi: add acpi_find_rsdp_address_uefi() helper
@ 2019-04-25 8:00 ` Wei Yang
0 siblings, 0 replies; 88+ messages in thread
From: Wei Yang @ 2019-04-25 8:00 UTC (permalink / raw)
To: Igor Mammedov
Cc: Andrew Jones, Ben Warren, Michael S. Tsirkin, Laszlo Ersek,
qemu-devel, Shameer Kolothum, Shannon Zhao, Gonglei, Wei Yang,
Philippe Mathieu-Daudé
On Thu, Apr 25, 2019 at 07:34:43AM +0200, Igor Mammedov wrote:
>introduce UEFI specific counterpart to acpi_find_rsdp_address()
>that will help to find RSDP address when [OA]VMF is used as
>firmware. It requires guest firmware or other guest app to place
>1Mb aligned UefiTestSupport structure (defined in this patch)
>in RAM with UefiTestSupport::signature_guid set to
>AB87A6B1-2034-BDA0-71BD-375007757785
Just curious about where we get this signature? Randomly generated?
>
>Signed-off-by: Igor Mammedov <imammedo@redhat.com>
>Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Wei Yang <richardw.yang@linux.intel.com>
>---
>v3:
> * fix checkpatch error (separate opening brace from values in AcpiTestSupportGuid initializer)
>v2:
> * Laszlo Ersek <lersek@redhat.com>
> - s/uefi_find_rsdp_addr/acpi_find_rsdp_address_uefi/
> - use GUID_SIZE instead of opencodding size
> - make AcpiTestSupportGuid const
> - s/TCI/TCG/
>---
> tests/acpi-utils.h | 2 ++
> tests/acpi-utils.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 46 insertions(+)
>
>diff --git a/tests/acpi-utils.h b/tests/acpi-utils.h
>index 75f78f2..dcfa721 100644
>--- a/tests/acpi-utils.h
>+++ b/tests/acpi-utils.h
>@@ -46,6 +46,8 @@ typedef struct {
>
> uint8_t acpi_calc_checksum(const uint8_t *data, int len);
> uint32_t acpi_find_rsdp_address(QTestState *qts);
>+uint64_t acpi_find_rsdp_address_uefi(QTestState *qts, uint64_t start,
>+ uint64_t size);
> void acpi_fetch_rsdp_table(QTestState *qts, uint64_t addr, uint8_t *rsdp_table);
> void acpi_fetch_table(QTestState *qts, uint8_t **aml, uint32_t *aml_len,
> const uint8_t *addr_ptr, const char *sig,
>diff --git a/tests/acpi-utils.c b/tests/acpi-utils.c
>index 2dd4fe0..197af82 100644
>--- a/tests/acpi-utils.c
>+++ b/tests/acpi-utils.c
>@@ -99,3 +99,47 @@ void acpi_fetch_table(QTestState *qts, uint8_t **aml, uint32_t *aml_len,
> g_assert(!acpi_calc_checksum(*aml, *aml_len));
> }
> }
>+
>+#define GUID_SIZE 16
>+static const uint8_t AcpiTestSupportGuid[GUID_SIZE] = {
>+ 0xb1, 0xa6, 0x87, 0xab,
>+ 0x34, 0x20,
>+ 0xa0, 0xbd,
>+ 0x71, 0xbd, 0x37, 0x50, 0x07, 0x75, 0x77, 0x85 };
>+
>+typedef struct {
>+ uint8_t signature_guid[GUID_SIZE];
>+ uint64_t rsdp10;
>+ uint64_t rsdp20;
>+} __attribute__((packed)) UefiTestSupport;
>+
>+/* Wait at most 600 seconds (test is slow with TCG and --enable-debug) */
>+#define TEST_DELAY (1 * G_USEC_PER_SEC / 10)
>+#define TEST_CYCLES MAX((600 * G_USEC_PER_SEC / TEST_DELAY), 1)
>+#define MB 0x100000ULL
>+uint64_t acpi_find_rsdp_address_uefi(QTestState *qts, uint64_t start,
>+ uint64_t size)
>+{
>+ int i, j;
>+ uint8_t data[GUID_SIZE];
>+
>+ for (i = 0; i < TEST_CYCLES; ++i) {
>+ for (j = 0; j < size / MB; j++) {
>+ /* look for GUID at every 1Mb block */
>+ uint64_t addr = start + j * MB;
>+
>+ qtest_memread(qts, addr, data, sizeof(data));
>+ if (!memcmp(AcpiTestSupportGuid, data, sizeof(data))) {
>+ UefiTestSupport ret;
>+
>+ qtest_memread(qts, addr, &ret, sizeof(ret));
>+ ret.rsdp10 = le64_to_cpu(ret.rsdp10);
>+ ret.rsdp20 = le64_to_cpu(ret.rsdp20);
>+ return ret.rsdp20 ? ret.rsdp20 : ret.rsdp10;
>+ }
>+ }
>+ g_usleep(TEST_DELAY);
>+ }
>+ g_assert_not_reached();
>+ return 0;
>+}
>--
>2.7.4
--
Wei Yang
Help you, Help me
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 01/13] tests: acpi: make RSDT test routine handle XSDT
@ 2019-04-25 8:07 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-04-25 8:07 UTC (permalink / raw)
To: Wei Yang
Cc: Andrew Jones, Ben Warren, Michael S. Tsirkin, Laszlo Ersek,
qemu-devel, Shameer Kolothum, Shannon Zhao, Gonglei,
Philippe Mathieu-Daudé
On Thu, 25 Apr 2019 15:22:56 +0800
Wei Yang <richardw.yang@linux.intel.com> wrote:
> On Thu, Apr 25, 2019 at 07:34:37AM +0200, Igor Mammedov wrote:
> >If RSDP revision is more than 0 fetch table pointed by XSDT
> >and fallback to legacy RSDT table otherwise.
> >
> >While at it drop unused acpi_get_xsdt_address().
>
> Would it be proper to split this into another patch?
it should be fine to remove code that's being replaced by new one
which substitutes the former within the same patch.
but if you insist I can split it into another patch.
> >
> >Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> >---
> >PS:
> > it doesn't affect existing pc/q35 machines as they use RSDP.revision == 0
> > but it will be used by followup patch to enable testing arm/virt
> > board which uses provides XSDT table.
> >---
> > tests/acpi-utils.h | 3 +--
> > tests/acpi-utils.c | 14 +-------------
> > tests/bios-tables-test.c | 18 +++++++++++++-----
> > 3 files changed, 15 insertions(+), 20 deletions(-)
> >
> >diff --git a/tests/acpi-utils.h b/tests/acpi-utils.h
> >index ef388bb..8c68201 100644
> >--- a/tests/acpi-utils.h
> >+++ b/tests/acpi-utils.h
> >@@ -46,8 +46,7 @@ typedef struct {
> >
> > uint8_t acpi_calc_checksum(const uint8_t *data, int len);
> > uint32_t acpi_find_rsdp_address(QTestState *qts);
> >-uint64_t acpi_get_xsdt_address(uint8_t *rsdp_table);
> >-void acpi_parse_rsdp_table(QTestState *qts, uint32_t addr, uint8_t *rsdp_table);
> >+void acpi_parse_rsdp_table(QTestState *qts, uint64_t addr, uint8_t *rsdp_table);
>
> Would you mind giving some hint of this change?
thanks for spotting it. IT certainly doesn't belong to this patch.
I'll need to recheck if supporting 64bit address fields is done properly
and find another place where to move this hunk.
>
> > void acpi_fetch_table(QTestState *qts, uint8_t **aml, uint32_t *aml_len,
> > const uint8_t *addr_ptr, const char *sig,
> > bool verify_checksum);
> >diff --git a/tests/acpi-utils.c b/tests/acpi-utils.c
> >index cc33b46..9a6d1d3 100644
> >--- a/tests/acpi-utils.c
> >+++ b/tests/acpi-utils.c
> >@@ -51,19 +51,7 @@ uint32_t acpi_find_rsdp_address(QTestState *qts)
> > return off;
> > }
> >
> >-uint64_t acpi_get_xsdt_address(uint8_t *rsdp_table)
> >-{
> >- uint64_t xsdt_physical_address;
> >- uint8_t revision = rsdp_table[15 /* Revision offset */];
> >-
> >- /* We must have revision 2 if we're looking for an XSDT pointer */
> >- g_assert(revision == 2);
> >-
> >- memcpy(&xsdt_physical_address, &rsdp_table[24 /* XsdtAddress offset */], 8);
> >- return le64_to_cpu(xsdt_physical_address);
> >-}
> >-
> >-void acpi_parse_rsdp_table(QTestState *qts, uint32_t addr, uint8_t *rsdp_table)
> >+void acpi_parse_rsdp_table(QTestState *qts, uint64_t addr, uint8_t *rsdp_table)
> > {
> > uint8_t revision;
> >
> >diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
> >index a506dcb..24bd102 100644
> >--- a/tests/bios-tables-test.c
> >+++ b/tests/bios-tables-test.c
> >@@ -107,17 +107,25 @@ static void test_acpi_rsdp_table(test_data *data)
> > }
> > }
> >
> >-static void test_acpi_rsdt_table(test_data *data)
> >+static void test_acpi_rxsdt_table(test_data *data)
> > {
> >+ const char *sig = "RSDT";
> > AcpiSdtTable rsdt = {};
> >+ int entry_size = 4;
> >+ int addr_off = 16 /* RsdtAddress */;
> > uint8_t *ent;
> >
> >- /* read RSDT table */
> >+ if (data->rsdp_table[15 /* Revision offset */] != 0) {
> >+ addr_off = 24 /* XsdtAddress */;
> >+ entry_size = 8;
> >+ sig = "XSDT";
> >+ }
> >+ /* read [RX]SDT table */
> > acpi_fetch_table(data->qts, &rsdt.aml, &rsdt.aml_len,
> >- &data->rsdp_table[16 /* RsdtAddress */], "RSDT", true);
> >+ &data->rsdp_table[addr_off], sig, true);
> >
> > /* Load all tables and add to test list directly RSDT referenced tables */
> >- ACPI_FOREACH_RSDT_ENTRY(rsdt.aml, rsdt.aml_len, ent, 4 /* Entry size */) {
> >+ ACPI_FOREACH_RSDT_ENTRY(rsdt.aml, rsdt.aml_len, ent, entry_size) {
> > AcpiSdtTable ssdt_table = {};
> >
> > acpi_fetch_table(data->qts, &ssdt_table.aml, &ssdt_table.aml_len, ent,
> >@@ -521,7 +529,7 @@ static void test_acpi_one(const char *params, test_data *data)
> > data->tables = g_array_new(false, true, sizeof(AcpiSdtTable));
> > test_acpi_rsdp_address(data);
> > test_acpi_rsdp_table(data);
> >- test_acpi_rsdt_table(data);
> >+ test_acpi_rxsdt_table(data);
> > test_acpi_fadt_table(data);
> >
> > if (iasl) {
> >--
> >2.7.4
>
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 01/13] tests: acpi: make RSDT test routine handle XSDT
@ 2019-04-25 8:07 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-04-25 8:07 UTC (permalink / raw)
To: Wei Yang
Cc: Andrew Jones, Ben Warren, Michael S. Tsirkin,
Philippe Mathieu-Daudé,
qemu-devel, Shameer Kolothum, Shannon Zhao, Gonglei,
Laszlo Ersek
On Thu, 25 Apr 2019 15:22:56 +0800
Wei Yang <richardw.yang@linux.intel.com> wrote:
> On Thu, Apr 25, 2019 at 07:34:37AM +0200, Igor Mammedov wrote:
> >If RSDP revision is more than 0 fetch table pointed by XSDT
> >and fallback to legacy RSDT table otherwise.
> >
> >While at it drop unused acpi_get_xsdt_address().
>
> Would it be proper to split this into another patch?
it should be fine to remove code that's being replaced by new one
which substitutes the former within the same patch.
but if you insist I can split it into another patch.
> >
> >Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> >---
> >PS:
> > it doesn't affect existing pc/q35 machines as they use RSDP.revision == 0
> > but it will be used by followup patch to enable testing arm/virt
> > board which uses provides XSDT table.
> >---
> > tests/acpi-utils.h | 3 +--
> > tests/acpi-utils.c | 14 +-------------
> > tests/bios-tables-test.c | 18 +++++++++++++-----
> > 3 files changed, 15 insertions(+), 20 deletions(-)
> >
> >diff --git a/tests/acpi-utils.h b/tests/acpi-utils.h
> >index ef388bb..8c68201 100644
> >--- a/tests/acpi-utils.h
> >+++ b/tests/acpi-utils.h
> >@@ -46,8 +46,7 @@ typedef struct {
> >
> > uint8_t acpi_calc_checksum(const uint8_t *data, int len);
> > uint32_t acpi_find_rsdp_address(QTestState *qts);
> >-uint64_t acpi_get_xsdt_address(uint8_t *rsdp_table);
> >-void acpi_parse_rsdp_table(QTestState *qts, uint32_t addr, uint8_t *rsdp_table);
> >+void acpi_parse_rsdp_table(QTestState *qts, uint64_t addr, uint8_t *rsdp_table);
>
> Would you mind giving some hint of this change?
thanks for spotting it. IT certainly doesn't belong to this patch.
I'll need to recheck if supporting 64bit address fields is done properly
and find another place where to move this hunk.
>
> > void acpi_fetch_table(QTestState *qts, uint8_t **aml, uint32_t *aml_len,
> > const uint8_t *addr_ptr, const char *sig,
> > bool verify_checksum);
> >diff --git a/tests/acpi-utils.c b/tests/acpi-utils.c
> >index cc33b46..9a6d1d3 100644
> >--- a/tests/acpi-utils.c
> >+++ b/tests/acpi-utils.c
> >@@ -51,19 +51,7 @@ uint32_t acpi_find_rsdp_address(QTestState *qts)
> > return off;
> > }
> >
> >-uint64_t acpi_get_xsdt_address(uint8_t *rsdp_table)
> >-{
> >- uint64_t xsdt_physical_address;
> >- uint8_t revision = rsdp_table[15 /* Revision offset */];
> >-
> >- /* We must have revision 2 if we're looking for an XSDT pointer */
> >- g_assert(revision == 2);
> >-
> >- memcpy(&xsdt_physical_address, &rsdp_table[24 /* XsdtAddress offset */], 8);
> >- return le64_to_cpu(xsdt_physical_address);
> >-}
> >-
> >-void acpi_parse_rsdp_table(QTestState *qts, uint32_t addr, uint8_t *rsdp_table)
> >+void acpi_parse_rsdp_table(QTestState *qts, uint64_t addr, uint8_t *rsdp_table)
> > {
> > uint8_t revision;
> >
> >diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
> >index a506dcb..24bd102 100644
> >--- a/tests/bios-tables-test.c
> >+++ b/tests/bios-tables-test.c
> >@@ -107,17 +107,25 @@ static void test_acpi_rsdp_table(test_data *data)
> > }
> > }
> >
> >-static void test_acpi_rsdt_table(test_data *data)
> >+static void test_acpi_rxsdt_table(test_data *data)
> > {
> >+ const char *sig = "RSDT";
> > AcpiSdtTable rsdt = {};
> >+ int entry_size = 4;
> >+ int addr_off = 16 /* RsdtAddress */;
> > uint8_t *ent;
> >
> >- /* read RSDT table */
> >+ if (data->rsdp_table[15 /* Revision offset */] != 0) {
> >+ addr_off = 24 /* XsdtAddress */;
> >+ entry_size = 8;
> >+ sig = "XSDT";
> >+ }
> >+ /* read [RX]SDT table */
> > acpi_fetch_table(data->qts, &rsdt.aml, &rsdt.aml_len,
> >- &data->rsdp_table[16 /* RsdtAddress */], "RSDT", true);
> >+ &data->rsdp_table[addr_off], sig, true);
> >
> > /* Load all tables and add to test list directly RSDT referenced tables */
> >- ACPI_FOREACH_RSDT_ENTRY(rsdt.aml, rsdt.aml_len, ent, 4 /* Entry size */) {
> >+ ACPI_FOREACH_RSDT_ENTRY(rsdt.aml, rsdt.aml_len, ent, entry_size) {
> > AcpiSdtTable ssdt_table = {};
> >
> > acpi_fetch_table(data->qts, &ssdt_table.aml, &ssdt_table.aml_len, ent,
> >@@ -521,7 +529,7 @@ static void test_acpi_one(const char *params, test_data *data)
> > data->tables = g_array_new(false, true, sizeof(AcpiSdtTable));
> > test_acpi_rsdp_address(data);
> > test_acpi_rsdp_table(data);
> >- test_acpi_rsdt_table(data);
> >+ test_acpi_rxsdt_table(data);
> > test_acpi_fadt_table(data);
> >
> > if (iasl) {
> >--
> >2.7.4
>
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 08/13] tests: acpi: add a way to start tests with UEFI firmware
@ 2019-04-25 8:08 ` Wei Yang
0 siblings, 0 replies; 88+ messages in thread
From: Wei Yang @ 2019-04-25 8:08 UTC (permalink / raw)
To: Igor Mammedov
Cc: qemu-devel, Laszlo Ersek, Michael S. Tsirkin, Gonglei,
Philippe Mathieu-Daudé,
Shannon Zhao, Wei Yang, Andrew Jones, Shameer Kolothum,
Ben Warren
On Thu, Apr 25, 2019 at 07:34:44AM +0200, Igor Mammedov wrote:
>For testcase to use UEFI firmware, one needs to provide and specify
>firmwarei and varstore blobs names in test_data { uefi_fl1, uefi_fl2) }
^
a typo here?
>fields respectively and RAM start address plus size where to look for
>test structure signature. Additionally testcase should specify
>bootable cdrom image uefi-boot-images EFI test utility.
>
>Signed-off-by: Igor Mammedov <imammedo@redhat.com>
>Reviewed-by: Laszlo Ersek <lersek@redhat.com>
>---
>v3:
> * drop data_dir prefix and firmware will come from pc-bios directly
> * add cdrom option so test could use it for providing boot cdrom image
> * add TODO comment convert '-drive if=pflash' to new syntax (Laszlo)
>v2:
> * move RAM start address and size to test_data, as it could differ
> between boards (and even versions)
>---
> tests/bios-tables-test.c | 44 ++++++++++++++++++++++++++++++++++----------
> 1 file changed, 34 insertions(+), 10 deletions(-)
>
>diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
>index 5790ee4..0f24540 100644
>--- a/tests/bios-tables-test.c
>+++ b/tests/bios-tables-test.c
>@@ -26,6 +26,11 @@
> typedef struct {
> const char *machine;
> const char *variant;
>+ const char *uefi_fl1;
>+ const char *uefi_fl2;
>+ const char *cd;
>+ const uint64_t ram_start;
>+ const uint64_t scan_len;
> uint64_t rsdp_addr;
> uint8_t rsdp_table[36 /* ACPI 2.0+ RSDP size */];
> GArray *tables;
>@@ -522,21 +527,40 @@ static void test_smbios_structs(test_data *data)
> static void test_acpi_one(const char *params, test_data *data)
> {
> char *args;
>-
>- /* Disable kernel irqchip to be able to override apic irq0. */
>- args = g_strdup_printf("-machine %s,accel=%s,kernel-irqchip=off "
>- "-net none -display none %s "
>- "-drive id=hd0,if=none,file=%s,format=raw "
>- "-device ide-hd,drive=hd0 ",
>- data->machine, "kvm:tcg",
>- params ? params : "", disk);
>+ bool use_uefi = data->uefi_fl1 && data->uefi_fl2;
>+
>+ if (use_uefi) {
>+ /*
>+ * TODO: convert '-drive if=pflash' to new syntax (see e33763be7cd3)
>+ * when arm/virt boad starts to support it.
>+ */
>+ args = g_strdup_printf("-machine %s,accel=%s -nodefaults -nographic "
>+ "-drive if=pflash,format=raw,file=%s,readonly "
>+ "-drive if=pflash,format=raw,file=%s,snapshot=on -cdrom %s %s",
>+ data->machine, "kvm:tcg", data->uefi_fl1, data->uefi_fl2,
>+ data->cd, params ? params : "");
>+
>+ } else {
>+ /* Disable kernel irqchip to be able to override apic irq0. */
>+ args = g_strdup_printf("-machine %s,accel=%s,kernel-irqchip=off "
>+ "-net none -display none %s "
>+ "-drive id=hd0,if=none,file=%s,format=raw "
>+ "-device ide-hd,drive=hd0 ",
>+ data->machine, "kvm:tcg", params ? params : "", disk);
>+ }
>
> data->qts = qtest_init(args);
>
>- boot_sector_test(data->qts);
>+ if (use_uefi) {
>+ g_assert(data->scan_len);
>+ data->rsdp_addr = acpi_find_rsdp_address_uefi(data->qts,
>+ data->ram_start, data->scan_len);
Is this possible to merge this in test_acpi_rsdp_address()? Both of them set
the data->rsdp_addr.
>+ } else {
>+ boot_sector_test(data->qts);
>+ test_acpi_rsdp_address(data);
>+ }
>
> data->tables = g_array_new(false, true, sizeof(AcpiSdtTable));
>- test_acpi_rsdp_address(data);
> test_acpi_rsdp_table(data);
> test_acpi_rxsdt_table(data);
> test_acpi_fadt_table(data);
>--
>2.7.4
--
Wei Yang
Help you, Help me
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 08/13] tests: acpi: add a way to start tests with UEFI firmware
@ 2019-04-25 8:08 ` Wei Yang
0 siblings, 0 replies; 88+ messages in thread
From: Wei Yang @ 2019-04-25 8:08 UTC (permalink / raw)
To: Igor Mammedov
Cc: Andrew Jones, Ben Warren, Michael S. Tsirkin, Laszlo Ersek,
qemu-devel, Shameer Kolothum, Shannon Zhao, Gonglei, Wei Yang,
Philippe Mathieu-Daudé
On Thu, Apr 25, 2019 at 07:34:44AM +0200, Igor Mammedov wrote:
>For testcase to use UEFI firmware, one needs to provide and specify
>firmwarei and varstore blobs names in test_data { uefi_fl1, uefi_fl2) }
^
a typo here?
>fields respectively and RAM start address plus size where to look for
>test structure signature. Additionally testcase should specify
>bootable cdrom image uefi-boot-images EFI test utility.
>
>Signed-off-by: Igor Mammedov <imammedo@redhat.com>
>Reviewed-by: Laszlo Ersek <lersek@redhat.com>
>---
>v3:
> * drop data_dir prefix and firmware will come from pc-bios directly
> * add cdrom option so test could use it for providing boot cdrom image
> * add TODO comment convert '-drive if=pflash' to new syntax (Laszlo)
>v2:
> * move RAM start address and size to test_data, as it could differ
> between boards (and even versions)
>---
> tests/bios-tables-test.c | 44 ++++++++++++++++++++++++++++++++++----------
> 1 file changed, 34 insertions(+), 10 deletions(-)
>
>diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
>index 5790ee4..0f24540 100644
>--- a/tests/bios-tables-test.c
>+++ b/tests/bios-tables-test.c
>@@ -26,6 +26,11 @@
> typedef struct {
> const char *machine;
> const char *variant;
>+ const char *uefi_fl1;
>+ const char *uefi_fl2;
>+ const char *cd;
>+ const uint64_t ram_start;
>+ const uint64_t scan_len;
> uint64_t rsdp_addr;
> uint8_t rsdp_table[36 /* ACPI 2.0+ RSDP size */];
> GArray *tables;
>@@ -522,21 +527,40 @@ static void test_smbios_structs(test_data *data)
> static void test_acpi_one(const char *params, test_data *data)
> {
> char *args;
>-
>- /* Disable kernel irqchip to be able to override apic irq0. */
>- args = g_strdup_printf("-machine %s,accel=%s,kernel-irqchip=off "
>- "-net none -display none %s "
>- "-drive id=hd0,if=none,file=%s,format=raw "
>- "-device ide-hd,drive=hd0 ",
>- data->machine, "kvm:tcg",
>- params ? params : "", disk);
>+ bool use_uefi = data->uefi_fl1 && data->uefi_fl2;
>+
>+ if (use_uefi) {
>+ /*
>+ * TODO: convert '-drive if=pflash' to new syntax (see e33763be7cd3)
>+ * when arm/virt boad starts to support it.
>+ */
>+ args = g_strdup_printf("-machine %s,accel=%s -nodefaults -nographic "
>+ "-drive if=pflash,format=raw,file=%s,readonly "
>+ "-drive if=pflash,format=raw,file=%s,snapshot=on -cdrom %s %s",
>+ data->machine, "kvm:tcg", data->uefi_fl1, data->uefi_fl2,
>+ data->cd, params ? params : "");
>+
>+ } else {
>+ /* Disable kernel irqchip to be able to override apic irq0. */
>+ args = g_strdup_printf("-machine %s,accel=%s,kernel-irqchip=off "
>+ "-net none -display none %s "
>+ "-drive id=hd0,if=none,file=%s,format=raw "
>+ "-device ide-hd,drive=hd0 ",
>+ data->machine, "kvm:tcg", params ? params : "", disk);
>+ }
>
> data->qts = qtest_init(args);
>
>- boot_sector_test(data->qts);
>+ if (use_uefi) {
>+ g_assert(data->scan_len);
>+ data->rsdp_addr = acpi_find_rsdp_address_uefi(data->qts,
>+ data->ram_start, data->scan_len);
Is this possible to merge this in test_acpi_rsdp_address()? Both of them set
the data->rsdp_addr.
>+ } else {
>+ boot_sector_test(data->qts);
>+ test_acpi_rsdp_address(data);
>+ }
>
> data->tables = g_array_new(false, true, sizeof(AcpiSdtTable));
>- test_acpi_rsdp_address(data);
> test_acpi_rsdp_table(data);
> test_acpi_rxsdt_table(data);
> test_acpi_fadt_table(data);
>--
>2.7.4
--
Wei Yang
Help you, Help me
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 12/13] tests: acpi: refactor rebuild-expected-aml.sh to dump ACPI tables for a specified list of targets
@ 2019-04-25 8:20 ` Wei Yang
0 siblings, 0 replies; 88+ messages in thread
From: Wei Yang @ 2019-04-25 8:20 UTC (permalink / raw)
To: Igor Mammedov
Cc: qemu-devel, Laszlo Ersek, Michael S. Tsirkin, Gonglei,
Philippe Mathieu-Daudé,
Shannon Zhao, Wei Yang, Andrew Jones, Shameer Kolothum,
Ben Warren
On Thu, Apr 25, 2019 at 07:34:48AM +0200, Igor Mammedov wrote:
>Make initial list contain aarch64 and x86_64 targets.
so i386 is taken out?
>
>Signed-off-by: Igor Mammedov <imammedo@redhat.com>
>Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>---
>v2:
> * fix up error message (Philippe Mathieu-Daudé <philmd@redhat.com>)
>---
> tests/data/acpi/rebuild-expected-aml.sh | 23 +++++++++++------------
> 1 file changed, 11 insertions(+), 12 deletions(-)
>
>diff --git a/tests/data/acpi/rebuild-expected-aml.sh b/tests/data/acpi/rebuild-expected-aml.sh
>index abdff70..52793f3 100755
>--- a/tests/data/acpi/rebuild-expected-aml.sh
>+++ b/tests/data/acpi/rebuild-expected-aml.sh
>@@ -7,21 +7,12 @@
> #
> # Authors:
> # Marcel Apfelbaum <marcel.a@redhat.com>
>+# Igor Mammedov <imammedo@redhat.com>
> #
> # This work is licensed under the terms of the GNU GPLv2.
> # See the COPYING.LIB file in the top-level directory.
>
>-qemu=
>-
>-if [ -e x86_64-softmmu/qemu-system-x86_64 ]; then
>- qemu="x86_64-softmmu/qemu-system-x86_64"
>-elif [ -e i386-softmmu/qemu-system-i386 ]; then
>- qemu="i386-softmmu/qemu-system-i386"
>-else
>- echo "Run 'make' to build the qemu exectutable!"
>- echo "Run this script from the build directory."
>- exit 1;
>-fi
>+qemu_bins="aarch64-softmmu/qemu-system-aarch64 x86_64-softmmu/qemu-system-x86_64"
>
> if [ ! -e "tests/bios-tables-test" ]; then
> echo "Test: bios-tables-test is required! Run make check before this script."
>@@ -29,6 +20,14 @@ if [ ! -e "tests/bios-tables-test" ]; then
> exit 1;
> fi
>
>-TEST_ACPI_REBUILD_AML=y QTEST_QEMU_BINARY=$qemu tests/bios-tables-test
>+for qemu in $qemu_bins; do
>+ if [ ! -e $qemu ]; then
>+ echo "Run 'make' to build the following QEMU exectutables: $qemu_bins"
s/exectutables/executables
>+ echo "Also, run this script from the build directory."
>+ exit 1;
>+ fi
>+ TEST_ACPI_REBUILD_AML=y QTEST_QEMU_BINARY=$qemu tests/bios-tables-test
>+done
>+
The original behavior is either one executable exist will pass.
But now, either of one doesn't exist will fail. Is this what we expect?
>
> echo "The files were rebuilt and can be added to git."
>--
>2.7.4
--
Wei Yang
Help you, Help me
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 12/13] tests: acpi: refactor rebuild-expected-aml.sh to dump ACPI tables for a specified list of targets
@ 2019-04-25 8:20 ` Wei Yang
0 siblings, 0 replies; 88+ messages in thread
From: Wei Yang @ 2019-04-25 8:20 UTC (permalink / raw)
To: Igor Mammedov
Cc: Andrew Jones, Ben Warren, Michael S. Tsirkin, Laszlo Ersek,
qemu-devel, Shameer Kolothum, Shannon Zhao, Gonglei, Wei Yang,
Philippe Mathieu-Daudé
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="UTF-8", Size: 2234 bytes --]
On Thu, Apr 25, 2019 at 07:34:48AM +0200, Igor Mammedov wrote:
>Make initial list contain aarch64 and x86_64 targets.
so i386 is taken out?
>
>Signed-off-by: Igor Mammedov <imammedo@redhat.com>
>Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>---
>v2:
> * fix up error message (Philippe Mathieu-Daudé <philmd@redhat.com>)
>---
> tests/data/acpi/rebuild-expected-aml.sh | 23 +++++++++++------------
> 1 file changed, 11 insertions(+), 12 deletions(-)
>
>diff --git a/tests/data/acpi/rebuild-expected-aml.sh b/tests/data/acpi/rebuild-expected-aml.sh
>index abdff70..52793f3 100755
>--- a/tests/data/acpi/rebuild-expected-aml.sh
>+++ b/tests/data/acpi/rebuild-expected-aml.sh
>@@ -7,21 +7,12 @@
> #
> # Authors:
> # Marcel Apfelbaum <marcel.a@redhat.com>
>+# Igor Mammedov <imammedo@redhat.com>
> #
> # This work is licensed under the terms of the GNU GPLv2.
> # See the COPYING.LIB file in the top-level directory.
>
>-qemu=
>-
>-if [ -e x86_64-softmmu/qemu-system-x86_64 ]; then
>- qemu="x86_64-softmmu/qemu-system-x86_64"
>-elif [ -e i386-softmmu/qemu-system-i386 ]; then
>- qemu="i386-softmmu/qemu-system-i386"
>-else
>- echo "Run 'make' to build the qemu exectutable!"
>- echo "Run this script from the build directory."
>- exit 1;
>-fi
>+qemu_bins="aarch64-softmmu/qemu-system-aarch64 x86_64-softmmu/qemu-system-x86_64"
>
> if [ ! -e "tests/bios-tables-test" ]; then
> echo "Test: bios-tables-test is required! Run make check before this script."
>@@ -29,6 +20,14 @@ if [ ! -e "tests/bios-tables-test" ]; then
> exit 1;
> fi
>
>-TEST_ACPI_REBUILD_AML=y QTEST_QEMU_BINARY=$qemu tests/bios-tables-test
>+for qemu in $qemu_bins; do
>+ if [ ! -e $qemu ]; then
>+ echo "Run 'make' to build the following QEMU exectutables: $qemu_bins"
s/exectutables/executables
>+ echo "Also, run this script from the build directory."
>+ exit 1;
>+ fi
>+ TEST_ACPI_REBUILD_AML=y QTEST_QEMU_BINARY=$qemu tests/bios-tables-test
>+done
>+
The original behavior is either one executable exist will pass.
But now, either of one doesn't exist will fail. Is this what we expect?
>
> echo "The files were rebuilt and can be added to git."
>--
>2.7.4
--
Wei Yang
Help you, Help me
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 13/13] tests: acpi: print error unable to dump ACPI table during rebuild
@ 2019-04-25 8:22 ` Wei Yang
0 siblings, 0 replies; 88+ messages in thread
From: Wei Yang @ 2019-04-25 8:22 UTC (permalink / raw)
To: Igor Mammedov
Cc: qemu-devel, Laszlo Ersek, Michael S. Tsirkin, Gonglei,
Philippe Mathieu-Daudé,
Shannon Zhao, Wei Yang, Andrew Jones, Shameer Kolothum,
Ben Warren
On Thu, Apr 25, 2019 at 07:34:49AM +0200, Igor Mammedov wrote:
>Instead of just asserting print the error that lead to assert first.
>While at it move assert into rebuild branch, which removes reduntant
>check done in case of !rebuild branch is taken (the later is taken
>care of by g_assert_no_error).
>
>Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Wei Yang <richardw.yang@linux.intel.com>
>---
> tests/bios-tables-test.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
>diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
>index f117461..5a5d036 100644
>--- a/tests/bios-tables-test.c
>+++ b/tests/bios-tables-test.c
>@@ -199,11 +199,14 @@ static void dump_aml_files(test_data *data, bool rebuild)
> sdt->aml, ext);
> fd = g_open(aml_file, O_WRONLY|O_TRUNC|O_CREAT,
> S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH);
>+ if (fd < 0) {
>+ perror(aml_file);
>+ }
>+ g_assert(fd >= 0);
> } else {
> fd = g_file_open_tmp("aml-XXXXXX", &sdt->aml_file, &error);
> g_assert_no_error(error);
> }
>- g_assert(fd >= 0);
>
> ret = qemu_write_full(fd, sdt->aml, sdt->aml_len);
> g_assert(ret == sdt->aml_len);
>--
>2.7.4
--
Wei Yang
Help you, Help me
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 13/13] tests: acpi: print error unable to dump ACPI table during rebuild
@ 2019-04-25 8:22 ` Wei Yang
0 siblings, 0 replies; 88+ messages in thread
From: Wei Yang @ 2019-04-25 8:22 UTC (permalink / raw)
To: Igor Mammedov
Cc: Andrew Jones, Ben Warren, Michael S. Tsirkin, Laszlo Ersek,
qemu-devel, Shameer Kolothum, Shannon Zhao, Gonglei, Wei Yang,
Philippe Mathieu-Daudé
On Thu, Apr 25, 2019 at 07:34:49AM +0200, Igor Mammedov wrote:
>Instead of just asserting print the error that lead to assert first.
>While at it move assert into rebuild branch, which removes reduntant
>check done in case of !rebuild branch is taken (the later is taken
>care of by g_assert_no_error).
>
>Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Wei Yang <richardw.yang@linux.intel.com>
>---
> tests/bios-tables-test.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
>diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
>index f117461..5a5d036 100644
>--- a/tests/bios-tables-test.c
>+++ b/tests/bios-tables-test.c
>@@ -199,11 +199,14 @@ static void dump_aml_files(test_data *data, bool rebuild)
> sdt->aml, ext);
> fd = g_open(aml_file, O_WRONLY|O_TRUNC|O_CREAT,
> S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH);
>+ if (fd < 0) {
>+ perror(aml_file);
>+ }
>+ g_assert(fd >= 0);
> } else {
> fd = g_file_open_tmp("aml-XXXXXX", &sdt->aml_file, &error);
> g_assert_no_error(error);
> }
>- g_assert(fd >= 0);
>
> ret = qemu_write_full(fd, sdt->aml, sdt->aml_len);
> g_assert(ret == sdt->aml_len);
>--
>2.7.4
--
Wei Yang
Help you, Help me
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 01/13] tests: acpi: make RSDT test routine handle XSDT
@ 2019-04-25 8:23 ` Wei Yang
0 siblings, 0 replies; 88+ messages in thread
From: Wei Yang @ 2019-04-25 8:23 UTC (permalink / raw)
To: Igor Mammedov
Cc: Wei Yang, Andrew Jones, Ben Warren, Michael S. Tsirkin,
Laszlo Ersek, qemu-devel, Shameer Kolothum, Shannon Zhao,
Gonglei, Philippe Mathieu-Daudé
On Thu, Apr 25, 2019 at 10:07:51AM +0200, Igor Mammedov wrote:
>On Thu, 25 Apr 2019 15:22:56 +0800
>Wei Yang <richardw.yang@linux.intel.com> wrote:
>
>> On Thu, Apr 25, 2019 at 07:34:37AM +0200, Igor Mammedov wrote:
>> >If RSDP revision is more than 0 fetch table pointed by XSDT
>> >and fallback to legacy RSDT table otherwise.
>> >
>> >While at it drop unused acpi_get_xsdt_address().
>>
>> Would it be proper to split this into another patch?
>
>it should be fine to remove code that's being replaced by new one
>which substitutes the former within the same patch.
>but if you insist I can split it into another patch.
I am fine with this included.
>
>> >
>> >Signed-off-by: Igor Mammedov <imammedo@redhat.com>
>> >---
>> >PS:
>> > it doesn't affect existing pc/q35 machines as they use RSDP.revision == 0
>> > but it will be used by followup patch to enable testing arm/virt
>> > board which uses provides XSDT table.
>> >---
>> > tests/acpi-utils.h | 3 +--
>> > tests/acpi-utils.c | 14 +-------------
>> > tests/bios-tables-test.c | 18 +++++++++++++-----
>> > 3 files changed, 15 insertions(+), 20 deletions(-)
>> >
>> >diff --git a/tests/acpi-utils.h b/tests/acpi-utils.h
>> >index ef388bb..8c68201 100644
>> >--- a/tests/acpi-utils.h
>> >+++ b/tests/acpi-utils.h
>> >@@ -46,8 +46,7 @@ typedef struct {
>> >
>> > uint8_t acpi_calc_checksum(const uint8_t *data, int len);
>> > uint32_t acpi_find_rsdp_address(QTestState *qts);
>> >-uint64_t acpi_get_xsdt_address(uint8_t *rsdp_table);
>> >-void acpi_parse_rsdp_table(QTestState *qts, uint32_t addr, uint8_t *rsdp_table);
>> >+void acpi_parse_rsdp_table(QTestState *qts, uint64_t addr, uint8_t *rsdp_table);
>>
>> Would you mind giving some hint of this change?
>thanks for spotting it. IT certainly doesn't belong to this patch.
>I'll need to recheck if supporting 64bit address fields is done properly
>and find another place where to move this hunk.
>
>>
>> > void acpi_fetch_table(QTestState *qts, uint8_t **aml, uint32_t *aml_len,
>> > const uint8_t *addr_ptr, const char *sig,
>> > bool verify_checksum);
>> >diff --git a/tests/acpi-utils.c b/tests/acpi-utils.c
>> >index cc33b46..9a6d1d3 100644
>> >--- a/tests/acpi-utils.c
>> >+++ b/tests/acpi-utils.c
>> >@@ -51,19 +51,7 @@ uint32_t acpi_find_rsdp_address(QTestState *qts)
>> > return off;
>> > }
>> >
>> >-uint64_t acpi_get_xsdt_address(uint8_t *rsdp_table)
>> >-{
>> >- uint64_t xsdt_physical_address;
>> >- uint8_t revision = rsdp_table[15 /* Revision offset */];
>> >-
>> >- /* We must have revision 2 if we're looking for an XSDT pointer */
>> >- g_assert(revision == 2);
>> >-
>> >- memcpy(&xsdt_physical_address, &rsdp_table[24 /* XsdtAddress offset */], 8);
>> >- return le64_to_cpu(xsdt_physical_address);
>> >-}
>> >-
>> >-void acpi_parse_rsdp_table(QTestState *qts, uint32_t addr, uint8_t *rsdp_table)
>> >+void acpi_parse_rsdp_table(QTestState *qts, uint64_t addr, uint8_t *rsdp_table)
>> > {
>> > uint8_t revision;
>> >
>> >diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
>> >index a506dcb..24bd102 100644
>> >--- a/tests/bios-tables-test.c
>> >+++ b/tests/bios-tables-test.c
>> >@@ -107,17 +107,25 @@ static void test_acpi_rsdp_table(test_data *data)
>> > }
>> > }
>> >
>> >-static void test_acpi_rsdt_table(test_data *data)
>> >+static void test_acpi_rxsdt_table(test_data *data)
>> > {
>> >+ const char *sig = "RSDT";
>> > AcpiSdtTable rsdt = {};
>> >+ int entry_size = 4;
>> >+ int addr_off = 16 /* RsdtAddress */;
>> > uint8_t *ent;
>> >
>> >- /* read RSDT table */
>> >+ if (data->rsdp_table[15 /* Revision offset */] != 0) {
>> >+ addr_off = 24 /* XsdtAddress */;
>> >+ entry_size = 8;
>> >+ sig = "XSDT";
>> >+ }
>> >+ /* read [RX]SDT table */
>> > acpi_fetch_table(data->qts, &rsdt.aml, &rsdt.aml_len,
>> >- &data->rsdp_table[16 /* RsdtAddress */], "RSDT", true);
>> >+ &data->rsdp_table[addr_off], sig, true);
>> >
>> > /* Load all tables and add to test list directly RSDT referenced tables */
>> >- ACPI_FOREACH_RSDT_ENTRY(rsdt.aml, rsdt.aml_len, ent, 4 /* Entry size */) {
>> >+ ACPI_FOREACH_RSDT_ENTRY(rsdt.aml, rsdt.aml_len, ent, entry_size) {
>> > AcpiSdtTable ssdt_table = {};
>> >
>> > acpi_fetch_table(data->qts, &ssdt_table.aml, &ssdt_table.aml_len, ent,
>> >@@ -521,7 +529,7 @@ static void test_acpi_one(const char *params, test_data *data)
>> > data->tables = g_array_new(false, true, sizeof(AcpiSdtTable));
>> > test_acpi_rsdp_address(data);
>> > test_acpi_rsdp_table(data);
>> >- test_acpi_rsdt_table(data);
>> >+ test_acpi_rxsdt_table(data);
>> > test_acpi_fadt_table(data);
>> >
>> > if (iasl) {
>> >--
>> >2.7.4
>>
--
Wei Yang
Help you, Help me
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 01/13] tests: acpi: make RSDT test routine handle XSDT
@ 2019-04-25 8:23 ` Wei Yang
0 siblings, 0 replies; 88+ messages in thread
From: Wei Yang @ 2019-04-25 8:23 UTC (permalink / raw)
To: Igor Mammedov
Cc: Andrew Jones, Ben Warren, Michael S. Tsirkin,
Philippe Mathieu-Daudé,
qemu-devel, Shameer Kolothum, Shannon Zhao, Gonglei, Wei Yang,
Laszlo Ersek
On Thu, Apr 25, 2019 at 10:07:51AM +0200, Igor Mammedov wrote:
>On Thu, 25 Apr 2019 15:22:56 +0800
>Wei Yang <richardw.yang@linux.intel.com> wrote:
>
>> On Thu, Apr 25, 2019 at 07:34:37AM +0200, Igor Mammedov wrote:
>> >If RSDP revision is more than 0 fetch table pointed by XSDT
>> >and fallback to legacy RSDT table otherwise.
>> >
>> >While at it drop unused acpi_get_xsdt_address().
>>
>> Would it be proper to split this into another patch?
>
>it should be fine to remove code that's being replaced by new one
>which substitutes the former within the same patch.
>but if you insist I can split it into another patch.
I am fine with this included.
>
>> >
>> >Signed-off-by: Igor Mammedov <imammedo@redhat.com>
>> >---
>> >PS:
>> > it doesn't affect existing pc/q35 machines as they use RSDP.revision == 0
>> > but it will be used by followup patch to enable testing arm/virt
>> > board which uses provides XSDT table.
>> >---
>> > tests/acpi-utils.h | 3 +--
>> > tests/acpi-utils.c | 14 +-------------
>> > tests/bios-tables-test.c | 18 +++++++++++++-----
>> > 3 files changed, 15 insertions(+), 20 deletions(-)
>> >
>> >diff --git a/tests/acpi-utils.h b/tests/acpi-utils.h
>> >index ef388bb..8c68201 100644
>> >--- a/tests/acpi-utils.h
>> >+++ b/tests/acpi-utils.h
>> >@@ -46,8 +46,7 @@ typedef struct {
>> >
>> > uint8_t acpi_calc_checksum(const uint8_t *data, int len);
>> > uint32_t acpi_find_rsdp_address(QTestState *qts);
>> >-uint64_t acpi_get_xsdt_address(uint8_t *rsdp_table);
>> >-void acpi_parse_rsdp_table(QTestState *qts, uint32_t addr, uint8_t *rsdp_table);
>> >+void acpi_parse_rsdp_table(QTestState *qts, uint64_t addr, uint8_t *rsdp_table);
>>
>> Would you mind giving some hint of this change?
>thanks for spotting it. IT certainly doesn't belong to this patch.
>I'll need to recheck if supporting 64bit address fields is done properly
>and find another place where to move this hunk.
>
>>
>> > void acpi_fetch_table(QTestState *qts, uint8_t **aml, uint32_t *aml_len,
>> > const uint8_t *addr_ptr, const char *sig,
>> > bool verify_checksum);
>> >diff --git a/tests/acpi-utils.c b/tests/acpi-utils.c
>> >index cc33b46..9a6d1d3 100644
>> >--- a/tests/acpi-utils.c
>> >+++ b/tests/acpi-utils.c
>> >@@ -51,19 +51,7 @@ uint32_t acpi_find_rsdp_address(QTestState *qts)
>> > return off;
>> > }
>> >
>> >-uint64_t acpi_get_xsdt_address(uint8_t *rsdp_table)
>> >-{
>> >- uint64_t xsdt_physical_address;
>> >- uint8_t revision = rsdp_table[15 /* Revision offset */];
>> >-
>> >- /* We must have revision 2 if we're looking for an XSDT pointer */
>> >- g_assert(revision == 2);
>> >-
>> >- memcpy(&xsdt_physical_address, &rsdp_table[24 /* XsdtAddress offset */], 8);
>> >- return le64_to_cpu(xsdt_physical_address);
>> >-}
>> >-
>> >-void acpi_parse_rsdp_table(QTestState *qts, uint32_t addr, uint8_t *rsdp_table)
>> >+void acpi_parse_rsdp_table(QTestState *qts, uint64_t addr, uint8_t *rsdp_table)
>> > {
>> > uint8_t revision;
>> >
>> >diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
>> >index a506dcb..24bd102 100644
>> >--- a/tests/bios-tables-test.c
>> >+++ b/tests/bios-tables-test.c
>> >@@ -107,17 +107,25 @@ static void test_acpi_rsdp_table(test_data *data)
>> > }
>> > }
>> >
>> >-static void test_acpi_rsdt_table(test_data *data)
>> >+static void test_acpi_rxsdt_table(test_data *data)
>> > {
>> >+ const char *sig = "RSDT";
>> > AcpiSdtTable rsdt = {};
>> >+ int entry_size = 4;
>> >+ int addr_off = 16 /* RsdtAddress */;
>> > uint8_t *ent;
>> >
>> >- /* read RSDT table */
>> >+ if (data->rsdp_table[15 /* Revision offset */] != 0) {
>> >+ addr_off = 24 /* XsdtAddress */;
>> >+ entry_size = 8;
>> >+ sig = "XSDT";
>> >+ }
>> >+ /* read [RX]SDT table */
>> > acpi_fetch_table(data->qts, &rsdt.aml, &rsdt.aml_len,
>> >- &data->rsdp_table[16 /* RsdtAddress */], "RSDT", true);
>> >+ &data->rsdp_table[addr_off], sig, true);
>> >
>> > /* Load all tables and add to test list directly RSDT referenced tables */
>> >- ACPI_FOREACH_RSDT_ENTRY(rsdt.aml, rsdt.aml_len, ent, 4 /* Entry size */) {
>> >+ ACPI_FOREACH_RSDT_ENTRY(rsdt.aml, rsdt.aml_len, ent, entry_size) {
>> > AcpiSdtTable ssdt_table = {};
>> >
>> > acpi_fetch_table(data->qts, &ssdt_table.aml, &ssdt_table.aml_len, ent,
>> >@@ -521,7 +529,7 @@ static void test_acpi_one(const char *params, test_data *data)
>> > data->tables = g_array_new(false, true, sizeof(AcpiSdtTable));
>> > test_acpi_rsdp_address(data);
>> > test_acpi_rsdp_table(data);
>> >- test_acpi_rsdt_table(data);
>> >+ test_acpi_rxsdt_table(data);
>> > test_acpi_fadt_table(data);
>> >
>> > if (iasl) {
>> >--
>> >2.7.4
>>
--
Wei Yang
Help you, Help me
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 03/13] tests: acpi: make pointer to RSDP 64bit
@ 2019-04-25 10:38 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-04-25 10:38 UTC (permalink / raw)
To: Wei Yang
Cc: qemu-devel, Laszlo Ersek, Michael S. Tsirkin, Gonglei,
Philippe Mathieu-Daudé,
Shannon Zhao, Andrew Jones, Shameer Kolothum, Ben Warren
On Thu, 25 Apr 2019 15:31:42 +0800
Wei Yang <richardw.yang@linux.intel.com> wrote:
> On Thu, Apr 25, 2019 at 07:34:39AM +0200, Igor Mammedov wrote:
> >In case of UEFI, RSDP doesn't have to be located in lowmem,
> >it could be placed at any address. Make sure that test won't
> >break if it is placed above the first 4Gb of address space.
> >
> >PS:
> >While at it cleanup some local variables as we don't really
> >need them.
> >
> >Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> >Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> >---
> >v2:
> > - s/In case of UEFI/In case of UEFI,/ (Laszlo Ersek <lersek@redhat.com>)
> >---
> > tests/bios-tables-test.c | 10 ++++------
> > 1 file changed, 4 insertions(+), 6 deletions(-)
> >
> >diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
> >index 2ee044c..c29dcf4 100644
> >--- a/tests/bios-tables-test.c
> >+++ b/tests/bios-tables-test.c
> >@@ -26,7 +26,7 @@
> > typedef struct {
> > const char *machine;
> > const char *variant;
> >- uint32_t rsdp_addr;
> >+ uint64_t rsdp_addr;
> > uint8_t rsdp_table[36 /* ACPI 2.0+ RSDP size */];
> > GArray *tables;
> > uint32_t smbios_ep_addr;
> >@@ -86,13 +86,11 @@ static void test_acpi_rsdp_address(test_data *data)
> >
> > static void test_acpi_rsdp_table(test_data *data)
> > {
> >- uint8_t *rsdp_table = data->rsdp_table, revision;
> >- uint32_t addr = data->rsdp_addr;
> >+ uint8_t *rsdp_table = data->rsdp_table;
> >
> >- acpi_fetch_rsdp_table(data->qts, addr, rsdp_table);
> >- revision = rsdp_table[15 /* Revision offset */];
> >+ acpi_fetch_rsdp_table(data->qts, data->rsdp_addr, rsdp_table);
>
> Ok, I think this is the reason you change the second parameter from uint32_t
> to uint64_t in 1st patch.
>
> Maybe we need to move that on to this one?
Sure.
There is one additional path to make 64-bit table pointers support a bit more complete.
I'll respin series once travis build passes.
> >
> >- switch (revision) {
> >+ switch (rsdp_table[15 /* Revision offset */]) {
> > case 0: /* ACPI 1.0 RSDP */
> > /* With rev 1, checksum is only for the first 20 bytes */
> > g_assert(!acpi_calc_checksum(rsdp_table, 20));
> >--
> >2.7.4
>
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 03/13] tests: acpi: make pointer to RSDP 64bit
@ 2019-04-25 10:38 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-04-25 10:38 UTC (permalink / raw)
To: Wei Yang
Cc: Andrew Jones, Ben Warren, Michael S. Tsirkin, Laszlo Ersek,
qemu-devel, Shameer Kolothum, Shannon Zhao, Gonglei,
Philippe Mathieu-Daudé
On Thu, 25 Apr 2019 15:31:42 +0800
Wei Yang <richardw.yang@linux.intel.com> wrote:
> On Thu, Apr 25, 2019 at 07:34:39AM +0200, Igor Mammedov wrote:
> >In case of UEFI, RSDP doesn't have to be located in lowmem,
> >it could be placed at any address. Make sure that test won't
> >break if it is placed above the first 4Gb of address space.
> >
> >PS:
> >While at it cleanup some local variables as we don't really
> >need them.
> >
> >Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> >Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> >---
> >v2:
> > - s/In case of UEFI/In case of UEFI,/ (Laszlo Ersek <lersek@redhat.com>)
> >---
> > tests/bios-tables-test.c | 10 ++++------
> > 1 file changed, 4 insertions(+), 6 deletions(-)
> >
> >diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
> >index 2ee044c..c29dcf4 100644
> >--- a/tests/bios-tables-test.c
> >+++ b/tests/bios-tables-test.c
> >@@ -26,7 +26,7 @@
> > typedef struct {
> > const char *machine;
> > const char *variant;
> >- uint32_t rsdp_addr;
> >+ uint64_t rsdp_addr;
> > uint8_t rsdp_table[36 /* ACPI 2.0+ RSDP size */];
> > GArray *tables;
> > uint32_t smbios_ep_addr;
> >@@ -86,13 +86,11 @@ static void test_acpi_rsdp_address(test_data *data)
> >
> > static void test_acpi_rsdp_table(test_data *data)
> > {
> >- uint8_t *rsdp_table = data->rsdp_table, revision;
> >- uint32_t addr = data->rsdp_addr;
> >+ uint8_t *rsdp_table = data->rsdp_table;
> >
> >- acpi_fetch_rsdp_table(data->qts, addr, rsdp_table);
> >- revision = rsdp_table[15 /* Revision offset */];
> >+ acpi_fetch_rsdp_table(data->qts, data->rsdp_addr, rsdp_table);
>
> Ok, I think this is the reason you change the second parameter from uint32_t
> to uint64_t in 1st patch.
>
> Maybe we need to move that on to this one?
Sure.
There is one additional path to make 64-bit table pointers support a bit more complete.
I'll respin series once travis build passes.
> >
> >- switch (revision) {
> >+ switch (rsdp_table[15 /* Revision offset */]) {
> > case 0: /* ACPI 1.0 RSDP */
> > /* With rev 1, checksum is only for the first 20 bytes */
> > g_assert(!acpi_calc_checksum(rsdp_table, 20));
> >--
> >2.7.4
>
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 07/13] tests: acpi: add acpi_find_rsdp_address_uefi() helper
@ 2019-04-25 10:56 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-04-25 10:56 UTC (permalink / raw)
To: Wei Yang
Cc: Andrew Jones, Ben Warren, Michael S. Tsirkin, Laszlo Ersek,
qemu-devel, Shameer Kolothum, Shannon Zhao, Gonglei,
Philippe Mathieu-Daudé
On Thu, 25 Apr 2019 16:00:46 +0800
Wei Yang <richardw.yang@linux.intel.com> wrote:
> On Thu, Apr 25, 2019 at 07:34:43AM +0200, Igor Mammedov wrote:
> >introduce UEFI specific counterpart to acpi_find_rsdp_address()
> >that will help to find RSDP address when [OA]VMF is used as
> >firmware. It requires guest firmware or other guest app to place
> >1Mb aligned UefiTestSupport structure (defined in this patch)
> >in RAM with UefiTestSupport::signature_guid set to
> >AB87A6B1-2034-BDA0-71BD-375007757785
>
> Just curious about where we get this signature? Randomly generated?
something like this, see 09a274d82f, I'll add commit id here for reference
>
> >
> >Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> >Reviewed-by: Laszlo Ersek <lersek@redhat.com>
>
> Reviewed-by: Wei Yang <richardw.yang@linux.intel.com>
>
> >---
> >v3:
> > * fix checkpatch error (separate opening brace from values in AcpiTestSupportGuid initializer)
> >v2:
> > * Laszlo Ersek <lersek@redhat.com>
> > - s/uefi_find_rsdp_addr/acpi_find_rsdp_address_uefi/
> > - use GUID_SIZE instead of opencodding size
> > - make AcpiTestSupportGuid const
> > - s/TCI/TCG/
> >---
> > tests/acpi-utils.h | 2 ++
> > tests/acpi-utils.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
> > 2 files changed, 46 insertions(+)
> >
> >diff --git a/tests/acpi-utils.h b/tests/acpi-utils.h
> >index 75f78f2..dcfa721 100644
> >--- a/tests/acpi-utils.h
> >+++ b/tests/acpi-utils.h
> >@@ -46,6 +46,8 @@ typedef struct {
> >
> > uint8_t acpi_calc_checksum(const uint8_t *data, int len);
> > uint32_t acpi_find_rsdp_address(QTestState *qts);
> >+uint64_t acpi_find_rsdp_address_uefi(QTestState *qts, uint64_t start,
> >+ uint64_t size);
> > void acpi_fetch_rsdp_table(QTestState *qts, uint64_t addr, uint8_t *rsdp_table);
> > void acpi_fetch_table(QTestState *qts, uint8_t **aml, uint32_t *aml_len,
> > const uint8_t *addr_ptr, const char *sig,
> >diff --git a/tests/acpi-utils.c b/tests/acpi-utils.c
> >index 2dd4fe0..197af82 100644
> >--- a/tests/acpi-utils.c
> >+++ b/tests/acpi-utils.c
> >@@ -99,3 +99,47 @@ void acpi_fetch_table(QTestState *qts, uint8_t **aml, uint32_t *aml_len,
> > g_assert(!acpi_calc_checksum(*aml, *aml_len));
> > }
> > }
> >+
> >+#define GUID_SIZE 16
> >+static const uint8_t AcpiTestSupportGuid[GUID_SIZE] = {
> >+ 0xb1, 0xa6, 0x87, 0xab,
> >+ 0x34, 0x20,
> >+ 0xa0, 0xbd,
> >+ 0x71, 0xbd, 0x37, 0x50, 0x07, 0x75, 0x77, 0x85 };
> >+
> >+typedef struct {
> >+ uint8_t signature_guid[GUID_SIZE];
> >+ uint64_t rsdp10;
> >+ uint64_t rsdp20;
> >+} __attribute__((packed)) UefiTestSupport;
> >+
> >+/* Wait at most 600 seconds (test is slow with TCG and --enable-debug) */
> >+#define TEST_DELAY (1 * G_USEC_PER_SEC / 10)
> >+#define TEST_CYCLES MAX((600 * G_USEC_PER_SEC / TEST_DELAY), 1)
> >+#define MB 0x100000ULL
> >+uint64_t acpi_find_rsdp_address_uefi(QTestState *qts, uint64_t start,
> >+ uint64_t size)
> >+{
> >+ int i, j;
> >+ uint8_t data[GUID_SIZE];
> >+
> >+ for (i = 0; i < TEST_CYCLES; ++i) {
> >+ for (j = 0; j < size / MB; j++) {
> >+ /* look for GUID at every 1Mb block */
> >+ uint64_t addr = start + j * MB;
> >+
> >+ qtest_memread(qts, addr, data, sizeof(data));
> >+ if (!memcmp(AcpiTestSupportGuid, data, sizeof(data))) {
> >+ UefiTestSupport ret;
> >+
> >+ qtest_memread(qts, addr, &ret, sizeof(ret));
> >+ ret.rsdp10 = le64_to_cpu(ret.rsdp10);
> >+ ret.rsdp20 = le64_to_cpu(ret.rsdp20);
> >+ return ret.rsdp20 ? ret.rsdp20 : ret.rsdp10;
> >+ }
> >+ }
> >+ g_usleep(TEST_DELAY);
> >+ }
> >+ g_assert_not_reached();
> >+ return 0;
> >+}
> >--
> >2.7.4
>
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 07/13] tests: acpi: add acpi_find_rsdp_address_uefi() helper
@ 2019-04-25 10:56 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-04-25 10:56 UTC (permalink / raw)
To: Wei Yang
Cc: Andrew Jones, Ben Warren, Michael S. Tsirkin,
Philippe Mathieu-Daudé,
qemu-devel, Shameer Kolothum, Shannon Zhao, Gonglei,
Laszlo Ersek
On Thu, 25 Apr 2019 16:00:46 +0800
Wei Yang <richardw.yang@linux.intel.com> wrote:
> On Thu, Apr 25, 2019 at 07:34:43AM +0200, Igor Mammedov wrote:
> >introduce UEFI specific counterpart to acpi_find_rsdp_address()
> >that will help to find RSDP address when [OA]VMF is used as
> >firmware. It requires guest firmware or other guest app to place
> >1Mb aligned UefiTestSupport structure (defined in this patch)
> >in RAM with UefiTestSupport::signature_guid set to
> >AB87A6B1-2034-BDA0-71BD-375007757785
>
> Just curious about where we get this signature? Randomly generated?
something like this, see 09a274d82f, I'll add commit id here for reference
>
> >
> >Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> >Reviewed-by: Laszlo Ersek <lersek@redhat.com>
>
> Reviewed-by: Wei Yang <richardw.yang@linux.intel.com>
>
> >---
> >v3:
> > * fix checkpatch error (separate opening brace from values in AcpiTestSupportGuid initializer)
> >v2:
> > * Laszlo Ersek <lersek@redhat.com>
> > - s/uefi_find_rsdp_addr/acpi_find_rsdp_address_uefi/
> > - use GUID_SIZE instead of opencodding size
> > - make AcpiTestSupportGuid const
> > - s/TCI/TCG/
> >---
> > tests/acpi-utils.h | 2 ++
> > tests/acpi-utils.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
> > 2 files changed, 46 insertions(+)
> >
> >diff --git a/tests/acpi-utils.h b/tests/acpi-utils.h
> >index 75f78f2..dcfa721 100644
> >--- a/tests/acpi-utils.h
> >+++ b/tests/acpi-utils.h
> >@@ -46,6 +46,8 @@ typedef struct {
> >
> > uint8_t acpi_calc_checksum(const uint8_t *data, int len);
> > uint32_t acpi_find_rsdp_address(QTestState *qts);
> >+uint64_t acpi_find_rsdp_address_uefi(QTestState *qts, uint64_t start,
> >+ uint64_t size);
> > void acpi_fetch_rsdp_table(QTestState *qts, uint64_t addr, uint8_t *rsdp_table);
> > void acpi_fetch_table(QTestState *qts, uint8_t **aml, uint32_t *aml_len,
> > const uint8_t *addr_ptr, const char *sig,
> >diff --git a/tests/acpi-utils.c b/tests/acpi-utils.c
> >index 2dd4fe0..197af82 100644
> >--- a/tests/acpi-utils.c
> >+++ b/tests/acpi-utils.c
> >@@ -99,3 +99,47 @@ void acpi_fetch_table(QTestState *qts, uint8_t **aml, uint32_t *aml_len,
> > g_assert(!acpi_calc_checksum(*aml, *aml_len));
> > }
> > }
> >+
> >+#define GUID_SIZE 16
> >+static const uint8_t AcpiTestSupportGuid[GUID_SIZE] = {
> >+ 0xb1, 0xa6, 0x87, 0xab,
> >+ 0x34, 0x20,
> >+ 0xa0, 0xbd,
> >+ 0x71, 0xbd, 0x37, 0x50, 0x07, 0x75, 0x77, 0x85 };
> >+
> >+typedef struct {
> >+ uint8_t signature_guid[GUID_SIZE];
> >+ uint64_t rsdp10;
> >+ uint64_t rsdp20;
> >+} __attribute__((packed)) UefiTestSupport;
> >+
> >+/* Wait at most 600 seconds (test is slow with TCG and --enable-debug) */
> >+#define TEST_DELAY (1 * G_USEC_PER_SEC / 10)
> >+#define TEST_CYCLES MAX((600 * G_USEC_PER_SEC / TEST_DELAY), 1)
> >+#define MB 0x100000ULL
> >+uint64_t acpi_find_rsdp_address_uefi(QTestState *qts, uint64_t start,
> >+ uint64_t size)
> >+{
> >+ int i, j;
> >+ uint8_t data[GUID_SIZE];
> >+
> >+ for (i = 0; i < TEST_CYCLES; ++i) {
> >+ for (j = 0; j < size / MB; j++) {
> >+ /* look for GUID at every 1Mb block */
> >+ uint64_t addr = start + j * MB;
> >+
> >+ qtest_memread(qts, addr, data, sizeof(data));
> >+ if (!memcmp(AcpiTestSupportGuid, data, sizeof(data))) {
> >+ UefiTestSupport ret;
> >+
> >+ qtest_memread(qts, addr, &ret, sizeof(ret));
> >+ ret.rsdp10 = le64_to_cpu(ret.rsdp10);
> >+ ret.rsdp20 = le64_to_cpu(ret.rsdp20);
> >+ return ret.rsdp20 ? ret.rsdp20 : ret.rsdp10;
> >+ }
> >+ }
> >+ g_usleep(TEST_DELAY);
> >+ }
> >+ g_assert_not_reached();
> >+ return 0;
> >+}
> >--
> >2.7.4
>
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 08/13] tests: acpi: add a way to start tests with UEFI firmware
@ 2019-04-25 11:19 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-04-25 11:19 UTC (permalink / raw)
To: Wei Yang
Cc: Andrew Jones, Ben Warren, Michael S. Tsirkin, Laszlo Ersek,
qemu-devel, Shameer Kolothum, Shannon Zhao, Gonglei,
Philippe Mathieu-Daudé
On Thu, 25 Apr 2019 16:08:42 +0800
Wei Yang <richardw.yang@linux.intel.com> wrote:
> On Thu, Apr 25, 2019 at 07:34:44AM +0200, Igor Mammedov wrote:
> >For testcase to use UEFI firmware, one needs to provide and specify
> >firmwarei and varstore blobs names in test_data { uefi_fl1, uefi_fl2) }
> ^
> a typo here?
fixed
> >fields respectively and RAM start address plus size where to look for
> >test structure signature. Additionally testcase should specify
> >bootable cdrom image uefi-boot-images EFI test utility.
> >
> >Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> >Reviewed-by: Laszlo Ersek <lersek@redhat.com>
> >---
> >v3:
> > * drop data_dir prefix and firmware will come from pc-bios directly
> > * add cdrom option so test could use it for providing boot cdrom image
> > * add TODO comment convert '-drive if=pflash' to new syntax (Laszlo)
> >v2:
> > * move RAM start address and size to test_data, as it could differ
> > between boards (and even versions)
> >---
> > tests/bios-tables-test.c | 44 ++++++++++++++++++++++++++++++++++----------
> > 1 file changed, 34 insertions(+), 10 deletions(-)
> >
> >diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
> >index 5790ee4..0f24540 100644
> >--- a/tests/bios-tables-test.c
> >+++ b/tests/bios-tables-test.c
> >@@ -26,6 +26,11 @@
> > typedef struct {
> > const char *machine;
> > const char *variant;
> >+ const char *uefi_fl1;
> >+ const char *uefi_fl2;
> >+ const char *cd;
> >+ const uint64_t ram_start;
> >+ const uint64_t scan_len;
> > uint64_t rsdp_addr;
> > uint8_t rsdp_table[36 /* ACPI 2.0+ RSDP size */];
> > GArray *tables;
> >@@ -522,21 +527,40 @@ static void test_smbios_structs(test_data *data)
> > static void test_acpi_one(const char *params, test_data *data)
> > {
> > char *args;
> >-
> >- /* Disable kernel irqchip to be able to override apic irq0. */
> >- args = g_strdup_printf("-machine %s,accel=%s,kernel-irqchip=off "
> >- "-net none -display none %s "
> >- "-drive id=hd0,if=none,file=%s,format=raw "
> >- "-device ide-hd,drive=hd0 ",
> >- data->machine, "kvm:tcg",
> >- params ? params : "", disk);
> >+ bool use_uefi = data->uefi_fl1 && data->uefi_fl2;
> >+
> >+ if (use_uefi) {
> >+ /*
> >+ * TODO: convert '-drive if=pflash' to new syntax (see e33763be7cd3)
> >+ * when arm/virt boad starts to support it.
> >+ */
> >+ args = g_strdup_printf("-machine %s,accel=%s -nodefaults -nographic "
> >+ "-drive if=pflash,format=raw,file=%s,readonly "
> >+ "-drive if=pflash,format=raw,file=%s,snapshot=on -cdrom %s %s",
> >+ data->machine, "kvm:tcg", data->uefi_fl1, data->uefi_fl2,
> >+ data->cd, params ? params : "");
> >+
> >+ } else {
> >+ /* Disable kernel irqchip to be able to override apic irq0. */
> >+ args = g_strdup_printf("-machine %s,accel=%s,kernel-irqchip=off "
> >+ "-net none -display none %s "
> >+ "-drive id=hd0,if=none,file=%s,format=raw "
> >+ "-device ide-hd,drive=hd0 ",
> >+ data->machine, "kvm:tcg", params ? params : "", disk);
> >+ }
> >
> > data->qts = qtest_init(args);
> >
> >- boot_sector_test(data->qts);
> >+ if (use_uefi) {
> >+ g_assert(data->scan_len);
> >+ data->rsdp_addr = acpi_find_rsdp_address_uefi(data->qts,
> >+ data->ram_start, data->scan_len);
>
> Is this possible to merge this in test_acpi_rsdp_address()? Both of them set
> the data->rsdp_addr.
I didn't want to duplicate use_uefi calculation and well test_acpi_rsdp_address()
isn't doing much and not reused elsewhere. I'll fold in here.
>
> >+ } else {
> >+ boot_sector_test(data->qts);
> >+ test_acpi_rsdp_address(data);
> >+ }
> >
> > data->tables = g_array_new(false, true, sizeof(AcpiSdtTable));
> >- test_acpi_rsdp_address(data);
> > test_acpi_rsdp_table(data);
> > test_acpi_rxsdt_table(data);
> > test_acpi_fadt_table(data);
> >--
> >2.7.4
>
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 08/13] tests: acpi: add a way to start tests with UEFI firmware
@ 2019-04-25 11:19 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-04-25 11:19 UTC (permalink / raw)
To: Wei Yang
Cc: Andrew Jones, Ben Warren, Michael S. Tsirkin,
Philippe Mathieu-Daudé,
qemu-devel, Shameer Kolothum, Shannon Zhao, Gonglei,
Laszlo Ersek
On Thu, 25 Apr 2019 16:08:42 +0800
Wei Yang <richardw.yang@linux.intel.com> wrote:
> On Thu, Apr 25, 2019 at 07:34:44AM +0200, Igor Mammedov wrote:
> >For testcase to use UEFI firmware, one needs to provide and specify
> >firmwarei and varstore blobs names in test_data { uefi_fl1, uefi_fl2) }
> ^
> a typo here?
fixed
> >fields respectively and RAM start address plus size where to look for
> >test structure signature. Additionally testcase should specify
> >bootable cdrom image uefi-boot-images EFI test utility.
> >
> >Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> >Reviewed-by: Laszlo Ersek <lersek@redhat.com>
> >---
> >v3:
> > * drop data_dir prefix and firmware will come from pc-bios directly
> > * add cdrom option so test could use it for providing boot cdrom image
> > * add TODO comment convert '-drive if=pflash' to new syntax (Laszlo)
> >v2:
> > * move RAM start address and size to test_data, as it could differ
> > between boards (and even versions)
> >---
> > tests/bios-tables-test.c | 44 ++++++++++++++++++++++++++++++++++----------
> > 1 file changed, 34 insertions(+), 10 deletions(-)
> >
> >diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
> >index 5790ee4..0f24540 100644
> >--- a/tests/bios-tables-test.c
> >+++ b/tests/bios-tables-test.c
> >@@ -26,6 +26,11 @@
> > typedef struct {
> > const char *machine;
> > const char *variant;
> >+ const char *uefi_fl1;
> >+ const char *uefi_fl2;
> >+ const char *cd;
> >+ const uint64_t ram_start;
> >+ const uint64_t scan_len;
> > uint64_t rsdp_addr;
> > uint8_t rsdp_table[36 /* ACPI 2.0+ RSDP size */];
> > GArray *tables;
> >@@ -522,21 +527,40 @@ static void test_smbios_structs(test_data *data)
> > static void test_acpi_one(const char *params, test_data *data)
> > {
> > char *args;
> >-
> >- /* Disable kernel irqchip to be able to override apic irq0. */
> >- args = g_strdup_printf("-machine %s,accel=%s,kernel-irqchip=off "
> >- "-net none -display none %s "
> >- "-drive id=hd0,if=none,file=%s,format=raw "
> >- "-device ide-hd,drive=hd0 ",
> >- data->machine, "kvm:tcg",
> >- params ? params : "", disk);
> >+ bool use_uefi = data->uefi_fl1 && data->uefi_fl2;
> >+
> >+ if (use_uefi) {
> >+ /*
> >+ * TODO: convert '-drive if=pflash' to new syntax (see e33763be7cd3)
> >+ * when arm/virt boad starts to support it.
> >+ */
> >+ args = g_strdup_printf("-machine %s,accel=%s -nodefaults -nographic "
> >+ "-drive if=pflash,format=raw,file=%s,readonly "
> >+ "-drive if=pflash,format=raw,file=%s,snapshot=on -cdrom %s %s",
> >+ data->machine, "kvm:tcg", data->uefi_fl1, data->uefi_fl2,
> >+ data->cd, params ? params : "");
> >+
> >+ } else {
> >+ /* Disable kernel irqchip to be able to override apic irq0. */
> >+ args = g_strdup_printf("-machine %s,accel=%s,kernel-irqchip=off "
> >+ "-net none -display none %s "
> >+ "-drive id=hd0,if=none,file=%s,format=raw "
> >+ "-device ide-hd,drive=hd0 ",
> >+ data->machine, "kvm:tcg", params ? params : "", disk);
> >+ }
> >
> > data->qts = qtest_init(args);
> >
> >- boot_sector_test(data->qts);
> >+ if (use_uefi) {
> >+ g_assert(data->scan_len);
> >+ data->rsdp_addr = acpi_find_rsdp_address_uefi(data->qts,
> >+ data->ram_start, data->scan_len);
>
> Is this possible to merge this in test_acpi_rsdp_address()? Both of them set
> the data->rsdp_addr.
I didn't want to duplicate use_uefi calculation and well test_acpi_rsdp_address()
isn't doing much and not reused elsewhere. I'll fold in here.
>
> >+ } else {
> >+ boot_sector_test(data->qts);
> >+ test_acpi_rsdp_address(data);
> >+ }
> >
> > data->tables = g_array_new(false, true, sizeof(AcpiSdtTable));
> >- test_acpi_rsdp_address(data);
> > test_acpi_rsdp_table(data);
> > test_acpi_rxsdt_table(data);
> > test_acpi_fadt_table(data);
> >--
> >2.7.4
>
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 13/13] tests: acpi: print error unable to dump ACPI table during rebuild
@ 2019-04-25 11:26 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 88+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 11:26 UTC (permalink / raw)
To: Igor Mammedov, qemu-devel
Cc: Laszlo Ersek, Michael S. Tsirkin, Gonglei, Shannon Zhao,
Wei Yang, Andrew Jones, Shameer Kolothum, Ben Warren
On 4/25/19 7:34 AM, Igor Mammedov wrote:
> Instead of just asserting print the error that lead to assert first.
> While at it move assert into rebuild branch, which removes reduntant
"redundant"
> check done in case of !rebuild branch is taken (the later is taken
> care of by g_assert_no_error).
>
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> ---
> tests/bios-tables-test.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
> index f117461..5a5d036 100644
> --- a/tests/bios-tables-test.c
> +++ b/tests/bios-tables-test.c
> @@ -199,11 +199,14 @@ static void dump_aml_files(test_data *data, bool rebuild)
> sdt->aml, ext);
> fd = g_open(aml_file, O_WRONLY|O_TRUNC|O_CREAT,
> S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH);
> + if (fd < 0) {
> + perror(aml_file);
> + }
> + g_assert(fd >= 0);
> } else {
> fd = g_file_open_tmp("aml-XXXXXX", &sdt->aml_file, &error);
> g_assert_no_error(error);
> }
> - g_assert(fd >= 0);
>
> ret = qemu_write_full(fd, sdt->aml, sdt->aml_len);
> g_assert(ret == sdt->aml_len);
>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 13/13] tests: acpi: print error unable to dump ACPI table during rebuild
@ 2019-04-25 11:26 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 88+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 11:26 UTC (permalink / raw)
To: Igor Mammedov, qemu-devel
Cc: Andrew Jones, Ben Warren, Michael S. Tsirkin, Shameer Kolothum,
Shannon Zhao, Gonglei, Wei Yang, Laszlo Ersek
On 4/25/19 7:34 AM, Igor Mammedov wrote:
> Instead of just asserting print the error that lead to assert first.
> While at it move assert into rebuild branch, which removes reduntant
"redundant"
> check done in case of !rebuild branch is taken (the later is taken
> care of by g_assert_no_error).
>
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> ---
> tests/bios-tables-test.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
> index f117461..5a5d036 100644
> --- a/tests/bios-tables-test.c
> +++ b/tests/bios-tables-test.c
> @@ -199,11 +199,14 @@ static void dump_aml_files(test_data *data, bool rebuild)
> sdt->aml, ext);
> fd = g_open(aml_file, O_WRONLY|O_TRUNC|O_CREAT,
> S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH);
> + if (fd < 0) {
> + perror(aml_file);
> + }
> + g_assert(fd >= 0);
> } else {
> fd = g_file_open_tmp("aml-XXXXXX", &sdt->aml_file, &error);
> g_assert_no_error(error);
> }
> - g_assert(fd >= 0);
>
> ret = qemu_write_full(fd, sdt->aml, sdt->aml_len);
> g_assert(ret == sdt->aml_len);
>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 12/13] tests: acpi: refactor rebuild-expected-aml.sh to dump ACPI tables for a specified list of targets
@ 2019-04-25 11:32 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-04-25 11:32 UTC (permalink / raw)
To: Wei Yang
Cc: qemu-devel, Laszlo Ersek, Michael S. Tsirkin, Gonglei,
Philippe Mathieu-Daudé,
Shannon Zhao, Andrew Jones, Shameer Kolothum, Ben Warren
On Thu, 25 Apr 2019 16:20:50 +0800
Wei Yang <richardw.yang@linux.intel.com> wrote:
> On Thu, Apr 25, 2019 at 07:34:48AM +0200, Igor Mammedov wrote:
> >Make initial list contain aarch64 and x86_64 targets.
>
> so i386 is taken out?
>
> >
> >Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> >Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> >---
> >v2:
> > * fix up error message (Philippe Mathieu-Daudé <philmd@redhat.com>)
> >---
> > tests/data/acpi/rebuild-expected-aml.sh | 23 +++++++++++------------
> > 1 file changed, 11 insertions(+), 12 deletions(-)
> >
> >diff --git a/tests/data/acpi/rebuild-expected-aml.sh b/tests/data/acpi/rebuild-expected-aml.sh
> >index abdff70..52793f3 100755
> >--- a/tests/data/acpi/rebuild-expected-aml.sh
> >+++ b/tests/data/acpi/rebuild-expected-aml.sh
> >@@ -7,21 +7,12 @@
> > #
> > # Authors:
> > # Marcel Apfelbaum <marcel.a@redhat.com>
> >+# Igor Mammedov <imammedo@redhat.com>
> > #
> > # This work is licensed under the terms of the GNU GPLv2.
> > # See the COPYING.LIB file in the top-level directory.
> >
> >-qemu=
> >-
> >-if [ -e x86_64-softmmu/qemu-system-x86_64 ]; then
> >- qemu="x86_64-softmmu/qemu-system-x86_64"
> >-elif [ -e i386-softmmu/qemu-system-i386 ]; then
> >- qemu="i386-softmmu/qemu-system-i386"
> >-else
> >- echo "Run 'make' to build the qemu exectutable!"
> >- echo "Run this script from the build directory."
> >- exit 1;
> >-fi
> >+qemu_bins="aarch64-softmmu/qemu-system-aarch64 x86_64-softmmu/qemu-system-x86_64"
> >
> > if [ ! -e "tests/bios-tables-test" ]; then
> > echo "Test: bios-tables-test is required! Run make check before this script."
> >@@ -29,6 +20,14 @@ if [ ! -e "tests/bios-tables-test" ]; then
> > exit 1;
> > fi
> >
> >-TEST_ACPI_REBUILD_AML=y QTEST_QEMU_BINARY=$qemu tests/bios-tables-test
> >+for qemu in $qemu_bins; do
> >+ if [ ! -e $qemu ]; then
> >+ echo "Run 'make' to build the following QEMU exectutables: $qemu_bins"
>
> s/exectutables/executables
fixed
> >+ echo "Also, run this script from the build directory."
> >+ exit 1;
> >+ fi
> >+ TEST_ACPI_REBUILD_AML=y QTEST_QEMU_BINARY=$qemu tests/bios-tables-test
> >+done
> >+
>
> The original behavior is either one executable exist will pass.
>
> But now, either of one doesn't exist will fail. Is this what we expect?
It's mainly maintainers tool to update reference blobs.
And I intentionally made it fail to force maintainer/developer
building all targets that depend on ACPI to make sure
that mistakes won't silently creep in due to non build target.
> > echo "The files were rebuilt and can be added to git."
> >--
> >2.7.4
>
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 12/13] tests: acpi: refactor rebuild-expected-aml.sh to dump ACPI tables for a specified list of targets
@ 2019-04-25 11:32 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-04-25 11:32 UTC (permalink / raw)
To: Wei Yang
Cc: Andrew Jones, Ben Warren, Michael S. Tsirkin, Laszlo Ersek,
qemu-devel, Shameer Kolothum, Shannon Zhao, Gonglei,
Philippe Mathieu-Daudé
On Thu, 25 Apr 2019 16:20:50 +0800
Wei Yang <richardw.yang@linux.intel.com> wrote:
> On Thu, Apr 25, 2019 at 07:34:48AM +0200, Igor Mammedov wrote:
> >Make initial list contain aarch64 and x86_64 targets.
>
> so i386 is taken out?
>
> >
> >Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> >Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> >---
> >v2:
> > * fix up error message (Philippe Mathieu-Daudé <philmd@redhat.com>)
> >---
> > tests/data/acpi/rebuild-expected-aml.sh | 23 +++++++++++------------
> > 1 file changed, 11 insertions(+), 12 deletions(-)
> >
> >diff --git a/tests/data/acpi/rebuild-expected-aml.sh b/tests/data/acpi/rebuild-expected-aml.sh
> >index abdff70..52793f3 100755
> >--- a/tests/data/acpi/rebuild-expected-aml.sh
> >+++ b/tests/data/acpi/rebuild-expected-aml.sh
> >@@ -7,21 +7,12 @@
> > #
> > # Authors:
> > # Marcel Apfelbaum <marcel.a@redhat.com>
> >+# Igor Mammedov <imammedo@redhat.com>
> > #
> > # This work is licensed under the terms of the GNU GPLv2.
> > # See the COPYING.LIB file in the top-level directory.
> >
> >-qemu=
> >-
> >-if [ -e x86_64-softmmu/qemu-system-x86_64 ]; then
> >- qemu="x86_64-softmmu/qemu-system-x86_64"
> >-elif [ -e i386-softmmu/qemu-system-i386 ]; then
> >- qemu="i386-softmmu/qemu-system-i386"
> >-else
> >- echo "Run 'make' to build the qemu exectutable!"
> >- echo "Run this script from the build directory."
> >- exit 1;
> >-fi
> >+qemu_bins="aarch64-softmmu/qemu-system-aarch64 x86_64-softmmu/qemu-system-x86_64"
> >
> > if [ ! -e "tests/bios-tables-test" ]; then
> > echo "Test: bios-tables-test is required! Run make check before this script."
> >@@ -29,6 +20,14 @@ if [ ! -e "tests/bios-tables-test" ]; then
> > exit 1;
> > fi
> >
> >-TEST_ACPI_REBUILD_AML=y QTEST_QEMU_BINARY=$qemu tests/bios-tables-test
> >+for qemu in $qemu_bins; do
> >+ if [ ! -e $qemu ]; then
> >+ echo "Run 'make' to build the following QEMU exectutables: $qemu_bins"
>
> s/exectutables/executables
fixed
> >+ echo "Also, run this script from the build directory."
> >+ exit 1;
> >+ fi
> >+ TEST_ACPI_REBUILD_AML=y QTEST_QEMU_BINARY=$qemu tests/bios-tables-test
> >+done
> >+
>
> The original behavior is either one executable exist will pass.
>
> But now, either of one doesn't exist will fail. Is this what we expect?
It's mainly maintainers tool to update reference blobs.
And I intentionally made it fail to force maintainer/developer
building all targets that depend on ACPI to make sure
that mistakes won't silently creep in due to non build target.
> > echo "The files were rebuilt and can be added to git."
> >--
> >2.7.4
>
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 12/13] tests: acpi: refactor rebuild-expected-aml.sh to dump ACPI tables for a specified list of targets
@ 2019-04-25 11:46 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-04-25 11:46 UTC (permalink / raw)
To: Wei Yang
Cc: Andrew Jones, Ben Warren, Michael S. Tsirkin, Laszlo Ersek,
qemu-devel, Shameer Kolothum, Shannon Zhao, Gonglei,
Philippe Mathieu-Daudé
On Thu, 25 Apr 2019 13:32:50 +0200
Igor Mammedov <imammedo@redhat.com> wrote:
> On Thu, 25 Apr 2019 16:20:50 +0800
> Wei Yang <richardw.yang@linux.intel.com> wrote:
>
> > On Thu, Apr 25, 2019 at 07:34:48AM +0200, Igor Mammedov wrote:
> > >Make initial list contain aarch64 and x86_64 targets.
> >
> > so i386 is taken out?
we use the same blobs for both i386 and x86_64 targets so it was sort of duplication.
But someone who intends to update reference blobs, surely can build x86_64 and aarch64
targets to achieve their goal.
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 12/13] tests: acpi: refactor rebuild-expected-aml.sh to dump ACPI tables for a specified list of targets
@ 2019-04-25 11:46 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-04-25 11:46 UTC (permalink / raw)
To: Wei Yang
Cc: Andrew Jones, Ben Warren, Michael S. Tsirkin,
Philippe Mathieu-Daudé,
qemu-devel, Shameer Kolothum, Shannon Zhao, Gonglei,
Laszlo Ersek
On Thu, 25 Apr 2019 13:32:50 +0200
Igor Mammedov <imammedo@redhat.com> wrote:
> On Thu, 25 Apr 2019 16:20:50 +0800
> Wei Yang <richardw.yang@linux.intel.com> wrote:
>
> > On Thu, Apr 25, 2019 at 07:34:48AM +0200, Igor Mammedov wrote:
> > >Make initial list contain aarch64 and x86_64 targets.
> >
> > so i386 is taken out?
we use the same blobs for both i386 and x86_64 targets so it was sort of duplication.
But someone who intends to update reference blobs, surely can build x86_64 and aarch64
targets to achieve their goal.
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 09/13] tests: acpi: ignore SMBIOS tests when UEFI firmware is used
@ 2019-04-25 12:37 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 88+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 12:37 UTC (permalink / raw)
To: Igor Mammedov, qemu-devel
Cc: Laszlo Ersek, Michael S. Tsirkin, Gonglei, Shannon Zhao,
Wei Yang, Andrew Jones, Shameer Kolothum, Ben Warren
Hi Igor,
On 4/25/19 7:34 AM, Igor Mammedov wrote:
> once FW provides a pointer to SMBIOS entry point like it does for
> RSDP it should be possible to enable this one the same way.
>
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> Reviewed-by: Laszlo Ersek <lersek@redhat.com>
> ---
> v3:
> - add ref to a uefi-test-tools feature req into comment (Laszlo)
> ---
> tests/bios-tables-test.c | 11 +++++++++--
> 1 file changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
> index 0f24540..1be55a1 100644
> --- a/tests/bios-tables-test.c
> +++ b/tests/bios-tables-test.c
> @@ -573,8 +573,15 @@ static void test_acpi_one(const char *params, test_data *data)
> }
> }
>
> - test_smbios_entry_point(data);
> - test_smbios_structs(data);
> + /*
> + * TODO: make SMBIOS tests work with UEFI firmware,
> + * Bug on uefi-test-tools to provide entry point:
> + * https://bugs.launchpad.net/qemu/+bug/1821884
> + */
> + if (!use_uefi) {
> + test_smbios_entry_point(data);
> + test_smbios_structs(data);
> + }
Now that Laszlo resolved this bug, you can update the SMBIOS tests :)
Without this patch I get:
ERROR:/home/phil/source/qemu/tests/bios-tables-test.c:460:test_smbios_entry_point:
assertion failed (off < 0x100000): (0x00100000 < 0x00100000)
And the UEFI console shows:
BdsDxe: failed to load Boot0001 "UEFI Misc Device" from
VenHw(93E34C7E-B50E-11DF-9223-2443DFD72085,00): Not Found
FatDiskIo: Cache Page OutBound occurred!
add-symbol-file
/home/lacos/src/upstream/qemu/tests/uefi-test-tools/Build/UefiTestTools/DEBUG_GCC5/AARCH64/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest/DEBUG/BiosTablesTest.dll
0x442C3000
Loading driver at 0x000442C2000 EntryPoint=0x000442C47AC BiosTablesTest.efi
InstallProtocolInterface: BC62157E-3E33-4FEC-9920-2D3B36D750DF 4654EE18
ProtectUefiImageCommon - 0x451AA140
- 0x00000000442C2000 - 0x0000000000006000
SetUefiImageMemoryAttributes - 0x00000000442C2000 - 0x0000000000001000
(0x0000000000004008)
SetUefiImageMemoryAttributes - 0x00000000442C3000 - 0x0000000000003000
(0x0000000000020008)
SetUefiImageMemoryAttributes - 0x00000000442C6000 - 0x0000000000002000
(0x0000000000004008)
BdsDxe: starting Boot0002 "UEFI Misc Device 2" from
PciRoot(0x0)/Pci(0x2,0x0)
BiosTablesTest: BiosTablesTest=45100000 Rsdp10=0 Rsdp20=44020000
BiosTablesTest: Smbios21=0 Smbios30=47640000
BiosTablesTest: press any key to exit
>
> assert(!global_qtest);
> qtest_quit(data->qts);
>
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 09/13] tests: acpi: ignore SMBIOS tests when UEFI firmware is used
@ 2019-04-25 12:37 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 88+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 12:37 UTC (permalink / raw)
To: Igor Mammedov, qemu-devel
Cc: Andrew Jones, Ben Warren, Michael S. Tsirkin, Shameer Kolothum,
Shannon Zhao, Gonglei, Wei Yang, Laszlo Ersek
Hi Igor,
On 4/25/19 7:34 AM, Igor Mammedov wrote:
> once FW provides a pointer to SMBIOS entry point like it does for
> RSDP it should be possible to enable this one the same way.
>
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> Reviewed-by: Laszlo Ersek <lersek@redhat.com>
> ---
> v3:
> - add ref to a uefi-test-tools feature req into comment (Laszlo)
> ---
> tests/bios-tables-test.c | 11 +++++++++--
> 1 file changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
> index 0f24540..1be55a1 100644
> --- a/tests/bios-tables-test.c
> +++ b/tests/bios-tables-test.c
> @@ -573,8 +573,15 @@ static void test_acpi_one(const char *params, test_data *data)
> }
> }
>
> - test_smbios_entry_point(data);
> - test_smbios_structs(data);
> + /*
> + * TODO: make SMBIOS tests work with UEFI firmware,
> + * Bug on uefi-test-tools to provide entry point:
> + * https://bugs.launchpad.net/qemu/+bug/1821884
> + */
> + if (!use_uefi) {
> + test_smbios_entry_point(data);
> + test_smbios_structs(data);
> + }
Now that Laszlo resolved this bug, you can update the SMBIOS tests :)
Without this patch I get:
ERROR:/home/phil/source/qemu/tests/bios-tables-test.c:460:test_smbios_entry_point:
assertion failed (off < 0x100000): (0x00100000 < 0x00100000)
And the UEFI console shows:
BdsDxe: failed to load Boot0001 "UEFI Misc Device" from
VenHw(93E34C7E-B50E-11DF-9223-2443DFD72085,00): Not Found
FatDiskIo: Cache Page OutBound occurred!
add-symbol-file
/home/lacos/src/upstream/qemu/tests/uefi-test-tools/Build/UefiTestTools/DEBUG_GCC5/AARCH64/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest/DEBUG/BiosTablesTest.dll
0x442C3000
Loading driver at 0x000442C2000 EntryPoint=0x000442C47AC BiosTablesTest.efi
InstallProtocolInterface: BC62157E-3E33-4FEC-9920-2D3B36D750DF 4654EE18
ProtectUefiImageCommon - 0x451AA140
- 0x00000000442C2000 - 0x0000000000006000
SetUefiImageMemoryAttributes - 0x00000000442C2000 - 0x0000000000001000
(0x0000000000004008)
SetUefiImageMemoryAttributes - 0x00000000442C3000 - 0x0000000000003000
(0x0000000000020008)
SetUefiImageMemoryAttributes - 0x00000000442C6000 - 0x0000000000002000
(0x0000000000004008)
BdsDxe: starting Boot0002 "UEFI Misc Device 2" from
PciRoot(0x0)/Pci(0x2,0x0)
BiosTablesTest: BiosTablesTest=45100000 Rsdp10=0 Rsdp20=44020000
BiosTablesTest: Smbios21=0 Smbios30=47640000
BiosTablesTest: press any key to exit
>
> assert(!global_qtest);
> qtest_quit(data->qts);
>
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 10/13] tests: add expected ACPI tables for arm/virt board
@ 2019-04-25 12:40 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 88+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 12:40 UTC (permalink / raw)
To: Igor Mammedov, qemu-devel
Cc: Laszlo Ersek, Michael S. Tsirkin, Gonglei, Shannon Zhao,
Wei Yang, Andrew Jones, Shameer Kolothum, Ben Warren
On 4/25/19 7:34 AM, Igor Mammedov wrote:
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> this patch is ahead fo "tests: acpi: add simple arm/virt testcase"
> to keep 'make check' working during bisection and not to pollute
> code with binary blobs which are not reviewable.
> ---
> tests/data/acpi/virt/APIC | Bin 0 -> 168 bytes
> tests/data/acpi/virt/DSDT | Bin 0 -> 18476 bytes
> tests/data/acpi/virt/FACP | Bin 0 -> 268 bytes
> tests/data/acpi/virt/GTDT | Bin 0 -> 96 bytes
> tests/data/acpi/virt/MCFG | Bin 0 -> 60 bytes
> tests/data/acpi/virt/SPCR | Bin 0 -> 80 bytes
> 6 files changed, 0 insertions(+), 0 deletions(-)
> create mode 100644 tests/data/acpi/virt/APIC
> create mode 100644 tests/data/acpi/virt/DSDT
> create mode 100644 tests/data/acpi/virt/FACP
> create mode 100644 tests/data/acpi/virt/GTDT
> create mode 100644 tests/data/acpi/virt/MCFG
> create mode 100644 tests/data/acpi/virt/SPCR
>
> diff --git a/tests/data/acpi/virt/APIC b/tests/data/acpi/virt/APIC
> new file mode 100644
> index 0000000000000000000000000000000000000000..797dfde2841c51b7e72065602e99ce1714347f0d
> GIT binary patch
> literal 168
> zcmZ<^@N{0mz`($~*~#D8BUr&HBEZ=ZD8>jB1F=Cg4Dd+6SPUF6788)c?E~X6Fu>G{
> hBZPn~MyPrgD9sGlkD?67;f3451Xcqw&w(L;0RYV=2>}2A
>
> literal 0
> HcmV?d00001
>
> diff --git a/tests/data/acpi/virt/DSDT b/tests/data/acpi/virt/DSDT
> new file mode 100644
> index 0000000000000000000000000000000000000000..20e85c7f89f645c69935c615c07084e221419960
> GIT binary patch
> literal 18476
> zcmc)ScU)EVAII^7km3at6myGa+R|dUS|(gjDG>rqi;BuJN5jfYEla7?tSq%Xt!(eT
> zr!AYd_uhN&!S8+U(D&=t`StIw9$oH>d%mB0pK#D~&LeJRL*=*uql2K;?26j>=!V`E
> z6YJuY`dmg31mXSgWB#J~S-UqiR5Ud<cZ(Mn7iTw(uCB~0kJnWzh6dS9<Etx!#^$Q5
> zcx_Gk!TOrf#l<BhsRy&0;`I#$-C~^=whh9GZG-$EIH7frk<mvrM_ZLw*5`%~G&Yxv
> z9Mh1RGG=Ujt)>jdl!92h)D&$WWX;hthf7M5uZl}Dl25#TNmhEvu#pquBa=&ZuBsU?
> zNU5HsVO)7EM{DBc|GlzR+b&ufK3RFzF7@fJLGsy(?FFt|xgHw}TBWeXJ_0W|JtBPC
> ze~f4qtRGR58c`9xic&YHN5oo1&B(GDr9Pu9az<v<jMg@z%x4UWoRJkZBim*S@)?68
> zXKWBPBW5!O`-~xxGg?Q@$h8?me8$ko8Ev9ww6hsQea5iJ8QD=Y@@>X2pRsl1jJ8oT
> zI@pY@ZAJ-xjMnWRv8Wk^He(x~5xJZ4ha|nLZ)h{N^%>FoX>Qc(=wdUr^BK|mX<pQf
> zZZ>0kpAo&Ewu_q4!)6Tk8PWS``=}YcY{m{gBYHp0kDAfjW{mI|(fesZ)QpX6M!C<3
> z-cLJ3&DhvxRQQbO{j_7$jQ%zwZZk@w_tV0t8JpUSN}mzEpLU9xvANBt@)^<l>4s4=
> z2H1>|J|lWR?Hn~@OPevuXGHI(U7}_b+YJ3Rp7<Lo{JWtvdOz(NHKWvKRQrtR{j^)u
> zj6pVIN1qYBpLUO$F~nx<<TIl8(;iVXhS`iUJ|lWR?HM&=8=FyMGs>d((_T?CwzC;y
> zeMa<tS`;;7xXq|d%~<euW?j5G^+M{#))ki*57U85TnA*yDhm%|sz&LyqGGIWbzr4i
> z9iiog>%s@e)fW`SdejB+pgPzu=p7X6ze?Sk6-*5#>0_Xck_RDm_2W7&y)ZK;$m)=j
> zmDAD^jB3z`<oyiYF9|y2hM$kMQk146Q&ARl$ji!YX~_t}HQFv!;VNy|F8Nquoi<Hp
> zxKi^I+v=DpxoxV#mFZ1&KomZsHchNlhAY$0l9^bUeg&C9xH7$IW^$!AO{`RgEA@&J
> z&!VHl<hH3w855i804k+Sr#m-*bA!ZlrkxukSEgUQ(w(j0)FH86L3&diaJf_I&Ngti
> zfwK*rN_S?%nVndf{*veb&7DejwuMs%^U1GX;!Dz&PNh3zaK_-&0i8RQ?#zKR2hJQi
> zmG0CTg?&GB;nV@3JC*LtgEJ4#JUW%`YzJpMICa42PNh5B!`U9r_H-)Usgo&l=EJE2
> zOm`~XSpa7NoCS0$-Pr-o4shy#)SXIqc7(GdoE_;@y0Z|@LO68*>rSORJHgor&Q5eH
> z-MJy08^WmrUUw?p*%{8xaCW9s=}w($+V`^yoH{^ur_!BW;p_@$S2~sM>;`8yICVhn
> zPNh4$!`U6q?sO{M*#piVaOwcuol1B1gtI4{J?T`svlpDb;M4)TJC*J%g0l$DB081s
> z><wpcICX&UPNh5hz}W}RK6EPGxe=Tj!Ko7hcPic47tX$L_N7zl&W+*R7*3r)xKruQ
> zesK1Kvmc#GclL*~Kb$(@aHrCpo4~mVoSV?8bmyjUZVIPPP~53>=Vowj2IppUD&4s`
> zoSVa`6B>6a-MIyvTfn&mol18OfO7zxIstO0(wzh090=z?I+gC+63#8*)CrS2mG0aM
> z&aL3wicY0FbzRQ>ye)=PCs^)Ox>J|qv@(6<SpsJXol1A=BAiyHk337^)Crk8mG0D~
> zH?2$`-<H8yMyJx9y5MHcL2&8>&Yenk>N1--2g5m-PNh3_am}1V;M579JC*L#B{g#n
> zg>xvKN_Xl)nmLETsS`wZD&48eXXe}*&aLTGx>Fa;%()GmI-zu@(w(|gX3lNl+?GzI
> zJ9UA~oZG>v6Hs?5-KooB=G-36?depyQy0U`IUG)%u)0&}PF(^s=MHf0K&R53Bj6kX
> z=LkBL?ktD19L{n&mG0C<E^}7ESwW}Low~GT&N!TLI+gC!1ud;ip8;3GSxKkTow|&r
> zmFYi+s^F}mQ|V4!yfWuVI7iZ{bf+#^nR67Jqv%w+Qx~etIU3H<bSmAc%Twm8hO?SZ
> zr8{*|%A7mGxg(uQcj{7<Id_6{Cpwkx)CDMWj)8Lwol1A=vXeP$;H;rj=}uj2GUr%0
> z$I_{Er!Fy>vlh-;I+gCMgR>6KIy#l^+!@ZD;oO-{r9124tcSCnPNh2=;B0`iflj46
> z$H6%c&T(`q-8ml4@o<i(Q|ZoK;M@hyUFcN0a{`<b;G96G(w!6GoCxPcI+gC+70zAZ
> z+?7tHJ9mR~H#m2rQ|Zn|I2++?q*Lk6-QnCF&fV!$x^oXW_keQ`I+gC+6V5&1+>=hF
> zJDcEag0qQEr91b6b1yjeqEqS4z2V#&&b{eWx^o{m_knXCI+gC61m`3;C()^N=e}_6
> z3+KLcD&488-uCD1esJzbr_!C1;hYTTWIC1Z+#k;U;oP52r8}p<IR(xsbSm9B70#(}
> zPNh@n&S`K?gL4|4N_S3&b2^;U=~TM&05}hT^8h-P?mQ6A1K~W7PNh2!g7Y9a5291)
> z&V%7R7|w&~RJwBpoHO8@L8sE4hroFVoQKe<bmyUP9t!87bSm9>7@UW}c^I8acg}=!
> zCY&?rRJ!wUI1h*Oa5|OloCW7BIA_tRbmtLp9s%bObSm9B8_wBq&Zbl8&N*<-fpZR>
> zN_WnMb1s~7=~TM&NH~v#^GG_C?mP<4qu@M>PNh5N!8s4kd2}k>c{H3y!+A8FN_QRu
> z=P_^|L#NW6^WmHi=X^Sq?py%p0yr1YsdQ&EoXv1H)2Vdlv2Y#>=dpAu-FY0G$H93V
> zol18e59jf49#5yzoeSYy2<JjNmF`>w=OQ>4(W!LjVmKGWxtLC+J5PY~1UOHiQ|Znn
> za4vy!37txJo(SiOaGpq~(w!&4c@mr_(W!Lj$#9+w=gD*`-MJLbrEo5#Q|ZoA;5-G+
> zQ|MH>^Hexbh4WN8mF`>y=Q22#(W!LjayXa6xtva=J6FKD0?rk5D&2V+oTtHg8l6ga
> zo(|{faGp-5(w%3(c?O(k(5ZCinQ)#7=b3aW-FX(AXTf<Eol19}4d>Z#o=vCHo#()L
> z4xH!EsdVSLaGne2xpXSsc^;hS!Fe8?N_U<Q=lO7+Pp8tI7r=P|oEOlkbmxU|UI^!f
> zbSmAs63&%yuB21x&Wqr@2+oV>RJ!wGI4_3tVmg)Xyadim;Jk!Rr8`%_xeCrzbSm9>
> zDV&$Wc`2PrcU}hPWpG|br_!C5!+ANJm(!_q=M`{X0p}HTD&2V{oL9nmC7nulUIph>
> za9%~H(w$esc{Q9@)2VdlHE>=7=QVUH-FYpX*TQ)%ol19J2j_KgUPq_Wo!7&8J)GCm
> zsdVQJaNYpt4Rk8qc_W-R!g(W|N_XA_=S^_lM5of7H^X@|oHx^{bmuK_-U8<>bSm9>
> zE1b8&c`Kbtcisl)ZE)U3r_!Cb!+ATLx6`R~=N)j~0p}fbD&2V}oOi-`C!I=n-Ua7f
> zaNb3y(w%q1c{iMQ)2VdlJ#gLw=RI^P-FYvZ_riHEol1A!2j_io-bbg>o%h3eKb-f|
> zsdVQ9a6SO%19U3g`5>GR!ucSbN_Rd4=R<HlM5of7tKnP?=W05Y?tB=|hv9sfPNh2^
> zf%6eKAE8s}&PU;V6wXKKRJ!vqI3I)aF*=p*d>qcl;e4D<r90QaxdzTPbSmBX1e{O6
> z`2?LxcRmT{lW;ysr_!BI!TA)NPtmD#=hJXL4d>HzD&6@EoX^1d44q1MJ`3lwa6U_?
> z(w%GJTnpz~I+gBx4$kM`e2z|~JD-R1c{rb^Q|ZnZ;Cunj7wA;F^F=scg!4r@mF|2A
> z&X?ePiB6?EUxxE#IA5ky>CRW+d<D)|=v2D%RXAUT^Hn;P?tBf-*Wi4OPNh3vhx2tf
> zU#C;)&NtwE1I{<-RJ!v`INyZxO*)nCd<)LE;Czctr90n-^KCfarc>$8ci?;n&Uffk
> zy7OH)--YvCI+gBx56<`Ce2-40JKu-%eK_BzQ|ZnR;QRp259n07^Fug4g!4l>mG1lq
> z&X3^yh)$(DKZf&TI6tOS>CR8!`~=QV=v2D%Q#e0`^HVyN?)(hS&*1!wPNh3Phx2nd
> zKc`da&M)Bn0?se!RJ!v^IKPDROFEVA{0h#m;QWeCr8~cd^J_T2rc>$8Z{Yj}&Tr^c
> zy7OB&zlHN#I+gDH4$kl3{EkkgJHLnXdpN(RQ|Znh;QRs3ALvxN^G7&;g!4x_mG1lr
> z&Y$4?iB6?Ee}?mCIDe*7>CRu^`~}Wm=v2D%S2%x#^H(~R?)(kT-{Aa>PNh44hx2zh
> zf2ULF&OhM%1I|C_RJ!v|IRAw6Pdb(E{0q*%;QWhDr91zI^KUr+rc>$87C2krY@t(`
> zbT&3uXX$^8vEMh17mrN-KB;c&^rjx|VmXO7^5`2R-^e3;qYr+ruys>IeM3fSRO<I%
> z!(UeYU!yjT7?u1SN2PvU``<?Oix`#s97m;oYy00u^^X{p{9I~OVSZD*qC8mDP8;Tr
> z&`n`&`|y2Fg6#T=@goaHw~5VMoENmp)gwWmZ$=PgEb1Htxf$VI{gdC)^7ruM-Igu&
> zNJegEvb1$#^A<gt5iHrl)+9EVuiKXJpY-ObkKyO%1grjU&z#*bzOF9Fj*qJ!6BLeZ
> z+f>^S&ss7)h*wT1Svj`NiYWyhWBH9WZ<PH~)MLaM6K0k_u>C8OmrRdkX@gRI%+|-U
> z8DWHT!aHT*s2N9wx3Qi<_+e#-<twIU%$TPKOJdo{(Os6WShsERf&9b+Gr|SoBdexg
> zl%HCXm3U;;^umEnl?^pnEBhp0)!LzJK57^|w`N)A&uhA_j@PVgyJDKYkeL}7;f>w|
> zCa1oxxGDL|)s4+HS@l)vx2#F-LE(GJgg*#nvEqMxyAr#GzF9>hQs1W3hy3tk_y#kh
> z+l;EKP5s1`C*DVANccWF>wb|tH9P&T8$ss!chlJ<F+$r`RTuP)^**V)_Lt<pdO-VH
> q*Pxf~WCr0A=(!5>nyQM+f`xSx>MLUN8=H&5JIVJQNjl<q-v0n?ptJx0
>
> literal 0
> HcmV?d00001
>
> diff --git a/tests/data/acpi/virt/FACP b/tests/data/acpi/virt/FACP
> new file mode 100644
> index 0000000000000000000000000000000000000000..27de99f51bfe846b1f8796ace49d83f5b33a1aed
> GIT binary patch
> literal 268
> ycmZ>BbPnKQWME+3?d0$55v<@85#a0w6axw|fY>0Kx<CNcIA#XwTY+i=(L4a*H3tCz
>
> literal 0
> HcmV?d00001
>
> diff --git a/tests/data/acpi/virt/GTDT b/tests/data/acpi/virt/GTDT
> new file mode 100644
> index 0000000000000000000000000000000000000000..10107a65e958ff6495bb8c17d63d0539690f59f6
> GIT binary patch
> literal 96
> zcmZ<{aS2IaU|?Xn>E!S15v<@85#a0&6k`O6f!H7#8OTC8azL5|h^3)?DJYFj0RVOU
> B2mt^9
>
> literal 0
> HcmV?d00001
>
> diff --git a/tests/data/acpi/virt/MCFG b/tests/data/acpi/virt/MCFG
> new file mode 100644
> index 0000000000000000000000000000000000000000..e8987e1af0ec3829770bf4fe11fab02b06160dd2
> GIT binary patch
> literal 60
> scmeZuc5}C3U|?YMck*}k2v%^42ypfViZKGkKx`0=1Oyx)oc|yS05YNo0RR91
>
> literal 0
> HcmV?d00001
>
> diff --git a/tests/data/acpi/virt/SPCR b/tests/data/acpi/virt/SPCR
> new file mode 100644
> index 0000000000000000000000000000000000000000..377271a0e7817cc21a28c02123a89facad63604f
> GIT binary patch
> literal 80
> zcmWFza1IJ!U|?VpcJg=j2v%^42yhMtiZKGkKx`1r48#l^3?L>agsBLmm>C$E7#RKo
> I0Z0r60QF4^0RR91
>
> literal 0
> HcmV?d00001
>
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 10/13] tests: add expected ACPI tables for arm/virt board
@ 2019-04-25 12:40 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 88+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 12:40 UTC (permalink / raw)
To: Igor Mammedov, qemu-devel
Cc: Andrew Jones, Ben Warren, Michael S. Tsirkin, Shameer Kolothum,
Shannon Zhao, Gonglei, Wei Yang, Laszlo Ersek
On 4/25/19 7:34 AM, Igor Mammedov wrote:
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> this patch is ahead fo "tests: acpi: add simple arm/virt testcase"
> to keep 'make check' working during bisection and not to pollute
> code with binary blobs which are not reviewable.
> ---
> tests/data/acpi/virt/APIC | Bin 0 -> 168 bytes
> tests/data/acpi/virt/DSDT | Bin 0 -> 18476 bytes
> tests/data/acpi/virt/FACP | Bin 0 -> 268 bytes
> tests/data/acpi/virt/GTDT | Bin 0 -> 96 bytes
> tests/data/acpi/virt/MCFG | Bin 0 -> 60 bytes
> tests/data/acpi/virt/SPCR | Bin 0 -> 80 bytes
> 6 files changed, 0 insertions(+), 0 deletions(-)
> create mode 100644 tests/data/acpi/virt/APIC
> create mode 100644 tests/data/acpi/virt/DSDT
> create mode 100644 tests/data/acpi/virt/FACP
> create mode 100644 tests/data/acpi/virt/GTDT
> create mode 100644 tests/data/acpi/virt/MCFG
> create mode 100644 tests/data/acpi/virt/SPCR
>
> diff --git a/tests/data/acpi/virt/APIC b/tests/data/acpi/virt/APIC
> new file mode 100644
> index 0000000000000000000000000000000000000000..797dfde2841c51b7e72065602e99ce1714347f0d
> GIT binary patch
> literal 168
> zcmZ<^@N{0mz`($~*~#D8BUr&HBEZ=ZD8>jB1F=Cg4Dd+6SPUF6788)c?E~X6Fu>G{
> hBZPn~MyPrgD9sGlkD?67;f3451Xcqw&w(L;0RYV=2>}2A
>
> literal 0
> HcmV?d00001
>
> diff --git a/tests/data/acpi/virt/DSDT b/tests/data/acpi/virt/DSDT
> new file mode 100644
> index 0000000000000000000000000000000000000000..20e85c7f89f645c69935c615c07084e221419960
> GIT binary patch
> literal 18476
> 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
>
> literal 0
> HcmV?d00001
>
> diff --git a/tests/data/acpi/virt/FACP b/tests/data/acpi/virt/FACP
> new file mode 100644
> index 0000000000000000000000000000000000000000..27de99f51bfe846b1f8796ace49d83f5b33a1aed
> GIT binary patch
> literal 268
> ycmZ>BbPnKQWME+3?d0$55v<@85#a0w6axw|fY>0Kx<CNcIA#XwTY+i=(L4a*H3tCz
>
> literal 0
> HcmV?d00001
>
> diff --git a/tests/data/acpi/virt/GTDT b/tests/data/acpi/virt/GTDT
> new file mode 100644
> index 0000000000000000000000000000000000000000..10107a65e958ff6495bb8c17d63d0539690f59f6
> GIT binary patch
> literal 96
> zcmZ<{aS2IaU|?Xn>E!S15v<@85#a0&6k`O6f!H7#8OTC8azL5|h^3)?DJYFj0RVOU
> B2mt^9
>
> literal 0
> HcmV?d00001
>
> diff --git a/tests/data/acpi/virt/MCFG b/tests/data/acpi/virt/MCFG
> new file mode 100644
> index 0000000000000000000000000000000000000000..e8987e1af0ec3829770bf4fe11fab02b06160dd2
> GIT binary patch
> literal 60
> scmeZuc5}C3U|?YMck*}k2v%^42ypfViZKGkKx`0=1Oyx)oc|yS05YNo0RR91
>
> literal 0
> HcmV?d00001
>
> diff --git a/tests/data/acpi/virt/SPCR b/tests/data/acpi/virt/SPCR
> new file mode 100644
> index 0000000000000000000000000000000000000000..377271a0e7817cc21a28c02123a89facad63604f
> GIT binary patch
> literal 80
> zcmWFza1IJ!U|?VpcJg=j2v%^42yhMtiZKGkKx`1r48#l^3?L>agsBLmm>C$E7#RKo
> I0Z0r60QF4^0RR91
>
> literal 0
> HcmV?d00001
>
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 11/13] tests: acpi: add simple arm/virt testcase
@ 2019-04-25 12:41 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 88+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 12:41 UTC (permalink / raw)
To: Igor Mammedov, qemu-devel
Cc: Laszlo Ersek, Michael S. Tsirkin, Gonglei, Shannon Zhao,
Wei Yang, Andrew Jones, Shameer Kolothum, Ben Warren
On 4/25/19 7:34 AM, Igor Mammedov wrote:
> adds simple arm/virt test case that starts guest with
> bios-tables-test.aarch64.iso.qcow2 boot image which
> initializes UefiTestSupport* structure in RAM once
> guest is booted.
>
> * see commit: tests: acpi: add acpi_find_rsdp_address_uefi() helper
>
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> Reviewed-by: Laszlo Ersek <lersek@redhat.com>
> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Please replace previous R-b by:
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> v3:
> * use firmware blobs directly from pc-bios directory
> * use bios-tables-test.aarch64.iso.qcow2 as test boot image
> * drop leftover qtest-uefi-images-aarch64 iMakefile rule from
> previos version (Laszlo)
> * add Makefile rule to include bios-tables-test into
> check-qtest-aarch64 target
> v2:
> * specify in test_data where board's RAM starts and RAM size
> ---
> tests/Makefile.include | 1 +
> tests/bios-tables-test.c | 17 +++++++++++++++++
> 2 files changed, 18 insertions(+)
>
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index e2432d5..983c8b1 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -267,6 +267,7 @@ check-qtest-arm-y += tests/hexloader-test$(EXESUF)
> check-qtest-aarch64-y = tests/numa-test$(EXESUF)
> check-qtest-aarch64-y += tests/boot-serial-test$(EXESUF)
> check-qtest-aarch64-y += tests/migration-test$(EXESUF)
> +check-qtest-aarch64-y += tests/bios-tables-test$(EXESUF)
>
> check-qtest-microblazeel-y += $(check-qtest-microblaze-y)
>
> diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
> index 1be55a1..f117461 100644
> --- a/tests/bios-tables-test.c
> +++ b/tests/bios-tables-test.c
> @@ -812,6 +812,21 @@ static void test_acpi_piix4_tcg_dimm_pxm(void)
> test_acpi_tcg_dimm_pxm(MACHINE_PC);
> }
>
> +static void test_acpi_virt_tcg(void)
> +{
> + test_data data = {
> + .machine = "virt",
> + .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
> + .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
> + .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
> + .ram_start = 0x40000000ULL,
> + .scan_len = 128ULL * 1024 * 1024,
> + };
> +
> + test_acpi_one("-cpu cortex-a57 ", &data);
> + free_test_data(&data);
> +}
> +
> int main(int argc, char *argv[])
> {
> const char *arch = qtest_get_arch();
> @@ -840,6 +855,8 @@ int main(int argc, char *argv[])
> qtest_add_func("acpi/q35/numamem", test_acpi_q35_tcg_numamem);
> qtest_add_func("acpi/piix4/dimmpxm", test_acpi_piix4_tcg_dimm_pxm);
> qtest_add_func("acpi/q35/dimmpxm", test_acpi_q35_tcg_dimm_pxm);
> + } else if (strcmp(arch, "aarch64") == 0) {
> + qtest_add_func("acpi/virt", test_acpi_virt_tcg);
> }
> ret = g_test_run();
> boot_sector_cleanup(disk);
>
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 11/13] tests: acpi: add simple arm/virt testcase
@ 2019-04-25 12:41 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 88+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 12:41 UTC (permalink / raw)
To: Igor Mammedov, qemu-devel
Cc: Andrew Jones, Ben Warren, Michael S. Tsirkin, Shameer Kolothum,
Shannon Zhao, Gonglei, Wei Yang, Laszlo Ersek
On 4/25/19 7:34 AM, Igor Mammedov wrote:
> adds simple arm/virt test case that starts guest with
> bios-tables-test.aarch64.iso.qcow2 boot image which
> initializes UefiTestSupport* structure in RAM once
> guest is booted.
>
> * see commit: tests: acpi: add acpi_find_rsdp_address_uefi() helper
>
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> Reviewed-by: Laszlo Ersek <lersek@redhat.com>
> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Please replace previous R-b by:
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> v3:
> * use firmware blobs directly from pc-bios directory
> * use bios-tables-test.aarch64.iso.qcow2 as test boot image
> * drop leftover qtest-uefi-images-aarch64 iMakefile rule from
> previos version (Laszlo)
> * add Makefile rule to include bios-tables-test into
> check-qtest-aarch64 target
> v2:
> * specify in test_data where board's RAM starts and RAM size
> ---
> tests/Makefile.include | 1 +
> tests/bios-tables-test.c | 17 +++++++++++++++++
> 2 files changed, 18 insertions(+)
>
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index e2432d5..983c8b1 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -267,6 +267,7 @@ check-qtest-arm-y += tests/hexloader-test$(EXESUF)
> check-qtest-aarch64-y = tests/numa-test$(EXESUF)
> check-qtest-aarch64-y += tests/boot-serial-test$(EXESUF)
> check-qtest-aarch64-y += tests/migration-test$(EXESUF)
> +check-qtest-aarch64-y += tests/bios-tables-test$(EXESUF)
>
> check-qtest-microblazeel-y += $(check-qtest-microblaze-y)
>
> diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
> index 1be55a1..f117461 100644
> --- a/tests/bios-tables-test.c
> +++ b/tests/bios-tables-test.c
> @@ -812,6 +812,21 @@ static void test_acpi_piix4_tcg_dimm_pxm(void)
> test_acpi_tcg_dimm_pxm(MACHINE_PC);
> }
>
> +static void test_acpi_virt_tcg(void)
> +{
> + test_data data = {
> + .machine = "virt",
> + .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
> + .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
> + .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
> + .ram_start = 0x40000000ULL,
> + .scan_len = 128ULL * 1024 * 1024,
> + };
> +
> + test_acpi_one("-cpu cortex-a57 ", &data);
> + free_test_data(&data);
> +}
> +
> int main(int argc, char *argv[])
> {
> const char *arch = qtest_get_arch();
> @@ -840,6 +855,8 @@ int main(int argc, char *argv[])
> qtest_add_func("acpi/q35/numamem", test_acpi_q35_tcg_numamem);
> qtest_add_func("acpi/piix4/dimmpxm", test_acpi_piix4_tcg_dimm_pxm);
> qtest_add_func("acpi/q35/dimmpxm", test_acpi_q35_tcg_dimm_pxm);
> + } else if (strcmp(arch, "aarch64") == 0) {
> + qtest_add_func("acpi/virt", test_acpi_virt_tcg);
> }
> ret = g_test_run();
> boot_sector_cleanup(disk);
>
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 09/13] tests: acpi: ignore SMBIOS tests when UEFI firmware is used
@ 2019-04-25 13:28 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-04-25 13:28 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: qemu-devel, Andrew Jones, Ben Warren, Michael S. Tsirkin,
Shameer Kolothum, Shannon Zhao, Gonglei, Wei Yang, Laszlo Ersek
On Thu, 25 Apr 2019 14:37:35 +0200
Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
> Hi Igor,
>
> On 4/25/19 7:34 AM, Igor Mammedov wrote:
> > once FW provides a pointer to SMBIOS entry point like it does for
> > RSDP it should be possible to enable this one the same way.
> >
> > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > Reviewed-by: Laszlo Ersek <lersek@redhat.com>
> > ---
> > v3:
> > - add ref to a uefi-test-tools feature req into comment (Laszlo)
> > ---
> > tests/bios-tables-test.c | 11 +++++++++--
> > 1 file changed, 9 insertions(+), 2 deletions(-)
> >
> > diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
> > index 0f24540..1be55a1 100644
> > --- a/tests/bios-tables-test.c
> > +++ b/tests/bios-tables-test.c
> > @@ -573,8 +573,15 @@ static void test_acpi_one(const char *params, test_data *data)
> > }
> > }
> >
> > - test_smbios_entry_point(data);
> > - test_smbios_structs(data);
> > + /*
> > + * TODO: make SMBIOS tests work with UEFI firmware,
> > + * Bug on uefi-test-tools to provide entry point:
> > + * https://bugs.launchpad.net/qemu/+bug/1821884
> > + */
> > + if (!use_uefi) {
> > + test_smbios_entry_point(data);
> > + test_smbios_structs(data);
> > + }
>
> Now that Laszlo resolved this bug, you can update the SMBIOS tests :)
It's not on top of priority list, I'll do it later on as time would allow.
For me it's important to get virt-arm ACPI tested so that NEMU folks
could generalize code ACPI between x86- and arm- virt machines without
testing it manually for regressions each time.
> Without this patch I get:
>
> ERROR:/home/phil/source/qemu/tests/bios-tables-test.c:460:test_smbios_entry_point:
> assertion failed (off < 0x100000): (0x00100000 < 0x00100000)
>
> And the UEFI console shows:
>
> BdsDxe: failed to load Boot0001 "UEFI Misc Device" from
> VenHw(93E34C7E-B50E-11DF-9223-2443DFD72085,00): Not Found
> FatDiskIo: Cache Page OutBound occurred!
> add-symbol-file
> /home/lacos/src/upstream/qemu/tests/uefi-test-tools/Build/UefiTestTools/DEBUG_GCC5/AARCH64/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest/DEBUG/BiosTablesTest.dll
> 0x442C3000
> Loading driver at 0x000442C2000 EntryPoint=0x000442C47AC BiosTablesTest.efi
> InstallProtocolInterface: BC62157E-3E33-4FEC-9920-2D3B36D750DF 4654EE18
> ProtectUefiImageCommon - 0x451AA140
> - 0x00000000442C2000 - 0x0000000000006000
> SetUefiImageMemoryAttributes - 0x00000000442C2000 - 0x0000000000001000
> (0x0000000000004008)
> SetUefiImageMemoryAttributes - 0x00000000442C3000 - 0x0000000000003000
> (0x0000000000020008)
> SetUefiImageMemoryAttributes - 0x00000000442C6000 - 0x0000000000002000
> (0x0000000000004008)
> BdsDxe: starting Boot0002 "UEFI Misc Device 2" from
> PciRoot(0x0)/Pci(0x2,0x0)
> BiosTablesTest: BiosTablesTest=45100000 Rsdp10=0 Rsdp20=44020000
> BiosTablesTest: Smbios21=0 Smbios30=47640000
> BiosTablesTest: press any key to exit
>
> >
> > assert(!global_qtest);
> > qtest_quit(data->qts);
> >
>
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 09/13] tests: acpi: ignore SMBIOS tests when UEFI firmware is used
@ 2019-04-25 13:28 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-04-25 13:28 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Andrew Jones, Ben Warren, Michael S. Tsirkin, qemu-devel,
Shameer Kolothum, Shannon Zhao, Gonglei, Wei Yang, Laszlo Ersek
On Thu, 25 Apr 2019 14:37:35 +0200
Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
> Hi Igor,
>
> On 4/25/19 7:34 AM, Igor Mammedov wrote:
> > once FW provides a pointer to SMBIOS entry point like it does for
> > RSDP it should be possible to enable this one the same way.
> >
> > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > Reviewed-by: Laszlo Ersek <lersek@redhat.com>
> > ---
> > v3:
> > - add ref to a uefi-test-tools feature req into comment (Laszlo)
> > ---
> > tests/bios-tables-test.c | 11 +++++++++--
> > 1 file changed, 9 insertions(+), 2 deletions(-)
> >
> > diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
> > index 0f24540..1be55a1 100644
> > --- a/tests/bios-tables-test.c
> > +++ b/tests/bios-tables-test.c
> > @@ -573,8 +573,15 @@ static void test_acpi_one(const char *params, test_data *data)
> > }
> > }
> >
> > - test_smbios_entry_point(data);
> > - test_smbios_structs(data);
> > + /*
> > + * TODO: make SMBIOS tests work with UEFI firmware,
> > + * Bug on uefi-test-tools to provide entry point:
> > + * https://bugs.launchpad.net/qemu/+bug/1821884
> > + */
> > + if (!use_uefi) {
> > + test_smbios_entry_point(data);
> > + test_smbios_structs(data);
> > + }
>
> Now that Laszlo resolved this bug, you can update the SMBIOS tests :)
It's not on top of priority list, I'll do it later on as time would allow.
For me it's important to get virt-arm ACPI tested so that NEMU folks
could generalize code ACPI between x86- and arm- virt machines without
testing it manually for regressions each time.
> Without this patch I get:
>
> ERROR:/home/phil/source/qemu/tests/bios-tables-test.c:460:test_smbios_entry_point:
> assertion failed (off < 0x100000): (0x00100000 < 0x00100000)
>
> And the UEFI console shows:
>
> BdsDxe: failed to load Boot0001 "UEFI Misc Device" from
> VenHw(93E34C7E-B50E-11DF-9223-2443DFD72085,00): Not Found
> FatDiskIo: Cache Page OutBound occurred!
> add-symbol-file
> /home/lacos/src/upstream/qemu/tests/uefi-test-tools/Build/UefiTestTools/DEBUG_GCC5/AARCH64/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest/DEBUG/BiosTablesTest.dll
> 0x442C3000
> Loading driver at 0x000442C2000 EntryPoint=0x000442C47AC BiosTablesTest.efi
> InstallProtocolInterface: BC62157E-3E33-4FEC-9920-2D3B36D750DF 4654EE18
> ProtectUefiImageCommon - 0x451AA140
> - 0x00000000442C2000 - 0x0000000000006000
> SetUefiImageMemoryAttributes - 0x00000000442C2000 - 0x0000000000001000
> (0x0000000000004008)
> SetUefiImageMemoryAttributes - 0x00000000442C3000 - 0x0000000000003000
> (0x0000000000020008)
> SetUefiImageMemoryAttributes - 0x00000000442C6000 - 0x0000000000002000
> (0x0000000000004008)
> BdsDxe: starting Boot0002 "UEFI Misc Device 2" from
> PciRoot(0x0)/Pci(0x2,0x0)
> BiosTablesTest: BiosTablesTest=45100000 Rsdp10=0 Rsdp20=44020000
> BiosTablesTest: Smbios21=0 Smbios30=47640000
> BiosTablesTest: press any key to exit
>
> >
> > assert(!global_qtest);
> > qtest_quit(data->qts);
> >
>
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 11/13] tests: acpi: add simple arm/virt testcase
@ 2019-04-25 13:31 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-04-25 13:31 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: qemu-devel, Andrew Jones, Ben Warren, Michael S. Tsirkin,
Shameer Kolothum, Shannon Zhao, Gonglei, Wei Yang, Laszlo Ersek
On Thu, 25 Apr 2019 14:41:28 +0200
Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
> On 4/25/19 7:34 AM, Igor Mammedov wrote:
> > adds simple arm/virt test case that starts guest with
> > bios-tables-test.aarch64.iso.qcow2 boot image which
> > initializes UefiTestSupport* structure in RAM once
> > guest is booted.
> >
> > * see commit: tests: acpi: add acpi_find_rsdp_address_uefi() helper
> >
> > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > Reviewed-by: Laszlo Ersek <lersek@redhat.com>
>
> > Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> Please replace previous R-b by:
done
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>
> > ---
> > v3:
> > * use firmware blobs directly from pc-bios directory
> > * use bios-tables-test.aarch64.iso.qcow2 as test boot image
> > * drop leftover qtest-uefi-images-aarch64 iMakefile rule from
> > previos version (Laszlo)
> > * add Makefile rule to include bios-tables-test into
> > check-qtest-aarch64 target
> > v2:
> > * specify in test_data where board's RAM starts and RAM size
> > ---
> > tests/Makefile.include | 1 +
> > tests/bios-tables-test.c | 17 +++++++++++++++++
> > 2 files changed, 18 insertions(+)
> >
> > diff --git a/tests/Makefile.include b/tests/Makefile.include
> > index e2432d5..983c8b1 100644
> > --- a/tests/Makefile.include
> > +++ b/tests/Makefile.include
> > @@ -267,6 +267,7 @@ check-qtest-arm-y += tests/hexloader-test$(EXESUF)
> > check-qtest-aarch64-y = tests/numa-test$(EXESUF)
> > check-qtest-aarch64-y += tests/boot-serial-test$(EXESUF)
> > check-qtest-aarch64-y += tests/migration-test$(EXESUF)
> > +check-qtest-aarch64-y += tests/bios-tables-test$(EXESUF)
> >
> > check-qtest-microblazeel-y += $(check-qtest-microblaze-y)
> >
> > diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
> > index 1be55a1..f117461 100644
> > --- a/tests/bios-tables-test.c
> > +++ b/tests/bios-tables-test.c
> > @@ -812,6 +812,21 @@ static void test_acpi_piix4_tcg_dimm_pxm(void)
> > test_acpi_tcg_dimm_pxm(MACHINE_PC);
> > }
> >
> > +static void test_acpi_virt_tcg(void)
> > +{
> > + test_data data = {
> > + .machine = "virt",
> > + .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
> > + .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
> > + .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
> > + .ram_start = 0x40000000ULL,
> > + .scan_len = 128ULL * 1024 * 1024,
> > + };
> > +
> > + test_acpi_one("-cpu cortex-a57 ", &data);
> > + free_test_data(&data);
> > +}
> > +
> > int main(int argc, char *argv[])
> > {
> > const char *arch = qtest_get_arch();
> > @@ -840,6 +855,8 @@ int main(int argc, char *argv[])
> > qtest_add_func("acpi/q35/numamem", test_acpi_q35_tcg_numamem);
> > qtest_add_func("acpi/piix4/dimmpxm", test_acpi_piix4_tcg_dimm_pxm);
> > qtest_add_func("acpi/q35/dimmpxm", test_acpi_q35_tcg_dimm_pxm);
> > + } else if (strcmp(arch, "aarch64") == 0) {
> > + qtest_add_func("acpi/virt", test_acpi_virt_tcg);
> > }
> > ret = g_test_run();
> > boot_sector_cleanup(disk);
> >
>
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 11/13] tests: acpi: add simple arm/virt testcase
@ 2019-04-25 13:31 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-04-25 13:31 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Andrew Jones, Ben Warren, Michael S. Tsirkin, qemu-devel,
Shameer Kolothum, Shannon Zhao, Gonglei, Wei Yang, Laszlo Ersek
On Thu, 25 Apr 2019 14:41:28 +0200
Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
> On 4/25/19 7:34 AM, Igor Mammedov wrote:
> > adds simple arm/virt test case that starts guest with
> > bios-tables-test.aarch64.iso.qcow2 boot image which
> > initializes UefiTestSupport* structure in RAM once
> > guest is booted.
> >
> > * see commit: tests: acpi: add acpi_find_rsdp_address_uefi() helper
> >
> > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > Reviewed-by: Laszlo Ersek <lersek@redhat.com>
>
> > Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> Please replace previous R-b by:
done
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>
> > ---
> > v3:
> > * use firmware blobs directly from pc-bios directory
> > * use bios-tables-test.aarch64.iso.qcow2 as test boot image
> > * drop leftover qtest-uefi-images-aarch64 iMakefile rule from
> > previos version (Laszlo)
> > * add Makefile rule to include bios-tables-test into
> > check-qtest-aarch64 target
> > v2:
> > * specify in test_data where board's RAM starts and RAM size
> > ---
> > tests/Makefile.include | 1 +
> > tests/bios-tables-test.c | 17 +++++++++++++++++
> > 2 files changed, 18 insertions(+)
> >
> > diff --git a/tests/Makefile.include b/tests/Makefile.include
> > index e2432d5..983c8b1 100644
> > --- a/tests/Makefile.include
> > +++ b/tests/Makefile.include
> > @@ -267,6 +267,7 @@ check-qtest-arm-y += tests/hexloader-test$(EXESUF)
> > check-qtest-aarch64-y = tests/numa-test$(EXESUF)
> > check-qtest-aarch64-y += tests/boot-serial-test$(EXESUF)
> > check-qtest-aarch64-y += tests/migration-test$(EXESUF)
> > +check-qtest-aarch64-y += tests/bios-tables-test$(EXESUF)
> >
> > check-qtest-microblazeel-y += $(check-qtest-microblaze-y)
> >
> > diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
> > index 1be55a1..f117461 100644
> > --- a/tests/bios-tables-test.c
> > +++ b/tests/bios-tables-test.c
> > @@ -812,6 +812,21 @@ static void test_acpi_piix4_tcg_dimm_pxm(void)
> > test_acpi_tcg_dimm_pxm(MACHINE_PC);
> > }
> >
> > +static void test_acpi_virt_tcg(void)
> > +{
> > + test_data data = {
> > + .machine = "virt",
> > + .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
> > + .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
> > + .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
> > + .ram_start = 0x40000000ULL,
> > + .scan_len = 128ULL * 1024 * 1024,
> > + };
> > +
> > + test_acpi_one("-cpu cortex-a57 ", &data);
> > + free_test_data(&data);
> > +}
> > +
> > int main(int argc, char *argv[])
> > {
> > const char *arch = qtest_get_arch();
> > @@ -840,6 +855,8 @@ int main(int argc, char *argv[])
> > qtest_add_func("acpi/q35/numamem", test_acpi_q35_tcg_numamem);
> > qtest_add_func("acpi/piix4/dimmpxm", test_acpi_piix4_tcg_dimm_pxm);
> > qtest_add_func("acpi/q35/dimmpxm", test_acpi_q35_tcg_dimm_pxm);
> > + } else if (strcmp(arch, "aarch64") == 0) {
> > + qtest_add_func("acpi/virt", test_acpi_virt_tcg);
> > }
> > ret = g_test_run();
> > boot_sector_cleanup(disk);
> >
>
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 11/13] tests: acpi: add simple arm/virt testcase
@ 2019-04-25 16:51 ` x00249684
0 siblings, 0 replies; 88+ messages in thread
From: x00249684 @ 2019-04-25 16:51 UTC (permalink / raw)
To: imammedo, qemu-devel; +Cc: xuwei5, shameerali.kolothum.thodi, linuxarm
Hi Igor,
+static void test_acpi_virt_tcg(void)
+{
+ test_data data = {
+ .machine = "virt",
+ .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
+ .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
+ .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
+ .ram_start = 0x40000000ULL,
+ .scan_len = 128ULL * 1024 * 1024,
+ };
+
+ test_acpi_one("-cpu cortex-a57 ", &data);
Replaced the cortex-a57 with host and succesfully tested on the hisilicon arm64
D05 board. Otherwise it failed with "kvm_init_vcpu failed: Invalid argument".
Is it possilbe to set the cpu type like numa-test.c?
Thanks!
Best Regards,
Wei
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 11/13] tests: acpi: add simple arm/virt testcase
@ 2019-04-25 16:51 ` x00249684
0 siblings, 0 replies; 88+ messages in thread
From: x00249684 @ 2019-04-25 16:51 UTC (permalink / raw)
To: imammedo, qemu-devel; +Cc: shameerali.kolothum.thodi, xuwei5, linuxarm
Hi Igor,
+static void test_acpi_virt_tcg(void)
+{
+ test_data data = {
+ .machine = "virt",
+ .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
+ .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
+ .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
+ .ram_start = 0x40000000ULL,
+ .scan_len = 128ULL * 1024 * 1024,
+ };
+
+ test_acpi_one("-cpu cortex-a57 ", &data);
Replaced the cortex-a57 with host and succesfully tested on the hisilicon arm64
D05 board. Otherwise it failed with "kvm_init_vcpu failed: Invalid argument".
Is it possilbe to set the cpu type like numa-test.c?
Thanks!
Best Regards,
Wei
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 11/13] tests: acpi: add simple arm/virt testcase
@ 2019-04-26 11:54 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-04-26 11:54 UTC (permalink / raw)
To: x00249684
Cc: qemu-devel, shameerali.kolothum.thodi, linuxarm, Andrew Jones,
Peter Maydell, mst
On Fri, 26 Apr 2019 00:51:56 +0800
x00249684 <xuwei5@huawei.com> wrote:
> Hi Igor,
>
> +static void test_acpi_virt_tcg(void)
> +{
> + test_data data = {
> + .machine = "virt",
> + .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
> + .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
> + .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
> + .ram_start = 0x40000000ULL,
> + .scan_len = 128ULL * 1024 * 1024,
> + };
> +
> + test_acpi_one("-cpu cortex-a57 ", &data);
>
> Replaced the cortex-a57 with host and succesfully tested on the hisilicon arm64
> D05 board. Otherwise it failed with "kvm_init_vcpu failed: Invalid argument".
> Is it possilbe to set the cpu type like numa-test.c?
I think it works with numa-test because it uses TCG only but in case of bios-tables-test
it uses accel="kvm:tcg" to leverage KVM capabilities whenever possible to speed up test.
Now back to our ARM test case, uefi requirement is to use 64bit CPU (hence it was cortex-a57)
however unlike x86 it obviously breaks since KVM accelerator on ARM host is used
and it doesn't work with anything other than 'host' cpu model.
I think we still want to use KVM whenever possible, but problem lies in that
user (testcase) doesn't have an idea if KVM accelerator is available and host is 64 CPU.
to sum up we need to support 2 modes:
1. host is 64 ARM, use kvm with -cpu host
2. all other cases use tcg with -cpu cortex-a57
I can hack to probe if /dev/kvm is accessible and host is 64 bit and use #1
otherwise fallback to #2
or as quick fix do only #2 initially and think about a better solution to #1
Is there any other suggestions/opinions how to approach issue/proceed.
PS:
we probably would like to reuse this not only for acpi tests but also for other
arm/virt test cases that involve running guest code.
> Thanks!
>
> Best Regards,
> Wei
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 11/13] tests: acpi: add simple arm/virt testcase
@ 2019-04-26 11:54 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-04-26 11:54 UTC (permalink / raw)
To: x00249684
Cc: Peter Maydell, Andrew Jones, mst, qemu-devel,
shameerali.kolothum.thodi, linuxarm
On Fri, 26 Apr 2019 00:51:56 +0800
x00249684 <xuwei5@huawei.com> wrote:
> Hi Igor,
>
> +static void test_acpi_virt_tcg(void)
> +{
> + test_data data = {
> + .machine = "virt",
> + .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
> + .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
> + .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
> + .ram_start = 0x40000000ULL,
> + .scan_len = 128ULL * 1024 * 1024,
> + };
> +
> + test_acpi_one("-cpu cortex-a57 ", &data);
>
> Replaced the cortex-a57 with host and succesfully tested on the hisilicon arm64
> D05 board. Otherwise it failed with "kvm_init_vcpu failed: Invalid argument".
> Is it possilbe to set the cpu type like numa-test.c?
I think it works with numa-test because it uses TCG only but in case of bios-tables-test
it uses accel="kvm:tcg" to leverage KVM capabilities whenever possible to speed up test.
Now back to our ARM test case, uefi requirement is to use 64bit CPU (hence it was cortex-a57)
however unlike x86 it obviously breaks since KVM accelerator on ARM host is used
and it doesn't work with anything other than 'host' cpu model.
I think we still want to use KVM whenever possible, but problem lies in that
user (testcase) doesn't have an idea if KVM accelerator is available and host is 64 CPU.
to sum up we need to support 2 modes:
1. host is 64 ARM, use kvm with -cpu host
2. all other cases use tcg with -cpu cortex-a57
I can hack to probe if /dev/kvm is accessible and host is 64 bit and use #1
otherwise fallback to #2
or as quick fix do only #2 initially and think about a better solution to #1
Is there any other suggestions/opinions how to approach issue/proceed.
PS:
we probably would like to reuse this not only for acpi tests but also for other
arm/virt test cases that involve running guest code.
> Thanks!
>
> Best Regards,
> Wei
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 11/13] tests: acpi: add simple arm/virt testcase
@ 2019-04-26 16:28 ` Wei Xu
0 siblings, 0 replies; 88+ messages in thread
From: Wei Xu @ 2019-04-26 16:28 UTC (permalink / raw)
To: Igor Mammedov, x00249684
Cc: qemu-devel, shameerali.kolothum.thodi, linuxarm, Andrew Jones,
Peter Maydell, mst
Hi Igor,
On 4/26/2019 12:54 PM, Igor Mammedov wrote:
> On Fri, 26 Apr 2019 00:51:56 +0800
> x00249684 <xuwei5@huawei.com> wrote:
>
>> Hi Igor,
>>
>> +static void test_acpi_virt_tcg(void)
>> +{
>> + test_data data = {
>> + .machine = "virt",
>> + .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
>> + .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
>> + .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
>> + .ram_start = 0x40000000ULL,
>> + .scan_len = 128ULL * 1024 * 1024,
>> + };
>> +
>> + test_acpi_one("-cpu cortex-a57 ", &data);
>>
>> Replaced the cortex-a57 with host and succesfully tested on the hisilicon arm64
>> D05 board. Otherwise it failed with "kvm_init_vcpu failed: Invalid argument".
>> Is it possilbe to set the cpu type like numa-test.c?
>
> I think it works with numa-test because it uses TCG only but in case of bios-tables-test
> it uses accel="kvm:tcg" to leverage KVM capabilities whenever possible to speed up test.
>
> Now back to our ARM test case, uefi requirement is to use 64bit CPU (hence it was cortex-a57)
> however unlike x86 it obviously breaks since KVM accelerator on ARM host is used
> and it doesn't work with anything other than 'host' cpu model.
>
> I think we still want to use KVM whenever possible, but problem lies in that
> user (testcase) doesn't have an idea if KVM accelerator is available and host is 64 CPU.
>
> to sum up we need to support 2 modes:
> 1. host is 64 ARM, use kvm with -cpu host
> 2. all other cases use tcg with -cpu cortex-a57
>
> I can hack to probe if /dev/kvm is accessible and host is 64 bit and use #1
> otherwise fallback to #2
> or as quick fix do only #2 initially and think about a better solution to #1
Thanks!
Fine to me.
>
> Is there any other suggestions/opinions how to approach issue/proceed.
To check the host cpu architecture is ARM or not, maybe we can check the value
of "CPU implementer" is 0x41 or not from the /proc/cpuinfo.
Best Regards,
Wei
>
> PS:
> we probably would like to reuse this not only for acpi tests but also for other
> arm/virt test cases that involve running guest code.
>
>> Thanks!
>>
>> Best Regards,
>> Wei
>
>
> .
>
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 11/13] tests: acpi: add simple arm/virt testcase
@ 2019-04-26 16:28 ` Wei Xu
0 siblings, 0 replies; 88+ messages in thread
From: Wei Xu @ 2019-04-26 16:28 UTC (permalink / raw)
To: Igor Mammedov, x00249684
Cc: Peter Maydell, Andrew Jones, mst, qemu-devel,
shameerali.kolothum.thodi, linuxarm
Hi Igor,
On 4/26/2019 12:54 PM, Igor Mammedov wrote:
> On Fri, 26 Apr 2019 00:51:56 +0800
> x00249684 <xuwei5@huawei.com> wrote:
>
>> Hi Igor,
>>
>> +static void test_acpi_virt_tcg(void)
>> +{
>> + test_data data = {
>> + .machine = "virt",
>> + .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
>> + .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
>> + .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
>> + .ram_start = 0x40000000ULL,
>> + .scan_len = 128ULL * 1024 * 1024,
>> + };
>> +
>> + test_acpi_one("-cpu cortex-a57 ", &data);
>>
>> Replaced the cortex-a57 with host and succesfully tested on the hisilicon arm64
>> D05 board. Otherwise it failed with "kvm_init_vcpu failed: Invalid argument".
>> Is it possilbe to set the cpu type like numa-test.c?
>
> I think it works with numa-test because it uses TCG only but in case of bios-tables-test
> it uses accel="kvm:tcg" to leverage KVM capabilities whenever possible to speed up test.
>
> Now back to our ARM test case, uefi requirement is to use 64bit CPU (hence it was cortex-a57)
> however unlike x86 it obviously breaks since KVM accelerator on ARM host is used
> and it doesn't work with anything other than 'host' cpu model.
>
> I think we still want to use KVM whenever possible, but problem lies in that
> user (testcase) doesn't have an idea if KVM accelerator is available and host is 64 CPU.
>
> to sum up we need to support 2 modes:
> 1. host is 64 ARM, use kvm with -cpu host
> 2. all other cases use tcg with -cpu cortex-a57
>
> I can hack to probe if /dev/kvm is accessible and host is 64 bit and use #1
> otherwise fallback to #2
> or as quick fix do only #2 initially and think about a better solution to #1
Thanks!
Fine to me.
>
> Is there any other suggestions/opinions how to approach issue/proceed.
To check the host cpu architecture is ARM or not, maybe we can check the value
of "CPU implementer" is 0x41 or not from the /proc/cpuinfo.
Best Regards,
Wei
>
> PS:
> we probably would like to reuse this not only for acpi tests but also for other
> arm/virt test cases that involve running guest code.
>
>> Thanks!
>>
>> Best Regards,
>> Wei
>
>
> .
>
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 11/13] tests: acpi: add simple arm/virt testcase
@ 2019-04-26 17:11 ` Laszlo Ersek
0 siblings, 0 replies; 88+ messages in thread
From: Laszlo Ersek @ 2019-04-26 17:11 UTC (permalink / raw)
To: Igor Mammedov, qemu-devel
Cc: Michael S. Tsirkin, Gonglei, Philippe Mathieu-Daudé,
Shannon Zhao, Wei Yang, Andrew Jones, Shameer Kolothum,
Ben Warren
On 04/25/19 07:34, Igor Mammedov wrote:
> adds simple arm/virt test case that starts guest with
> bios-tables-test.aarch64.iso.qcow2 boot image which
> initializes UefiTestSupport* structure in RAM once
> guest is booted.
>
> * see commit: tests: acpi: add acpi_find_rsdp_address_uefi() helper
>
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> Reviewed-by: Laszlo Ersek <lersek@redhat.com>
> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> v3:
> * use firmware blobs directly from pc-bios directory
> * use bios-tables-test.aarch64.iso.qcow2 as test boot image
> * drop leftover qtest-uefi-images-aarch64 iMakefile rule from
> previos version (Laszlo)
> * add Makefile rule to include bios-tables-test into
> check-qtest-aarch64 target
> v2:
> * specify in test_data where board's RAM starts and RAM size
> ---
> tests/Makefile.include | 1 +
> tests/bios-tables-test.c | 17 +++++++++++++++++
> 2 files changed, 18 insertions(+)
>
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index e2432d5..983c8b1 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -267,6 +267,7 @@ check-qtest-arm-y += tests/hexloader-test$(EXESUF)
> check-qtest-aarch64-y = tests/numa-test$(EXESUF)
> check-qtest-aarch64-y += tests/boot-serial-test$(EXESUF)
> check-qtest-aarch64-y += tests/migration-test$(EXESUF)
> +check-qtest-aarch64-y += tests/bios-tables-test$(EXESUF)
>
> check-qtest-microblazeel-y += $(check-qtest-microblaze-y)
>
> diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
> index 1be55a1..f117461 100644
> --- a/tests/bios-tables-test.c
> +++ b/tests/bios-tables-test.c
> @@ -812,6 +812,21 @@ static void test_acpi_piix4_tcg_dimm_pxm(void)
> test_acpi_tcg_dimm_pxm(MACHINE_PC);
> }
>
> +static void test_acpi_virt_tcg(void)
> +{
> + test_data data = {
> + .machine = "virt",
> + .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
> + .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
> + .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
> + .ram_start = 0x40000000ULL,
> + .scan_len = 128ULL * 1024 * 1024,
> + };
> +
> + test_acpi_one("-cpu cortex-a57 ", &data);
> + free_test_data(&data);
> +}
> +
> int main(int argc, char *argv[])
> {
> const char *arch = qtest_get_arch();
> @@ -840,6 +855,8 @@ int main(int argc, char *argv[])
> qtest_add_func("acpi/q35/numamem", test_acpi_q35_tcg_numamem);
> qtest_add_func("acpi/piix4/dimmpxm", test_acpi_piix4_tcg_dimm_pxm);
> qtest_add_func("acpi/q35/dimmpxm", test_acpi_q35_tcg_dimm_pxm);
> + } else if (strcmp(arch, "aarch64") == 0) {
> + qtest_add_func("acpi/virt", test_acpi_virt_tcg);
> }
> ret = g_test_run();
> boot_sector_cleanup(disk);
>
Looks good, my R-b stands.
(Please let me know if you want me to look at other patches in the
series... struggling again with email bankruptcy...)
Thanks!
Laszlo
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 11/13] tests: acpi: add simple arm/virt testcase
@ 2019-04-26 17:11 ` Laszlo Ersek
0 siblings, 0 replies; 88+ messages in thread
From: Laszlo Ersek @ 2019-04-26 17:11 UTC (permalink / raw)
To: Igor Mammedov, qemu-devel
Cc: Andrew Jones, Ben Warren, Michael S. Tsirkin, Shameer Kolothum,
Shannon Zhao, Gonglei, Wei Yang, Philippe Mathieu-Daudé
On 04/25/19 07:34, Igor Mammedov wrote:
> adds simple arm/virt test case that starts guest with
> bios-tables-test.aarch64.iso.qcow2 boot image which
> initializes UefiTestSupport* structure in RAM once
> guest is booted.
>
> * see commit: tests: acpi: add acpi_find_rsdp_address_uefi() helper
>
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> Reviewed-by: Laszlo Ersek <lersek@redhat.com>
> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> v3:
> * use firmware blobs directly from pc-bios directory
> * use bios-tables-test.aarch64.iso.qcow2 as test boot image
> * drop leftover qtest-uefi-images-aarch64 iMakefile rule from
> previos version (Laszlo)
> * add Makefile rule to include bios-tables-test into
> check-qtest-aarch64 target
> v2:
> * specify in test_data where board's RAM starts and RAM size
> ---
> tests/Makefile.include | 1 +
> tests/bios-tables-test.c | 17 +++++++++++++++++
> 2 files changed, 18 insertions(+)
>
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index e2432d5..983c8b1 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -267,6 +267,7 @@ check-qtest-arm-y += tests/hexloader-test$(EXESUF)
> check-qtest-aarch64-y = tests/numa-test$(EXESUF)
> check-qtest-aarch64-y += tests/boot-serial-test$(EXESUF)
> check-qtest-aarch64-y += tests/migration-test$(EXESUF)
> +check-qtest-aarch64-y += tests/bios-tables-test$(EXESUF)
>
> check-qtest-microblazeel-y += $(check-qtest-microblaze-y)
>
> diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
> index 1be55a1..f117461 100644
> --- a/tests/bios-tables-test.c
> +++ b/tests/bios-tables-test.c
> @@ -812,6 +812,21 @@ static void test_acpi_piix4_tcg_dimm_pxm(void)
> test_acpi_tcg_dimm_pxm(MACHINE_PC);
> }
>
> +static void test_acpi_virt_tcg(void)
> +{
> + test_data data = {
> + .machine = "virt",
> + .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
> + .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
> + .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
> + .ram_start = 0x40000000ULL,
> + .scan_len = 128ULL * 1024 * 1024,
> + };
> +
> + test_acpi_one("-cpu cortex-a57 ", &data);
> + free_test_data(&data);
> +}
> +
> int main(int argc, char *argv[])
> {
> const char *arch = qtest_get_arch();
> @@ -840,6 +855,8 @@ int main(int argc, char *argv[])
> qtest_add_func("acpi/q35/numamem", test_acpi_q35_tcg_numamem);
> qtest_add_func("acpi/piix4/dimmpxm", test_acpi_piix4_tcg_dimm_pxm);
> qtest_add_func("acpi/q35/dimmpxm", test_acpi_q35_tcg_dimm_pxm);
> + } else if (strcmp(arch, "aarch64") == 0) {
> + qtest_add_func("acpi/virt", test_acpi_virt_tcg);
> }
> ret = g_test_run();
> boot_sector_cleanup(disk);
>
Looks good, my R-b stands.
(Please let me know if you want me to look at other patches in the
series... struggling again with email bankruptcy...)
Thanks!
Laszlo
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 11/13] tests: acpi: add simple arm/virt testcase
@ 2019-05-02 14:24 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-05-02 14:24 UTC (permalink / raw)
To: Wei Xu
Cc: x00249684, qemu-devel, shameerali.kolothum.thodi, linuxarm,
Andrew Jones, Peter Maydell, mst
On Fri, 26 Apr 2019 17:28:10 +0100
Wei Xu <xuwei5@hisilicon.com> wrote:
> Hi Igor,
>
> On 4/26/2019 12:54 PM, Igor Mammedov wrote:
> > On Fri, 26 Apr 2019 00:51:56 +0800
> > x00249684 <xuwei5@huawei.com> wrote:
> >
> >> Hi Igor,
> >>
> >> +static void test_acpi_virt_tcg(void)
> >> +{
> >> + test_data data = {
> >> + .machine = "virt",
> >> + .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
> >> + .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
> >> + .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
> >> + .ram_start = 0x40000000ULL,
> >> + .scan_len = 128ULL * 1024 * 1024,
> >> + };
> >> +
> >> + test_acpi_one("-cpu cortex-a57 ", &data);
> >>
> >> Replaced the cortex-a57 with host and succesfully tested on the hisilicon arm64
> >> D05 board. Otherwise it failed with "kvm_init_vcpu failed: Invalid argument".
> >> Is it possilbe to set the cpu type like numa-test.c?
> >
> > I think it works with numa-test because it uses TCG only but in case of bios-tables-test
> > it uses accel="kvm:tcg" to leverage KVM capabilities whenever possible to speed up test.
> >
> > Now back to our ARM test case, uefi requirement is to use 64bit CPU (hence it was cortex-a57)
> > however unlike x86 it obviously breaks since KVM accelerator on ARM host is used
> > and it doesn't work with anything other than 'host' cpu model.
> >
> > I think we still want to use KVM whenever possible, but problem lies in that
> > user (testcase) doesn't have an idea if KVM accelerator is available and host is 64 CPU.
> >
> > to sum up we need to support 2 modes:
> > 1. host is 64 ARM, use kvm with -cpu host
> > 2. all other cases use tcg with -cpu cortex-a57
> >
> > I can hack to probe if /dev/kvm is accessible and host is 64 bit and use #1
> > otherwise fallback to #2
> > or as quick fix do only #2 initially and think about a better solution to #1
>
> Thanks!
> Fine to me.
>
> >
> > Is there any other suggestions/opinions how to approach issue/proceed.
>
> To check the host cpu architecture is ARM or not, maybe we can check the value
> of "CPU implementer" is 0x41 or not from the /proc/cpuinfo.
it turned out it's more complicated.
we also should pick a correct GIC depending on host's CPU and that
changes ACPI tables, so it will worn on some hosts and fail on other.
I'll add a patch to enable test case to pick accelerator and force TCG
for ARM tests for now.
>
> Best Regards,
> Wei
>
> >
> > PS:
> > we probably would like to reuse this not only for acpi tests but also for other
> > arm/virt test cases that involve running guest code.
> >
> >> Thanks!
> >>
> >> Best Regards,
> >> Wei
> >
> >
> > .
> >
>
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 11/13] tests: acpi: add simple arm/virt testcase
@ 2019-05-02 14:24 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-05-02 14:24 UTC (permalink / raw)
To: Wei Xu
Cc: Peter Maydell, Andrew Jones, mst, linuxarm,
shameerali.kolothum.thodi, qemu-devel, x00249684
On Fri, 26 Apr 2019 17:28:10 +0100
Wei Xu <xuwei5@hisilicon.com> wrote:
> Hi Igor,
>
> On 4/26/2019 12:54 PM, Igor Mammedov wrote:
> > On Fri, 26 Apr 2019 00:51:56 +0800
> > x00249684 <xuwei5@huawei.com> wrote:
> >
> >> Hi Igor,
> >>
> >> +static void test_acpi_virt_tcg(void)
> >> +{
> >> + test_data data = {
> >> + .machine = "virt",
> >> + .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
> >> + .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
> >> + .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
> >> + .ram_start = 0x40000000ULL,
> >> + .scan_len = 128ULL * 1024 * 1024,
> >> + };
> >> +
> >> + test_acpi_one("-cpu cortex-a57 ", &data);
> >>
> >> Replaced the cortex-a57 with host and succesfully tested on the hisilicon arm64
> >> D05 board. Otherwise it failed with "kvm_init_vcpu failed: Invalid argument".
> >> Is it possilbe to set the cpu type like numa-test.c?
> >
> > I think it works with numa-test because it uses TCG only but in case of bios-tables-test
> > it uses accel="kvm:tcg" to leverage KVM capabilities whenever possible to speed up test.
> >
> > Now back to our ARM test case, uefi requirement is to use 64bit CPU (hence it was cortex-a57)
> > however unlike x86 it obviously breaks since KVM accelerator on ARM host is used
> > and it doesn't work with anything other than 'host' cpu model.
> >
> > I think we still want to use KVM whenever possible, but problem lies in that
> > user (testcase) doesn't have an idea if KVM accelerator is available and host is 64 CPU.
> >
> > to sum up we need to support 2 modes:
> > 1. host is 64 ARM, use kvm with -cpu host
> > 2. all other cases use tcg with -cpu cortex-a57
> >
> > I can hack to probe if /dev/kvm is accessible and host is 64 bit and use #1
> > otherwise fallback to #2
> > or as quick fix do only #2 initially and think about a better solution to #1
>
> Thanks!
> Fine to me.
>
> >
> > Is there any other suggestions/opinions how to approach issue/proceed.
>
> To check the host cpu architecture is ARM or not, maybe we can check the value
> of "CPU implementer" is 0x41 or not from the /proc/cpuinfo.
it turned out it's more complicated.
we also should pick a correct GIC depending on host's CPU and that
changes ACPI tables, so it will worn on some hosts and fail on other.
I'll add a patch to enable test case to pick accelerator and force TCG
for ARM tests for now.
>
> Best Regards,
> Wei
>
> >
> > PS:
> > we probably would like to reuse this not only for acpi tests but also for other
> > arm/virt test cases that involve running guest code.
> >
> >> Thanks!
> >>
> >> Best Regards,
> >> Wei
> >
> >
> > .
> >
>
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 11/13] tests: acpi: add simple arm/virt testcase
@ 2019-05-02 14:27 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-05-02 14:27 UTC (permalink / raw)
To: Laszlo Ersek
Cc: qemu-devel, Andrew Jones, Ben Warren, Michael S. Tsirkin,
Shameer Kolothum, Shannon Zhao, Gonglei, Wei Yang,
Philippe Mathieu-Daudé
On Fri, 26 Apr 2019 19:11:50 +0200
Laszlo Ersek <lersek@redhat.com> wrote:
> On 04/25/19 07:34, Igor Mammedov wrote:
> > adds simple arm/virt test case that starts guest with
> > bios-tables-test.aarch64.iso.qcow2 boot image which
> > initializes UefiTestSupport* structure in RAM once
> > guest is booted.
> >
> > * see commit: tests: acpi: add acpi_find_rsdp_address_uefi() helper
> >
> > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > Reviewed-by: Laszlo Ersek <lersek@redhat.com>
> > Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> > ---
> > v3:
> > * use firmware blobs directly from pc-bios directory
> > * use bios-tables-test.aarch64.iso.qcow2 as test boot image
> > * drop leftover qtest-uefi-images-aarch64 iMakefile rule from
> > previos version (Laszlo)
> > * add Makefile rule to include bios-tables-test into
> > check-qtest-aarch64 target
> > v2:
> > * specify in test_data where board's RAM starts and RAM size
> > ---
> > tests/Makefile.include | 1 +
> > tests/bios-tables-test.c | 17 +++++++++++++++++
> > 2 files changed, 18 insertions(+)
> >
> > diff --git a/tests/Makefile.include b/tests/Makefile.include
> > index e2432d5..983c8b1 100644
> > --- a/tests/Makefile.include
> > +++ b/tests/Makefile.include
> > @@ -267,6 +267,7 @@ check-qtest-arm-y += tests/hexloader-test$(EXESUF)
> > check-qtest-aarch64-y = tests/numa-test$(EXESUF)
> > check-qtest-aarch64-y += tests/boot-serial-test$(EXESUF)
> > check-qtest-aarch64-y += tests/migration-test$(EXESUF)
> > +check-qtest-aarch64-y += tests/bios-tables-test$(EXESUF)
> >
> > check-qtest-microblazeel-y += $(check-qtest-microblaze-y)
> >
> > diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
> > index 1be55a1..f117461 100644
> > --- a/tests/bios-tables-test.c
> > +++ b/tests/bios-tables-test.c
> > @@ -812,6 +812,21 @@ static void test_acpi_piix4_tcg_dimm_pxm(void)
> > test_acpi_tcg_dimm_pxm(MACHINE_PC);
> > }
> >
> > +static void test_acpi_virt_tcg(void)
> > +{
> > + test_data data = {
> > + .machine = "virt",
> > + .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
> > + .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
> > + .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
> > + .ram_start = 0x40000000ULL,
> > + .scan_len = 128ULL * 1024 * 1024,
> > + };
> > +
> > + test_acpi_one("-cpu cortex-a57 ", &data);
> > + free_test_data(&data);
> > +}
> > +
> > int main(int argc, char *argv[])
> > {
> > const char *arch = qtest_get_arch();
> > @@ -840,6 +855,8 @@ int main(int argc, char *argv[])
> > qtest_add_func("acpi/q35/numamem", test_acpi_q35_tcg_numamem);
> > qtest_add_func("acpi/piix4/dimmpxm", test_acpi_piix4_tcg_dimm_pxm);
> > qtest_add_func("acpi/q35/dimmpxm", test_acpi_q35_tcg_dimm_pxm);
> > + } else if (strcmp(arch, "aarch64") == 0) {
> > + qtest_add_func("acpi/virt", test_acpi_virt_tcg);
> > }
> > ret = g_test_run();
> > boot_sector_cleanup(disk);
> >
>
> Looks good, my R-b stands.
>
> (Please let me know if you want me to look at other patches in the
> series... struggling again with email bankruptcy...)
>
> Thanks!
> Laszlo
>
on respin there will be a new patch added
[PATCH v4 11/15] tests: acpi: allow to override default accelerator
and change to this patch will be forcing TCG accelerator:
diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
index 6cb8b16..385e1ab 100644
--- a/tests/bios-tables-test.c
+++ b/tests/bios-tables-test.c
@@ -817,7 +817,6 @@ static void test_acpi_virt_tcg(void)
{
test_data data = {
.machine = "virt",
+ .accel = "tcg",
.uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
.uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
.cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
^ permalink raw reply related [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 11/13] tests: acpi: add simple arm/virt testcase
@ 2019-05-02 14:27 ` Igor Mammedov
0 siblings, 0 replies; 88+ messages in thread
From: Igor Mammedov @ 2019-05-02 14:27 UTC (permalink / raw)
To: Laszlo Ersek
Cc: Andrew Jones, Ben Warren, Michael S. Tsirkin, qemu-devel,
Shameer Kolothum, Shannon Zhao, Gonglei, Wei Yang,
Philippe Mathieu-Daudé
On Fri, 26 Apr 2019 19:11:50 +0200
Laszlo Ersek <lersek@redhat.com> wrote:
> On 04/25/19 07:34, Igor Mammedov wrote:
> > adds simple arm/virt test case that starts guest with
> > bios-tables-test.aarch64.iso.qcow2 boot image which
> > initializes UefiTestSupport* structure in RAM once
> > guest is booted.
> >
> > * see commit: tests: acpi: add acpi_find_rsdp_address_uefi() helper
> >
> > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > Reviewed-by: Laszlo Ersek <lersek@redhat.com>
> > Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> > ---
> > v3:
> > * use firmware blobs directly from pc-bios directory
> > * use bios-tables-test.aarch64.iso.qcow2 as test boot image
> > * drop leftover qtest-uefi-images-aarch64 iMakefile rule from
> > previos version (Laszlo)
> > * add Makefile rule to include bios-tables-test into
> > check-qtest-aarch64 target
> > v2:
> > * specify in test_data where board's RAM starts and RAM size
> > ---
> > tests/Makefile.include | 1 +
> > tests/bios-tables-test.c | 17 +++++++++++++++++
> > 2 files changed, 18 insertions(+)
> >
> > diff --git a/tests/Makefile.include b/tests/Makefile.include
> > index e2432d5..983c8b1 100644
> > --- a/tests/Makefile.include
> > +++ b/tests/Makefile.include
> > @@ -267,6 +267,7 @@ check-qtest-arm-y += tests/hexloader-test$(EXESUF)
> > check-qtest-aarch64-y = tests/numa-test$(EXESUF)
> > check-qtest-aarch64-y += tests/boot-serial-test$(EXESUF)
> > check-qtest-aarch64-y += tests/migration-test$(EXESUF)
> > +check-qtest-aarch64-y += tests/bios-tables-test$(EXESUF)
> >
> > check-qtest-microblazeel-y += $(check-qtest-microblaze-y)
> >
> > diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
> > index 1be55a1..f117461 100644
> > --- a/tests/bios-tables-test.c
> > +++ b/tests/bios-tables-test.c
> > @@ -812,6 +812,21 @@ static void test_acpi_piix4_tcg_dimm_pxm(void)
> > test_acpi_tcg_dimm_pxm(MACHINE_PC);
> > }
> >
> > +static void test_acpi_virt_tcg(void)
> > +{
> > + test_data data = {
> > + .machine = "virt",
> > + .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
> > + .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
> > + .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
> > + .ram_start = 0x40000000ULL,
> > + .scan_len = 128ULL * 1024 * 1024,
> > + };
> > +
> > + test_acpi_one("-cpu cortex-a57 ", &data);
> > + free_test_data(&data);
> > +}
> > +
> > int main(int argc, char *argv[])
> > {
> > const char *arch = qtest_get_arch();
> > @@ -840,6 +855,8 @@ int main(int argc, char *argv[])
> > qtest_add_func("acpi/q35/numamem", test_acpi_q35_tcg_numamem);
> > qtest_add_func("acpi/piix4/dimmpxm", test_acpi_piix4_tcg_dimm_pxm);
> > qtest_add_func("acpi/q35/dimmpxm", test_acpi_q35_tcg_dimm_pxm);
> > + } else if (strcmp(arch, "aarch64") == 0) {
> > + qtest_add_func("acpi/virt", test_acpi_virt_tcg);
> > }
> > ret = g_test_run();
> > boot_sector_cleanup(disk);
> >
>
> Looks good, my R-b stands.
>
> (Please let me know if you want me to look at other patches in the
> series... struggling again with email bankruptcy...)
>
> Thanks!
> Laszlo
>
on respin there will be a new patch added
[PATCH v4 11/15] tests: acpi: allow to override default accelerator
and change to this patch will be forcing TCG accelerator:
diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
index 6cb8b16..385e1ab 100644
--- a/tests/bios-tables-test.c
+++ b/tests/bios-tables-test.c
@@ -817,7 +817,6 @@ static void test_acpi_virt_tcg(void)
{
test_data data = {
.machine = "virt",
+ .accel = "tcg",
.uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
.uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
.cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
^ permalink raw reply related [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 11/13] tests: acpi: add simple arm/virt testcase
@ 2019-05-02 14:30 ` Wei Xu
0 siblings, 0 replies; 88+ messages in thread
From: Wei Xu @ 2019-05-02 14:30 UTC (permalink / raw)
To: Igor Mammedov
Cc: x00249684, qemu-devel, shameerali.kolothum.thodi, linuxarm,
Andrew Jones, Peter Maydell, mst
Hi Igor,
On 5/2/2019 3:24 PM, Igor Mammedov wrote:
> On Fri, 26 Apr 2019 17:28:10 +0100
> Wei Xu <xuwei5@hisilicon.com> wrote:
>
>> Hi Igor,
>>
>> On 4/26/2019 12:54 PM, Igor Mammedov wrote:
>>> On Fri, 26 Apr 2019 00:51:56 +0800
>>> x00249684 <xuwei5@huawei.com> wrote:
>>>
>>>> Hi Igor,
>>>>
>>>> +static void test_acpi_virt_tcg(void)
>>>> +{
>>>> + test_data data = {
>>>> + .machine = "virt",
>>>> + .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
>>>> + .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
>>>> + .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
>>>> + .ram_start = 0x40000000ULL,
>>>> + .scan_len = 128ULL * 1024 * 1024,
>>>> + };
>>>> +
>>>> + test_acpi_one("-cpu cortex-a57 ", &data);
>>>>
>>>> Replaced the cortex-a57 with host and succesfully tested on the hisilicon arm64
>>>> D05 board. Otherwise it failed with "kvm_init_vcpu failed: Invalid argument".
>>>> Is it possilbe to set the cpu type like numa-test.c?
>>>
>>> I think it works with numa-test because it uses TCG only but in case of bios-tables-test
>>> it uses accel="kvm:tcg" to leverage KVM capabilities whenever possible to speed up test.
>>>
>>> Now back to our ARM test case, uefi requirement is to use 64bit CPU (hence it was cortex-a57)
>>> however unlike x86 it obviously breaks since KVM accelerator on ARM host is used
>>> and it doesn't work with anything other than 'host' cpu model.
>>>
>>> I think we still want to use KVM whenever possible, but problem lies in that
>>> user (testcase) doesn't have an idea if KVM accelerator is available and host is 64 CPU.
>>>
>>> to sum up we need to support 2 modes:
>>> 1. host is 64 ARM, use kvm with -cpu host
>>> 2. all other cases use tcg with -cpu cortex-a57
>>>
>>> I can hack to probe if /dev/kvm is accessible and host is 64 bit and use #1
>>> otherwise fallback to #2
>>> or as quick fix do only #2 initially and think about a better solution to #1
>>
>> Thanks!
>> Fine to me.
>>
>>>
>>> Is there any other suggestions/opinions how to approach issue/proceed.
>>
>> To check the host cpu architecture is ARM or not, maybe we can check the value
>> of "CPU implementer" is 0x41 or not from the /proc/cpuinfo.
>
> it turned out it's more complicated.
> we also should pick a correct GIC depending on host's CPU and that
> changes ACPI tables, so it will worn on some hosts and fail on other.
Sorry, I did not consider that case.
>
> I'll add a patch to enable test case to pick accelerator and force TCG
> for ARM tests for now.
>
Thanks!
Best Regards,
Wei
>>
>> Best Regards,
>> Wei
>>
>>>
>>> PS:
>>> we probably would like to reuse this not only for acpi tests but also for other
>>> arm/virt test cases that involve running guest code.
>>>
>>>> Thanks!
>>>>
>>>> Best Regards,
>>>> Wei
>>>
>>>
>>> .
>>>
>>
>
>
> .
>
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 11/13] tests: acpi: add simple arm/virt testcase
@ 2019-05-02 14:30 ` Wei Xu
0 siblings, 0 replies; 88+ messages in thread
From: Wei Xu @ 2019-05-02 14:30 UTC (permalink / raw)
To: Igor Mammedov
Cc: Peter Maydell, Andrew Jones, mst, linuxarm,
shameerali.kolothum.thodi, qemu-devel, x00249684
Hi Igor,
On 5/2/2019 3:24 PM, Igor Mammedov wrote:
> On Fri, 26 Apr 2019 17:28:10 +0100
> Wei Xu <xuwei5@hisilicon.com> wrote:
>
>> Hi Igor,
>>
>> On 4/26/2019 12:54 PM, Igor Mammedov wrote:
>>> On Fri, 26 Apr 2019 00:51:56 +0800
>>> x00249684 <xuwei5@huawei.com> wrote:
>>>
>>>> Hi Igor,
>>>>
>>>> +static void test_acpi_virt_tcg(void)
>>>> +{
>>>> + test_data data = {
>>>> + .machine = "virt",
>>>> + .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
>>>> + .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
>>>> + .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
>>>> + .ram_start = 0x40000000ULL,
>>>> + .scan_len = 128ULL * 1024 * 1024,
>>>> + };
>>>> +
>>>> + test_acpi_one("-cpu cortex-a57 ", &data);
>>>>
>>>> Replaced the cortex-a57 with host and succesfully tested on the hisilicon arm64
>>>> D05 board. Otherwise it failed with "kvm_init_vcpu failed: Invalid argument".
>>>> Is it possilbe to set the cpu type like numa-test.c?
>>>
>>> I think it works with numa-test because it uses TCG only but in case of bios-tables-test
>>> it uses accel="kvm:tcg" to leverage KVM capabilities whenever possible to speed up test.
>>>
>>> Now back to our ARM test case, uefi requirement is to use 64bit CPU (hence it was cortex-a57)
>>> however unlike x86 it obviously breaks since KVM accelerator on ARM host is used
>>> and it doesn't work with anything other than 'host' cpu model.
>>>
>>> I think we still want to use KVM whenever possible, but problem lies in that
>>> user (testcase) doesn't have an idea if KVM accelerator is available and host is 64 CPU.
>>>
>>> to sum up we need to support 2 modes:
>>> 1. host is 64 ARM, use kvm with -cpu host
>>> 2. all other cases use tcg with -cpu cortex-a57
>>>
>>> I can hack to probe if /dev/kvm is accessible and host is 64 bit and use #1
>>> otherwise fallback to #2
>>> or as quick fix do only #2 initially and think about a better solution to #1
>>
>> Thanks!
>> Fine to me.
>>
>>>
>>> Is there any other suggestions/opinions how to approach issue/proceed.
>>
>> To check the host cpu architecture is ARM or not, maybe we can check the value
>> of "CPU implementer" is 0x41 or not from the /proc/cpuinfo.
>
> it turned out it's more complicated.
> we also should pick a correct GIC depending on host's CPU and that
> changes ACPI tables, so it will worn on some hosts and fail on other.
Sorry, I did not consider that case.
>
> I'll add a patch to enable test case to pick accelerator and force TCG
> for ARM tests for now.
>
Thanks!
Best Regards,
Wei
>>
>> Best Regards,
>> Wei
>>
>>>
>>> PS:
>>> we probably would like to reuse this not only for acpi tests but also for other
>>> arm/virt test cases that involve running guest code.
>>>
>>>> Thanks!
>>>>
>>>> Best Regards,
>>>> Wei
>>>
>>>
>>> .
>>>
>>
>
>
> .
>
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 11/13] tests: acpi: add simple arm/virt testcase
@ 2019-05-02 14:42 ` Laszlo Ersek
0 siblings, 0 replies; 88+ messages in thread
From: Laszlo Ersek @ 2019-05-02 14:42 UTC (permalink / raw)
To: Igor Mammedov
Cc: qemu-devel, Andrew Jones, Ben Warren, Michael S. Tsirkin,
Shameer Kolothum, Shannon Zhao, Gonglei, Wei Yang,
Philippe Mathieu-Daudé
On 05/02/19 16:27, Igor Mammedov wrote:
> On Fri, 26 Apr 2019 19:11:50 +0200
> Laszlo Ersek <lersek@redhat.com> wrote:
>
>> On 04/25/19 07:34, Igor Mammedov wrote:
>>> adds simple arm/virt test case that starts guest with
>>> bios-tables-test.aarch64.iso.qcow2 boot image which
>>> initializes UefiTestSupport* structure in RAM once
>>> guest is booted.
>>>
>>> * see commit: tests: acpi: add acpi_find_rsdp_address_uefi() helper
>>>
>>> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
>>> Reviewed-by: Laszlo Ersek <lersek@redhat.com>
>>> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>>> ---
>>> v3:
>>> * use firmware blobs directly from pc-bios directory
>>> * use bios-tables-test.aarch64.iso.qcow2 as test boot image
>>> * drop leftover qtest-uefi-images-aarch64 iMakefile rule from
>>> previos version (Laszlo)
>>> * add Makefile rule to include bios-tables-test into
>>> check-qtest-aarch64 target
>>> v2:
>>> * specify in test_data where board's RAM starts and RAM size
>>> ---
>>> tests/Makefile.include | 1 +
>>> tests/bios-tables-test.c | 17 +++++++++++++++++
>>> 2 files changed, 18 insertions(+)
>>>
>>> diff --git a/tests/Makefile.include b/tests/Makefile.include
>>> index e2432d5..983c8b1 100644
>>> --- a/tests/Makefile.include
>>> +++ b/tests/Makefile.include
>>> @@ -267,6 +267,7 @@ check-qtest-arm-y += tests/hexloader-test$(EXESUF)
>>> check-qtest-aarch64-y = tests/numa-test$(EXESUF)
>>> check-qtest-aarch64-y += tests/boot-serial-test$(EXESUF)
>>> check-qtest-aarch64-y += tests/migration-test$(EXESUF)
>>> +check-qtest-aarch64-y += tests/bios-tables-test$(EXESUF)
>>>
>>> check-qtest-microblazeel-y += $(check-qtest-microblaze-y)
>>>
>>> diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
>>> index 1be55a1..f117461 100644
>>> --- a/tests/bios-tables-test.c
>>> +++ b/tests/bios-tables-test.c
>>> @@ -812,6 +812,21 @@ static void test_acpi_piix4_tcg_dimm_pxm(void)
>>> test_acpi_tcg_dimm_pxm(MACHINE_PC);
>>> }
>>>
>>> +static void test_acpi_virt_tcg(void)
>>> +{
>>> + test_data data = {
>>> + .machine = "virt",
>>> + .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
>>> + .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
>>> + .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
>>> + .ram_start = 0x40000000ULL,
>>> + .scan_len = 128ULL * 1024 * 1024,
>>> + };
>>> +
>>> + test_acpi_one("-cpu cortex-a57 ", &data);
>>> + free_test_data(&data);
>>> +}
>>> +
>>> int main(int argc, char *argv[])
>>> {
>>> const char *arch = qtest_get_arch();
>>> @@ -840,6 +855,8 @@ int main(int argc, char *argv[])
>>> qtest_add_func("acpi/q35/numamem", test_acpi_q35_tcg_numamem);
>>> qtest_add_func("acpi/piix4/dimmpxm", test_acpi_piix4_tcg_dimm_pxm);
>>> qtest_add_func("acpi/q35/dimmpxm", test_acpi_q35_tcg_dimm_pxm);
>>> + } else if (strcmp(arch, "aarch64") == 0) {
>>> + qtest_add_func("acpi/virt", test_acpi_virt_tcg);
>>> }
>>> ret = g_test_run();
>>> boot_sector_cleanup(disk);
>>>
>>
>> Looks good, my R-b stands.
>>
>> (Please let me know if you want me to look at other patches in the
>> series... struggling again with email bankruptcy...)
>>
>> Thanks!
>> Laszlo
>>
>
> on respin there will be a new patch added
>
> [PATCH v4 11/15] tests: acpi: allow to override default accelerator
>
> and change to this patch will be forcing TCG accelerator:
>
> diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
> index 6cb8b16..385e1ab 100644
> --- a/tests/bios-tables-test.c
> +++ b/tests/bios-tables-test.c
> @@ -817,7 +817,6 @@ static void test_acpi_virt_tcg(void)
> {
> test_data data = {
> .machine = "virt",
> + .accel = "tcg",
> .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
> .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
> .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
>
You can keep my R-b with that update.
Thanks!
Laszlo
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [Qemu-devel] [PATCH v3 11/13] tests: acpi: add simple arm/virt testcase
@ 2019-05-02 14:42 ` Laszlo Ersek
0 siblings, 0 replies; 88+ messages in thread
From: Laszlo Ersek @ 2019-05-02 14:42 UTC (permalink / raw)
To: Igor Mammedov
Cc: Andrew Jones, Ben Warren, Michael S. Tsirkin, qemu-devel,
Shameer Kolothum, Shannon Zhao, Gonglei, Wei Yang,
Philippe Mathieu-Daudé
On 05/02/19 16:27, Igor Mammedov wrote:
> On Fri, 26 Apr 2019 19:11:50 +0200
> Laszlo Ersek <lersek@redhat.com> wrote:
>
>> On 04/25/19 07:34, Igor Mammedov wrote:
>>> adds simple arm/virt test case that starts guest with
>>> bios-tables-test.aarch64.iso.qcow2 boot image which
>>> initializes UefiTestSupport* structure in RAM once
>>> guest is booted.
>>>
>>> * see commit: tests: acpi: add acpi_find_rsdp_address_uefi() helper
>>>
>>> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
>>> Reviewed-by: Laszlo Ersek <lersek@redhat.com>
>>> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>>> ---
>>> v3:
>>> * use firmware blobs directly from pc-bios directory
>>> * use bios-tables-test.aarch64.iso.qcow2 as test boot image
>>> * drop leftover qtest-uefi-images-aarch64 iMakefile rule from
>>> previos version (Laszlo)
>>> * add Makefile rule to include bios-tables-test into
>>> check-qtest-aarch64 target
>>> v2:
>>> * specify in test_data where board's RAM starts and RAM size
>>> ---
>>> tests/Makefile.include | 1 +
>>> tests/bios-tables-test.c | 17 +++++++++++++++++
>>> 2 files changed, 18 insertions(+)
>>>
>>> diff --git a/tests/Makefile.include b/tests/Makefile.include
>>> index e2432d5..983c8b1 100644
>>> --- a/tests/Makefile.include
>>> +++ b/tests/Makefile.include
>>> @@ -267,6 +267,7 @@ check-qtest-arm-y += tests/hexloader-test$(EXESUF)
>>> check-qtest-aarch64-y = tests/numa-test$(EXESUF)
>>> check-qtest-aarch64-y += tests/boot-serial-test$(EXESUF)
>>> check-qtest-aarch64-y += tests/migration-test$(EXESUF)
>>> +check-qtest-aarch64-y += tests/bios-tables-test$(EXESUF)
>>>
>>> check-qtest-microblazeel-y += $(check-qtest-microblaze-y)
>>>
>>> diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
>>> index 1be55a1..f117461 100644
>>> --- a/tests/bios-tables-test.c
>>> +++ b/tests/bios-tables-test.c
>>> @@ -812,6 +812,21 @@ static void test_acpi_piix4_tcg_dimm_pxm(void)
>>> test_acpi_tcg_dimm_pxm(MACHINE_PC);
>>> }
>>>
>>> +static void test_acpi_virt_tcg(void)
>>> +{
>>> + test_data data = {
>>> + .machine = "virt",
>>> + .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
>>> + .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
>>> + .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
>>> + .ram_start = 0x40000000ULL,
>>> + .scan_len = 128ULL * 1024 * 1024,
>>> + };
>>> +
>>> + test_acpi_one("-cpu cortex-a57 ", &data);
>>> + free_test_data(&data);
>>> +}
>>> +
>>> int main(int argc, char *argv[])
>>> {
>>> const char *arch = qtest_get_arch();
>>> @@ -840,6 +855,8 @@ int main(int argc, char *argv[])
>>> qtest_add_func("acpi/q35/numamem", test_acpi_q35_tcg_numamem);
>>> qtest_add_func("acpi/piix4/dimmpxm", test_acpi_piix4_tcg_dimm_pxm);
>>> qtest_add_func("acpi/q35/dimmpxm", test_acpi_q35_tcg_dimm_pxm);
>>> + } else if (strcmp(arch, "aarch64") == 0) {
>>> + qtest_add_func("acpi/virt", test_acpi_virt_tcg);
>>> }
>>> ret = g_test_run();
>>> boot_sector_cleanup(disk);
>>>
>>
>> Looks good, my R-b stands.
>>
>> (Please let me know if you want me to look at other patches in the
>> series... struggling again with email bankruptcy...)
>>
>> Thanks!
>> Laszlo
>>
>
> on respin there will be a new patch added
>
> [PATCH v4 11/15] tests: acpi: allow to override default accelerator
>
> and change to this patch will be forcing TCG accelerator:
>
> diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
> index 6cb8b16..385e1ab 100644
> --- a/tests/bios-tables-test.c
> +++ b/tests/bios-tables-test.c
> @@ -817,7 +817,6 @@ static void test_acpi_virt_tcg(void)
> {
> test_data data = {
> .machine = "virt",
> + .accel = "tcg",
> .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
> .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
> .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
>
You can keep my R-b with that update.
Thanks!
Laszlo
^ permalink raw reply [flat|nested] 88+ messages in thread
end of thread, other threads:[~2019-05-02 14:50 UTC | newest]
Thread overview: 88+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-25 5:34 [Qemu-devel] [PATCH v3 00/13] tests: acpi: add UEFI (ARM) testing support Igor Mammedov
2019-04-25 5:34 ` Igor Mammedov
2019-04-25 5:34 ` [Qemu-devel] [PATCH v3 01/13] tests: acpi: make RSDT test routine handle XSDT Igor Mammedov
2019-04-25 5:34 ` Igor Mammedov
2019-04-25 7:22 ` Wei Yang
2019-04-25 7:22 ` Wei Yang
2019-04-25 8:07 ` Igor Mammedov
2019-04-25 8:07 ` Igor Mammedov
2019-04-25 8:23 ` Wei Yang
2019-04-25 8:23 ` Wei Yang
2019-04-25 5:34 ` [Qemu-devel] [PATCH v3 02/13] tests: acpi: rename acpi_parse_rsdp_table() into acpi_fetch_rsdp_table() Igor Mammedov
2019-04-25 5:34 ` Igor Mammedov
2019-04-25 7:24 ` Wei Yang
2019-04-25 7:24 ` Wei Yang
2019-04-25 5:34 ` [Qemu-devel] [PATCH v3 03/13] tests: acpi: make pointer to RSDP 64bit Igor Mammedov
2019-04-25 5:34 ` Igor Mammedov
2019-04-25 7:31 ` Wei Yang
2019-04-25 7:31 ` Wei Yang
2019-04-25 10:38 ` Igor Mammedov
2019-04-25 10:38 ` Igor Mammedov
2019-04-25 5:34 ` [Qemu-devel] [PATCH v3 04/13] tests: acpi: fetch X_DSDT if pointer to DSDT is 0 Igor Mammedov
2019-04-25 5:34 ` Igor Mammedov
2019-04-25 7:44 ` Wei Yang
2019-04-25 7:44 ` Wei Yang
2019-04-25 5:34 ` [Qemu-devel] [PATCH v3 05/13] tests: acpi: skip FACS table if board uses hw reduced ACPI profile Igor Mammedov
2019-04-25 5:34 ` Igor Mammedov
2019-04-25 7:48 ` Wei Yang
2019-04-25 7:48 ` Wei Yang
2019-04-25 5:34 ` [Qemu-devel] [PATCH v3 06/13] tests: acpi: move boot_sector_init() into x86 tests branch Igor Mammedov
2019-04-25 5:34 ` Igor Mammedov
2019-04-25 5:34 ` [Qemu-devel] [PATCH v3 07/13] tests: acpi: add acpi_find_rsdp_address_uefi() helper Igor Mammedov
2019-04-25 5:34 ` Igor Mammedov
2019-04-25 8:00 ` Wei Yang
2019-04-25 8:00 ` Wei Yang
2019-04-25 10:56 ` Igor Mammedov
2019-04-25 10:56 ` Igor Mammedov
2019-04-25 5:34 ` [Qemu-devel] [PATCH v3 08/13] tests: acpi: add a way to start tests with UEFI firmware Igor Mammedov
2019-04-25 5:34 ` Igor Mammedov
2019-04-25 8:08 ` Wei Yang
2019-04-25 8:08 ` Wei Yang
2019-04-25 11:19 ` Igor Mammedov
2019-04-25 11:19 ` Igor Mammedov
2019-04-25 5:34 ` [Qemu-devel] [PATCH v3 09/13] tests: acpi: ignore SMBIOS tests when UEFI firmware is used Igor Mammedov
2019-04-25 5:34 ` Igor Mammedov
2019-04-25 12:37 ` Philippe Mathieu-Daudé
2019-04-25 12:37 ` Philippe Mathieu-Daudé
2019-04-25 13:28 ` Igor Mammedov
2019-04-25 13:28 ` Igor Mammedov
2019-04-25 5:34 ` [Qemu-devel] [PATCH v3 10/13] tests: add expected ACPI tables for arm/virt board Igor Mammedov
2019-04-25 5:34 ` Igor Mammedov
2019-04-25 12:40 ` Philippe Mathieu-Daudé
2019-04-25 12:40 ` Philippe Mathieu-Daudé
2019-04-25 5:34 ` [Qemu-devel] [PATCH v3 11/13] tests: acpi: add simple arm/virt testcase Igor Mammedov
2019-04-25 5:34 ` Igor Mammedov
2019-04-25 12:41 ` Philippe Mathieu-Daudé
2019-04-25 12:41 ` Philippe Mathieu-Daudé
2019-04-25 13:31 ` Igor Mammedov
2019-04-25 13:31 ` Igor Mammedov
2019-04-25 16:51 ` x00249684
2019-04-25 16:51 ` x00249684
2019-04-26 11:54 ` Igor Mammedov
2019-04-26 11:54 ` Igor Mammedov
2019-04-26 16:28 ` Wei Xu
2019-04-26 16:28 ` Wei Xu
2019-05-02 14:24 ` Igor Mammedov
2019-05-02 14:24 ` Igor Mammedov
2019-05-02 14:30 ` Wei Xu
2019-05-02 14:30 ` Wei Xu
2019-04-26 17:11 ` Laszlo Ersek
2019-04-26 17:11 ` Laszlo Ersek
2019-05-02 14:27 ` Igor Mammedov
2019-05-02 14:27 ` Igor Mammedov
2019-05-02 14:42 ` Laszlo Ersek
2019-05-02 14:42 ` Laszlo Ersek
2019-04-25 5:34 ` [Qemu-devel] [PATCH v3 12/13] tests: acpi: refactor rebuild-expected-aml.sh to dump ACPI tables for a specified list of targets Igor Mammedov
2019-04-25 5:34 ` Igor Mammedov
2019-04-25 8:20 ` Wei Yang
2019-04-25 8:20 ` Wei Yang
2019-04-25 11:32 ` Igor Mammedov
2019-04-25 11:32 ` Igor Mammedov
2019-04-25 11:46 ` Igor Mammedov
2019-04-25 11:46 ` Igor Mammedov
2019-04-25 5:34 ` [Qemu-devel] [PATCH v3 13/13] tests: acpi: print error unable to dump ACPI table during rebuild Igor Mammedov
2019-04-25 5:34 ` Igor Mammedov
2019-04-25 8:22 ` Wei Yang
2019-04-25 8:22 ` Wei Yang
2019-04-25 11:26 ` Philippe Mathieu-Daudé
2019-04-25 11:26 ` Philippe Mathieu-Daudé
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.