From nobody Fri May 3 13:41:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1500631441438383.1762886206525; Fri, 21 Jul 2017 03:04:01 -0700 (PDT) Received: from localhost ([::1]:41933 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dYUJi-0001RI-KH for importer@patchew.org; Fri, 21 Jul 2017 05:33:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49292) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dYUIQ-0000iq-Tz for qemu-devel@nongnu.org; Fri, 21 Jul 2017 05:32:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dYUIM-000751-1C for qemu-devel@nongnu.org; Fri, 21 Jul 2017 05:32:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33684) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dYUIL-00074N-OM for qemu-devel@nongnu.org; Fri, 21 Jul 2017 05:32:25 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9DC5EC0B771A; Fri, 21 Jul 2017 09:32:19 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.34.112.60]) by smtp.corp.redhat.com (Postfix) with ESMTP id B55FF5C737; Fri, 21 Jul 2017 09:32:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 9DC5EC0B771A Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=imammedo@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 9DC5EC0B771A From: Igor Mammedov To: qemu-devel@nongnu.org Date: Fri, 21 Jul 2017 11:32:11 +0200 Message-Id: <1500629531-184026-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Fri, 21 Jul 2017 09:32:24 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] pc: acpi: force FADT rev1 for old i440fx machine types 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: Programmingkid , "Michael S. Tsirkin" , Phil Dennis-Jordan Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" w2k used to boot on QEMU until we bumped revision of FADT to rev3 (commit 77af8a2b hw/i386: Use Rev3 FADT (ACPI 2.0) instead of Rev1 to impro= ve guest OS support.) Considering that w2k is ancient and long time EOLed, leave default rev3 but make pc-i440fx-2.9 and older machine types to force rev1 so old setups won't break (w2k could boot). Signed-off-by: Igor Mammedov Tested-by: Ladi Prosek tested-by: John Arbuckle --- CC: Programmingkid CC: Phil Dennis-Jordan CC: "Michael S. Tsirkin" Only compile test since I don't have w2k to test with --- include/hw/i386/pc.h | 1 + hw/i386/acpi-build.c | 26 +++++++++++++++++++------- hw/i386/pc_piix.c | 2 ++ 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index d80859b..d6f65dd 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -122,6 +122,7 @@ struct PCMachineClass { bool rsdp_in_ram; int legacy_acpi_table_size; unsigned acpi_data_size; + bool force_rev1_fadt; =20 /* SMBIOS compat: */ bool smbios_defaults; diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 6b7bade..227f9ad 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -272,7 +272,7 @@ build_facs(GArray *table_data, BIOSLinker *linker) } =20 /* Load chipset information in FADT */ -static void fadt_setup(AcpiFadtDescriptorRev3 *fadt, AcpiPmInfo *pm) +static void fadt_setup(AcpiFadtDescriptorRev3 *fadt, AcpiPmInfo *pm, bool = rev1) { fadt->model =3D 1; fadt->reserved1 =3D 0; @@ -304,6 +304,9 @@ static void fadt_setup(AcpiFadtDescriptorRev3 *fadt, Ac= piPmInfo *pm) fadt->flags |=3D cpu_to_le32(1 << ACPI_FADT_F_FORCE_APIC_CLUSTER_M= ODEL); } fadt->century =3D RTC_CENTURY; + if (rev1) { + return; + } =20 fadt->flags |=3D cpu_to_le32(1 << ACPI_FADT_F_RESET_REG_SUP); fadt->reset_value =3D 0xf; @@ -335,6 +338,7 @@ static void fadt_setup(AcpiFadtDescriptorRev3 *fadt, Ac= piPmInfo *pm) /* FADT */ static void build_fadt(GArray *table_data, BIOSLinker *linker, AcpiPmInfo *pm, + MachineState *machine, unsigned facs_tbl_offset, unsigned dsdt_tbl_offset, const char *oem_id, const char *oem_table_id) { @@ -342,6 +346,9 @@ build_fadt(GArray *table_data, BIOSLinker *linker, Acpi= PmInfo *pm, unsigned fw_ctrl_offset =3D (char *)&fadt->firmware_ctrl - table_data-= >data; unsigned dsdt_entry_offset =3D (char *)&fadt->dsdt - table_data->data; unsigned xdsdt_entry_offset =3D (char *)&fadt->x_dsdt - table_data->da= ta; + PCMachineClass *pcmc =3D PC_MACHINE_GET_CLASS(machine); + int fadt_size =3D sizeof(*fadt); + int rev =3D 3; =20 /* FACS address to be filled by Guest linker */ bios_linker_loader_add_pointer(linker, @@ -349,16 +356,21 @@ build_fadt(GArray *table_data, BIOSLinker *linker, Ac= piPmInfo *pm, ACPI_BUILD_TABLE_FILE, facs_tbl_offset); =20 /* DSDT address to be filled by Guest linker */ - fadt_setup(fadt, pm); + fadt_setup(fadt, pm, pcmc->force_rev1_fadt); bios_linker_loader_add_pointer(linker, ACPI_BUILD_TABLE_FILE, dsdt_entry_offset, sizeof(fadt->dsdt), ACPI_BUILD_TABLE_FILE, dsdt_tbl_offset); - bios_linker_loader_add_pointer(linker, - ACPI_BUILD_TABLE_FILE, xdsdt_entry_offset, sizeof(fadt->x_dsdt), - ACPI_BUILD_TABLE_FILE, dsdt_tbl_offset); + if (pcmc->force_rev1_fadt) { + rev =3D 1; + fadt_size =3D offsetof(typeof(*fadt), reset_register); + } else { + bios_linker_loader_add_pointer(linker, + ACPI_BUILD_TABLE_FILE, xdsdt_entry_offset, sizeof(fadt->x_dsdt= ), + ACPI_BUILD_TABLE_FILE, dsdt_tbl_offset); + } =20 build_header(linker, table_data, - (void *)fadt, "FACP", sizeof(*fadt), 3, oem_id, oem_table= _id); + (void *)fadt, "FACP", fadt_size, rev, oem_id, oem_table_i= d); } =20 void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid, @@ -2667,7 +2679,7 @@ void acpi_build(AcpiBuildTables *tables, MachineState= *machine) /* ACPI tables pointed to by RSDT */ fadt =3D tables_blob->len; acpi_add_table(table_offsets, tables_blob); - build_fadt(tables_blob, tables->linker, &pm, facs, dsdt, + build_fadt(tables_blob, tables->linker, &pm, machine, facs, dsdt, slic_oem.id, slic_oem.table_id); aml_len +=3D tables_blob->len - fadt; =20 diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 11b4336..bc61332 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -449,9 +449,11 @@ DEFINE_I440FX_MACHINE(v2_10, "pc-i440fx-2.10", NULL, =20 static void pc_i440fx_2_9_machine_options(MachineClass *m) { + PCMachineClass *pcmc =3D PC_MACHINE_CLASS(m); pc_i440fx_2_10_machine_options(m); m->is_default =3D 0; m->alias =3D NULL; + pcmc->force_rev1_fadt =3D true; SET_MACHINE_COMPAT(m, PC_COMPAT_2_9); } =20 --=20 2.7.4