From patchwork Sat Nov 22 19:05:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasilis Liaskovitis X-Patchwork-Id: 413336 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 716A81400EA for ; Sun, 23 Nov 2014 10:31:38 +1100 (AEDT) Received: from localhost ([::1]:47161 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsK9P-0006Zy-7z for incoming@patchwork.ozlabs.org; Sat, 22 Nov 2014 18:31:35 -0500 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=xpfemuteKOAiFqLnc+T1nli/76W95r8+EUGHHbnN4M0=; b=O9AsP0FAViOazR35mMquAljeudewv/VvYRARglOgl5617uiWuRg8buUn0E+jEdpXMn R/u7IFifN5NKzLZgUmXc10krebgD4vSXbK5s6Ty7jnnKf0Q4+TqwKcUOW/+E01Lg/5F4 YWT0cTzIfwqMTzbTfxWsoTqU9W+iqakd6Jwf/m5+zmtLwC+wbitPSwMoLH15a27b/IVb oNhKJOktE82k/L5cti0/qXQuqAKEjpYjCkvcWuA5I1aTflZBzkGwgx7UABTOnf26urN0 bhylkG8/wBDsAEoIZgcqqgZaiX0jtQvbuYA1uikpQil7CR+059V2OXmnmVXOdCdtWRk3 EbiQ== X-Received: by 10.194.60.45 with SMTP id e13mr19242748wjr.109.1416683148320; Sat, 22 Nov 2014 11:05:48 -0800 (PST) Received: from localhost.localdomain (e179131170.adsl.alicedsl.de. [85.179.131.170]) by mx.google.com with ESMTPSA id ex9sm4312099wib.14.2014.11.22.11.05.46 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 22 Nov 2014 11:05:47 -0800 (PST) From: Vasilis Liaskovitis To: qemu-devel@nongnu.org Date: Sat, 22 Nov 2014 20:05:32 +0100 Message-Id: <1416683132-22017-1-git-send-email-vliaskov@gmail.com> X-Mailer: git-send-email 1.9.1 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c05::22f X-Mailman-Approved-At: Sat, 22 Nov 2014 18:31:15 -0500 Cc: jan.kiszka@web.de, marcel.a@redhat.com, knut.omang@oracle.com, Vasilis Liaskovitis , mst@redhat.com Subject: [Qemu-devel] [PATCH] qtest/bios-tables: Add DMAR unit test on intel_iommu for q35 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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); }