From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:60610) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJcPg-0004pd-AD for qemu-devel@nongnu.org; Thu, 25 Apr 2019 07:19:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJcPf-0002yi-2d for qemu-devel@nongnu.org; Thu, 25 Apr 2019 07:19:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41494) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hJcPe-0002wv-QX for qemu-devel@nongnu.org; Thu, 25 Apr 2019 07:19:35 -0400 Date: Thu, 25 Apr 2019 13:19:22 +0200 From: Igor Mammedov Message-ID: <20190425131922.7f72a963@redhat.com> In-Reply-To: <20190425080842.GE24829@richard> References: <1556170489-131927-1-git-send-email-imammedo@redhat.com> <1556170489-131927-9-git-send-email-imammedo@redhat.com> <20190425080842.GE24829@richard> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v3 08/13] tests: acpi: add a way to start tests with UEFI firmware List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Wei Yang Cc: Andrew Jones , Ben Warren , "Michael S. Tsirkin" , Laszlo Ersek , qemu-devel@nongnu.org, Shameer Kolothum , Shannon Zhao , Gonglei , Philippe =?UTF-8?B?TWF0aGlldS1EYXVkw6k=?= On Thu, 25 Apr 2019 16:08:42 +0800 Wei Yang 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 > >Reviewed-by: Laszlo Ersek > >--- > >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 > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 78F46C10F03 for ; Thu, 25 Apr 2019 11:20:30 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 491F72084B for ; Thu, 25 Apr 2019 11:20:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 491F72084B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([127.0.0.1]:55507 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJcQX-0005AH-Cb for qemu-devel@archiver.kernel.org; Thu, 25 Apr 2019 07:20:29 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60610) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJcPg-0004pd-AD for qemu-devel@nongnu.org; Thu, 25 Apr 2019 07:19:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJcPf-0002yi-2d for qemu-devel@nongnu.org; Thu, 25 Apr 2019 07:19:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41494) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hJcPe-0002wv-QX for qemu-devel@nongnu.org; Thu, 25 Apr 2019 07:19:35 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 687912E6078; Thu, 25 Apr 2019 11:19:33 +0000 (UTC) Received: from localhost (unknown [10.43.2.182]) by smtp.corp.redhat.com (Postfix) with ESMTP id 12E7960BE5; Thu, 25 Apr 2019 11:19:26 +0000 (UTC) Date: Thu, 25 Apr 2019 13:19:22 +0200 From: Igor Mammedov To: Wei Yang Message-ID: <20190425131922.7f72a963@redhat.com> In-Reply-To: <20190425080842.GE24829@richard> References: <1556170489-131927-1-git-send-email-imammedo@redhat.com> <1556170489-131927-9-git-send-email-imammedo@redhat.com> <20190425080842.GE24829@richard> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 25 Apr 2019 11:19:33 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: Re: [Qemu-devel] [PATCH v3 08/13] tests: acpi: add a way to start tests with UEFI firmware X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Jones , Ben Warren , "Michael S. Tsirkin" , Philippe =?UTF-8?B?TWF0aGlldS1EYXVkw6k=?= , qemu-devel@nongnu.org, Shameer Kolothum , Shannon Zhao , Gonglei , Laszlo Ersek Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Message-ID: <20190425111922.qY-kP82anbFjA8GGmLPBcZPpZ_rWeWq3hpPlT8WBJMw@z> On Thu, 25 Apr 2019 16:08:42 +0800 Wei Yang 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 > >Reviewed-by: Laszlo Ersek > >--- > >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 >