From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46075) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsG0N-0004lN-Ls for qemu-devel@nongnu.org; Sat, 22 Nov 2014 14:06:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XsG0D-0005Kj-8R for qemu-devel@nongnu.org; Sat, 22 Nov 2014 14:05:59 -0500 Received: from mail-wi0-x22f.google.com ([2a00:1450:400c:c05::22f]:43641) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsG0D-0005J8-1J for qemu-devel@nongnu.org; Sat, 22 Nov 2014 14:05:49 -0500 Received: by mail-wi0-f175.google.com with SMTP id l15so2213446wiw.2 for ; Sat, 22 Nov 2014 11:05:48 -0800 (PST) From: Vasilis Liaskovitis Date: Sat, 22 Nov 2014 20:05:32 +0100 Message-Id: <1416683132-22017-1-git-send-email-vliaskov@gmail.com> Subject: [Qemu-devel] [PATCH] qtest/bios-tables: Add DMAR unit test on intel_iommu for q35 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: jan.kiszka@web.de, marcel.a@redhat.com, knut.omang@oracle.com, Vasilis Liaskovitis , mst@redhat.com The test enables intel_iommu on q35 and reads the DMAR table and its only DRHC structure (for now), checking only the header and checksums. Signed-off-by: Vasilis Liaskovitis --- tests/bios-tables-test.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index 9e4d205..f09b0cb 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -45,6 +45,8 @@ typedef struct { AcpiRsdtDescriptorRev1 rsdt_table; AcpiFadtDescriptorRev1 fadt_table; AcpiFacsDescriptorRev1 facs_table; + AcpiTableDmar dmar_table; + AcpiDmarHardwareUnit drhd; uint32_t *rsdt_tables_addr; int rsdt_tables_nr; GArray *tables; @@ -371,6 +373,33 @@ static void test_acpi_dsdt_table(test_data *data) g_array_append_val(data->tables, dsdt_table); } +static void test_acpi_dmar_table(test_data *data) +{ + AcpiTableDmar *dmar_table = &data->dmar_table; + AcpiDmarHardwareUnit *drhd = &data->drhd; + struct AcpiTableHeader *header = (struct AcpiTableHeader *) dmar_table; + int tables_nr = data->rsdt_tables_nr - 1; + uint32_t addr = data->rsdt_tables_addr[tables_nr]; /* dmar is last */ + + memset(dmar_table, 0, sizeof(*dmar_table)); + ACPI_READ_TABLE_HEADER(dmar_table, addr); + ACPI_ASSERT_CMP(header->signature, "DMAR"); + + ACPI_READ_FIELD(dmar_table->host_address_width, addr); + ACPI_READ_FIELD(dmar_table->flags, addr); + ACPI_READ_ARRAY_PTR(dmar_table->reserved, 10, addr); + + memset(drhd, 0, sizeof(*drhd)); + ACPI_READ_FIELD(drhd->type, addr); + ACPI_READ_FIELD(drhd->length, addr); + ACPI_READ_FIELD(drhd->flags, addr); + ACPI_READ_FIELD(drhd->pci_segment, addr); + ACPI_READ_FIELD(drhd->address, addr); + g_assert(!acpi_checksum((uint8_t *)dmar_table, sizeof(AcpiTableDmar) + + drhd->length)); + +} + static void test_acpi_tables(test_data *data) { int tables_nr = data->rsdt_tables_nr - 1; /* fadt is first */ @@ -747,6 +776,9 @@ static void test_acpi_one(const char *params, test_data *data) test_acpi_fadt_table(data); test_acpi_facs_table(data); test_acpi_dsdt_table(data); + if (strstr(params, "iommu=on")) { + test_acpi_dmar_table(data); + } test_acpi_tables(data); if (iasl) { @@ -779,7 +811,7 @@ static void test_acpi_tcg(void) memset(&data, 0, sizeof(data)); data.machine = MACHINE_Q35; - test_acpi_one("-machine q35,accel=tcg", &data); + test_acpi_one("-machine q35,accel=tcg,iommu=on", &data); free_test_data(&data); } -- 1.9.1