qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Igor Mammedov <imammedo@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Laszlo Ersek" <lersek@redhat.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	Gonglei <arei.gonglei@huawei.com>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>,
	"Shannon Zhao" <shannon.zhaosl@gmail.com>,
	"Wei Yang" <richardw.yang@linux.intel.com>,
	"Andrew Jones" <drjones@redhat.com>,
	"Shameer Kolothum" <shameerali.kolothum.thodi@huawei.com>,
	"Ben Warren" <ben@skyportsystems.com>
Subject: [Qemu-devel] [PATCH v3 07/13] tests: acpi: add acpi_find_rsdp_address_uefi() helper
Date: Thu, 25 Apr 2019 07:34:43 +0200	[thread overview]
Message-ID: <1556170489-131927-8-git-send-email-imammedo@redhat.com> (raw)
In-Reply-To: <1556170489-131927-1-git-send-email-imammedo@redhat.com>

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

WARNING: multiple messages have this Message-ID (diff)
From: Igor Mammedov <imammedo@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Andrew Jones" <drjones@redhat.com>,
	"Ben Warren" <ben@skyportsystems.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	"Laszlo Ersek" <lersek@redhat.com>,
	"Shameer Kolothum" <shameerali.kolothum.thodi@huawei.com>,
	"Shannon Zhao" <shannon.zhaosl@gmail.com>,
	Gonglei <arei.gonglei@huawei.com>,
	"Wei Yang" <richardw.yang@linux.intel.com>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [Qemu-devel] [PATCH v3 07/13] tests: acpi: add acpi_find_rsdp_address_uefi() helper
Date: Thu, 25 Apr 2019 07:34:43 +0200	[thread overview]
Message-ID: <1556170489-131927-8-git-send-email-imammedo@redhat.com> (raw)
Message-ID: <20190425053443.XPWK-gxxRpkWBdtlH80WY5YgqkATFji5cYh3mGZbOtM@z> (raw)
In-Reply-To: <1556170489-131927-1-git-send-email-imammedo@redhat.com>

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



  parent reply	other threads:[~2019-04-25  5:36 UTC|newest]

Thread overview: 88+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 ` Igor Mammedov [this message]
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  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é

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1556170489-131927-8-git-send-email-imammedo@redhat.com \
    --to=imammedo@redhat.com \
    --cc=arei.gonglei@huawei.com \
    --cc=ben@skyportsystems.com \
    --cc=drjones@redhat.com \
    --cc=lersek@redhat.com \
    --cc=mst@redhat.com \
    --cc=philmd@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=richardw.yang@linux.intel.com \
    --cc=shameerali.kolothum.thodi@huawei.com \
    --cc=shannon.zhaosl@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).