From nobody Wed Oct 22 06:35:56 2025 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1519828239189584.5151690465192; Wed, 28 Feb 2018 06:30:39 -0800 (PST) Received: from localhost ([::1]:44638 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1er2kf-0000P4-Oq for importer@patchew.org; Wed, 28 Feb 2018 09:30:37 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33748) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1er2fw-0004yR-3i for qemu-devel@nongnu.org; Wed, 28 Feb 2018 09:25:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1er2ft-00021d-56 for qemu-devel@nongnu.org; Wed, 28 Feb 2018 09:25:44 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:37546 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1er2fg-0001v2-9Y; Wed, 28 Feb 2018 09:25:28 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E0A0C40FB647; Wed, 28 Feb 2018 14:25:27 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.37.153.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0FEF3946B7; Wed, 28 Feb 2018 14:25:26 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Date: Wed, 28 Feb 2018 15:23:51 +0100 Message-Id: <1519827835-239519-7-git-send-email-imammedo@redhat.com> In-Reply-To: <1519827835-239519-1-git-send-email-imammedo@redhat.com> References: <1519827835-239519-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Wed, 28 Feb 2018 14:25:27 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Wed, 28 Feb 2018 14:25:27 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'imammedo@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v2 06/10] pc: acpi: isolate FADT specific data into AcpiFadtData structure 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: Auger Eric , Shannon Zhao , qemu-arm@nongnu.org, "Michael S. Tsirkin" 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" move FADT data initialization out of fadt_setup() into dedicated init_fadt_data() that will set common for pc/q35 values in AcpiFadtData structure and acpi_get_pm_info() will complement it with pc/q35 specific values initialization. That will allow to get rid of fadt_setup() and generalize build_fadt() so it could be easily extended for rev5 and reused by ARM target. While at it also move facs/dsdt/xdsdt offsets from build_fadt() arg list into AcpiFadtData, as they belong to the same dataset. Signed-off-by: Igor Mammedov Reviewed-by: Eric Auger --- v2: changes requested by Auger Eric - s/pm1_/pm1a_/ - s/c2_latency/plvl2_lat/ - s/c3_latency/plvl3_lat/ - cleanup ACPI_PORT_SMI_CMD TODO, move it to hw/isa/apm.h - move if (f->facs_tbl_offset) / if (f->dsdt_tbl_offset) bios_linker_loader_add_pointer(...) into the patch that makes build_fadt() generic --- include/hw/acpi/acpi-defs.h | 28 +++++++ hw/i386/acpi-build.c | 190 ++++++++++++++++++++++++----------------= ---- 2 files changed, 130 insertions(+), 88 deletions(-) diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h index 9942bc5..3fb0ace 100644 --- a/include/hw/acpi/acpi-defs.h +++ b/include/hw/acpi/acpi-defs.h @@ -175,6 +175,34 @@ struct AcpiFadtDescriptorRev5_1 { =20 typedef struct AcpiFadtDescriptorRev5_1 AcpiFadtDescriptorRev5_1; =20 +typedef struct AcpiFadtData { + struct AcpiGenericAddress pm1a_cnt; /* PM1a_CNT_BLK */ + struct AcpiGenericAddress pm1a_evt; /* PM1a_EVT_BLK */ + struct AcpiGenericAddress pm_tmr; /* PM_TMR_BLK */ + struct AcpiGenericAddress gpe0_blk; /* GPE0_BLK */ + struct AcpiGenericAddress reset_reg; /* RESET_REG */ + uint8_t reset_val; /* RESET_VALUE */ + uint8_t rev; /* Revision */ + uint32_t flags; /* Flags */ + uint32_t smi_cmd; /* SMI_CMD */ + uint16_t sci_int; /* SCI_INT */ + uint8_t int_model; /* INT_MODEL */ + uint8_t acpi_enable_cmd; /* ACPI_ENABLE */ + uint8_t acpi_disable_cmd; /* ACPI_DISABLE */ + uint8_t rtc_century; /* CENTURY */ + uint16_t plvl2_lat; /* P_LVL2_LAT */ + uint16_t plvl3_lat; /* P_LVL3_LAT */ + + /* + * respective tables offsets within ACPI_BUILD_TABLE_FILE, + * NULL if table doesn't exist (in that case field's value + * won't be patched by linker and will be kept set to 0) + */ + unsigned *facs_tbl_offset; /* FACS offset in */ + unsigned *dsdt_tbl_offset; + unsigned *xdsdt_tbl_offset; +} AcpiFadtData; + #define ACPI_FADT_ARM_PSCI_COMPLIANT (1 << 0) #define ACPI_FADT_ARM_PSCI_USE_HVC (1 << 1) =20 diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 699f3a0..1f88ed1 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -91,17 +91,11 @@ typedef struct AcpiMcfgInfo { } AcpiMcfgInfo; =20 typedef struct AcpiPmInfo { - bool force_rev1_fadt; bool s3_disabled; bool s4_disabled; bool pcihp_bridge_en; uint8_t s4_val; - uint16_t sci_int; - uint8_t acpi_enable_cmd; - uint8_t acpi_disable_cmd; - uint32_t gpe0_blk; - uint32_t gpe0_blk_len; - uint32_t io_base; + AcpiFadtData fadt; uint16_t cpu_hp_io_base; uint16_t pcihp_io_base; uint16_t pcihp_io_len; @@ -124,20 +118,59 @@ typedef struct AcpiBuildPciBusHotplugState { bool pcihp_bridge_en; } AcpiBuildPciBusHotplugState; =20 +static void init_common_fadt_data(Object *o, AcpiFadtData *data) +{ + uint32_t io =3D object_property_get_uint(o, ACPI_PM_PROP_PM_IO_BASE, N= ULL); + AmlAddressSpace as =3D AML_AS_SYSTEM_IO; + AcpiFadtData fadt =3D { + .rev =3D 3, + .flags =3D + (1 << ACPI_FADT_F_WBINVD) | + (1 << ACPI_FADT_F_PROC_C1) | + (1 << ACPI_FADT_F_SLP_BUTTON) | + (1 << ACPI_FADT_F_RTC_S4) | + (1 << ACPI_FADT_F_USE_PLATFORM_CLOCK) | + /* APIC destination mode ("Flat Logical") has an upper limit o= f 8 + * CPUs for more than 8 CPUs, "Clustered Logical" mode has to = be + * used + */ + ((max_cpus > 8) ? (1 << ACPI_FADT_F_FORCE_APIC_CLUSTER_MODEL) = : 0), + .int_model =3D 1 /* Multiple APIC */, + .rtc_century =3D RTC_CENTURY, + .plvl2_lat =3D 0xfff /* C2 state not supported */, + .plvl3_lat =3D 0xfff /* C3 state not supported */, + .smi_cmd =3D ACPI_PORT_SMI_CMD, + .sci_int =3D object_property_get_uint(o, ACPI_PM_PROP_SCI_INT, NUL= L), + .acpi_enable_cmd =3D + object_property_get_uint(o, ACPI_PM_PROP_ACPI_ENABLE_CMD, NULL= ), + .acpi_disable_cmd =3D + object_property_get_uint(o, ACPI_PM_PROP_ACPI_DISABLE_CMD, NUL= L), + .pm1a_evt =3D { .space_id =3D as, .bit_width =3D 4 * 8, .address = =3D io }, + .pm1a_cnt =3D { .space_id =3D as, .bit_width =3D 2 * 8, + .address =3D io + 0x04 }, + .pm_tmr =3D { .space_id =3D as, .bit_width =3D 4 * 8, .address =3D= io + 0x08 }, + .gpe0_blk =3D { .space_id =3D as, .bit_width =3D + object_property_get_uint(o, ACPI_PM_PROP_GPE0_BLK_LEN, NULL) *= 8, + .address =3D object_property_get_uint(o, ACPI_PM_PROP_GPE0_BLK= , NULL) + }, + }; + *data =3D fadt; +} + static void acpi_get_pm_info(AcpiPmInfo *pm) { Object *piix =3D piix4_pm_find(); Object *lpc =3D ich9_lpc_find(); Object *obj =3D piix ? piix : lpc; QObject *o; - - pm->force_rev1_fadt =3D false; pm->cpu_hp_io_base =3D 0; pm->pcihp_io_base =3D 0; pm->pcihp_io_len =3D 0; + + init_common_fadt_data(obj, &pm->fadt); if (piix) { /* w2k requires FADT(rev1) or it won't boot, keep PC compatible */ - pm->force_rev1_fadt =3D true; + pm->fadt.rev =3D 1; pm->cpu_hp_io_base =3D PIIX4_CPU_HOTPLUG_IO_BASE; pm->pcihp_io_base =3D object_property_get_uint(obj, ACPI_PCIHP_IO_BASE_PROP, NULL); @@ -145,10 +178,19 @@ static void acpi_get_pm_info(AcpiPmInfo *pm) object_property_get_uint(obj, ACPI_PCIHP_IO_LEN_PROP, NULL); } if (lpc) { + struct AcpiGenericAddress r =3D { .space_id =3D AML_AS_SYSTEM_IO, + .bit_width =3D 8, .address =3D ICH9_RST_CNT_IOPORT }; + pm->fadt.reset_reg =3D r; + pm->fadt.reset_val =3D 0xf; + pm->fadt.flags |=3D 1 << ACPI_FADT_F_RESET_REG_SUP; pm->cpu_hp_io_base =3D ICH9_CPU_HOTPLUG_IO_BASE; } assert(obj); =20 + /* The above need not be conditional on machine type because the reset= port + * happens to be the same on PIIX (pc) and ICH9 (q35). */ + QEMU_BUILD_BUG_ON(ICH9_RST_CNT_IOPORT !=3D RCR_IOPORT); + /* Fill in optional s3/s4 related properties */ o =3D object_property_get_qobject(obj, ACPI_PM_PROP_S3_DISABLED, NULL); if (o) { @@ -172,22 +214,6 @@ static void acpi_get_pm_info(AcpiPmInfo *pm) } qobject_decref(o); =20 - /* Fill in mandatory properties */ - pm->sci_int =3D object_property_get_uint(obj, ACPI_PM_PROP_SCI_INT, NU= LL); - - pm->acpi_enable_cmd =3D object_property_get_uint(obj, - ACPI_PM_PROP_ACPI_ENABL= E_CMD, - NULL); - pm->acpi_disable_cmd =3D - object_property_get_uint(obj, - ACPI_PM_PROP_ACPI_DISABLE_CMD, - NULL); - pm->io_base =3D object_property_get_uint(obj, ACPI_PM_PROP_PM_IO_BASE, - NULL); - pm->gpe0_blk =3D object_property_get_uint(obj, ACPI_PM_PROP_GPE0_BLK, - NULL); - pm->gpe0_blk_len =3D object_property_get_uint(obj, ACPI_PM_PROP_GPE0_B= LK_LEN, - NULL); pm->pcihp_bridge_en =3D object_property_get_bool(obj, "acpi-pci-hotplug-with-bridge-suppor= t", NULL); @@ -273,73 +299,53 @@ 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, AcpiFadtData f) { - fadt->model =3D 1; + fadt->model =3D f.int_model; fadt->reserved1 =3D 0; - fadt->sci_int =3D cpu_to_le16(pm->sci_int); - fadt->smi_cmd =3D cpu_to_le32(ACPI_PORT_SMI_CMD); - fadt->acpi_enable =3D pm->acpi_enable_cmd; - fadt->acpi_disable =3D pm->acpi_disable_cmd; + fadt->sci_int =3D cpu_to_le16(f.sci_int); + fadt->smi_cmd =3D cpu_to_le32(f.smi_cmd); + fadt->acpi_enable =3D f.acpi_enable_cmd; + fadt->acpi_disable =3D f.acpi_disable_cmd; /* EVT, CNT, TMR offset matches hw/acpi/core.c */ - fadt->pm1a_evt_blk =3D cpu_to_le32(pm->io_base); - fadt->pm1a_cnt_blk =3D cpu_to_le32(pm->io_base + 0x04); - fadt->pm_tmr_blk =3D cpu_to_le32(pm->io_base + 0x08); - fadt->gpe0_blk =3D cpu_to_le32(pm->gpe0_blk); + fadt->pm1a_evt_blk =3D cpu_to_le32(f.pm1a_evt.address); + fadt->pm1a_cnt_blk =3D cpu_to_le32(f.pm1a_cnt.address); + fadt->pm_tmr_blk =3D cpu_to_le32(f.pm_tmr.address); + fadt->gpe0_blk =3D cpu_to_le32(f.gpe0_blk.address); /* EVT, CNT, TMR length matches hw/acpi/core.c */ - fadt->pm1_evt_len =3D 4; - fadt->pm1_cnt_len =3D 2; - fadt->pm_tmr_len =3D 4; - fadt->gpe0_blk_len =3D pm->gpe0_blk_len; - fadt->plvl2_lat =3D cpu_to_le16(0xfff); /* C2 state not supported */ - fadt->plvl3_lat =3D cpu_to_le16(0xfff); /* C3 state not supported */ - fadt->flags =3D cpu_to_le32((1 << ACPI_FADT_F_WBINVD) | - (1 << ACPI_FADT_F_PROC_C1) | - (1 << ACPI_FADT_F_SLP_BUTTON) | - (1 << ACPI_FADT_F_RTC_S4)); - fadt->flags |=3D cpu_to_le32(1 << ACPI_FADT_F_USE_PLATFORM_CLOCK); - /* APIC destination mode ("Flat Logical") has an upper limit of 8 CPUs - * For more than 8 CPUs, "Clustered Logical" mode has to be used - */ - if (max_cpus > 8) { - fadt->flags |=3D cpu_to_le32(1 << ACPI_FADT_F_FORCE_APIC_CLUSTER_M= ODEL); - } - fadt->century =3D RTC_CENTURY; - if (pm->force_rev1_fadt) { + fadt->pm1_evt_len =3D f.pm1a_evt.bit_width / 8; + fadt->pm1_cnt_len =3D f.pm1a_cnt.bit_width / 8; + fadt->pm_tmr_len =3D f.pm_tmr.bit_width / 8; + fadt->gpe0_blk_len =3D f.gpe0_blk.bit_width / 8; + fadt->plvl2_lat =3D cpu_to_le16(f.plvl2_lat); + fadt->plvl3_lat =3D cpu_to_le16(f.plvl3_lat); + fadt->flags =3D cpu_to_le32(f.flags); + fadt->century =3D f.rtc_century; + if (f.rev =3D=3D 1) { return; } =20 - fadt->flags |=3D cpu_to_le32(1 << ACPI_FADT_F_RESET_REG_SUP); - fadt->reset_value =3D 0xf; - fadt->reset_register.space_id =3D AML_SYSTEM_IO; - fadt->reset_register.bit_width =3D 8; - fadt->reset_register.address =3D cpu_to_le64(ICH9_RST_CNT_IOPORT); - /* The above need not be conditional on machine type because the reset= port - * happens to be the same on PIIX (pc) and ICH9 (q35). */ - QEMU_BUILD_BUG_ON(ICH9_RST_CNT_IOPORT !=3D RCR_IOPORT); + fadt->reset_value =3D f.reset_val; + fadt->reset_register =3D f.reset_reg; + fadt->reset_register.address =3D cpu_to_le64(f.reset_reg.address); =20 - fadt->xpm1a_event_block.space_id =3D AML_SYSTEM_IO; - fadt->xpm1a_event_block.bit_width =3D fadt->pm1_evt_len * 8; - fadt->xpm1a_event_block.address =3D cpu_to_le64(pm->io_base); + fadt->xpm1a_event_block =3D f.pm1a_evt; + fadt->xpm1a_event_block.address =3D cpu_to_le64(f.pm1a_evt.address); =20 - fadt->xpm1a_control_block.space_id =3D AML_SYSTEM_IO; - fadt->xpm1a_control_block.bit_width =3D fadt->pm1_cnt_len * 8; - fadt->xpm1a_control_block.address =3D cpu_to_le64(pm->io_base + 0x4); + fadt->xpm1a_control_block =3D f.pm1a_cnt; + fadt->xpm1a_control_block.address =3D cpu_to_le64(f.pm1a_cnt.address); =20 - fadt->xpm_timer_block.space_id =3D AML_SYSTEM_IO; - fadt->xpm_timer_block.bit_width =3D fadt->pm_tmr_len * 8; - fadt->xpm_timer_block.address =3D cpu_to_le64(pm->io_base + 0x8); + fadt->xpm_timer_block =3D f.pm_tmr; + fadt->xpm_timer_block.address =3D cpu_to_le64(f.pm_tmr.address); =20 - fadt->xgpe0_block.space_id =3D AML_SYSTEM_IO; - fadt->xgpe0_block.bit_width =3D pm->gpe0_blk_len * 8; - fadt->xgpe0_block.address =3D cpu_to_le64(pm->gpe0_blk); + fadt->xgpe0_block =3D f.gpe0_blk; + fadt->xgpe0_block.address =3D cpu_to_le64(f.gpe0_blk.address); } =20 =20 /* FADT */ static void -build_fadt(GArray *table_data, BIOSLinker *linker, AcpiPmInfo *pm, - unsigned facs_tbl_offset, unsigned dsdt_tbl_offset, +build_fadt(GArray *table_data, BIOSLinker *linker, AcpiFadtData *f, const char *oem_id, const char *oem_table_id) { AcpiFadtDescriptorRev3 *fadt =3D acpi_data_push(table_data, sizeof(*fa= dt)); @@ -347,29 +353,29 @@ build_fadt(GArray *table_data, BIOSLinker *linker, Ac= piPmInfo *pm, unsigned dsdt_entry_offset =3D (char *)&fadt->dsdt - table_data->data; unsigned xdsdt_entry_offset =3D (char *)&fadt->x_dsdt - table_data->da= ta; 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, ACPI_BUILD_TABLE_FILE, fw_ctrl_offset, sizeof(fadt->firmware_ctrl), - ACPI_BUILD_TABLE_FILE, facs_tbl_offset); + ACPI_BUILD_TABLE_FILE, *f->facs_tbl_offset); =20 /* DSDT address to be filled by Guest linker */ - fadt_setup(fadt, pm); + fadt_setup(fadt, *f); bios_linker_loader_add_pointer(linker, ACPI_BUILD_TABLE_FILE, dsdt_entry_offset, sizeof(fadt->dsdt), - ACPI_BUILD_TABLE_FILE, dsdt_tbl_offset); - if (pm->force_rev1_fadt) { - rev =3D 1; + ACPI_BUILD_TABLE_FILE, *f->dsdt_tbl_offset); + + if (f->rev =3D=3D 1) { fadt_size =3D offsetof(typeof(*fadt), reset_register); - } else { + } else if (f->xdsdt_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); + ACPI_BUILD_TABLE_FILE, *f->xdsdt_tbl_offset); } =20 build_header(linker, table_data, - (void *)fadt, "FACP", fadt_size, rev, oem_id, oem_table_i= d); + (void *)fadt, "FACP", fadt_size, f->rev, + oem_id, oem_table_id); } =20 void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid, @@ -2049,7 +2055,12 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, aml_append(dev, aml_name_decl("_STA", aml_int(0xB))); crs =3D aml_resource_template(); aml_append(crs, - aml_io(AML_DECODE16, pm->gpe0_blk, pm->gpe0_blk, 1, pm->gpe0_blk_l= en) + aml_io( + AML_DECODE16, + pm->fadt.gpe0_blk.address, + pm->fadt.gpe0_blk.address, + 1, + pm->fadt.gpe0_blk.bit_width / 8) ); aml_append(dev, aml_name_decl("_CRS", crs)); aml_append(scope, dev); @@ -2696,7 +2707,10 @@ void acpi_build(AcpiBuildTables *tables, MachineStat= e *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, + pm.fadt.facs_tbl_offset =3D &facs; + pm.fadt.dsdt_tbl_offset =3D &dsdt; + pm.fadt.xdsdt_tbl_offset =3D &dsdt; + build_fadt(tables_blob, tables->linker, &pm.fadt, slic_oem.id, slic_oem.table_id); aml_len +=3D tables_blob->len - fadt; =20 --=20 2.7.4