From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44601) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDFd6-0008EW-Ip for qemu-devel@nongnu.org; Mon, 19 Jan 2015 11:56:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YDFd0-0001qu-4b for qemu-devel@nongnu.org; Mon, 19 Jan 2015 11:56:44 -0500 Received: from mail-wg0-x234.google.com ([2a00:1450:400c:c00::234]:40461) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDFcz-0001pp-R2 for qemu-devel@nongnu.org; Mon, 19 Jan 2015 11:56:38 -0500 Received: by mail-wg0-f52.google.com with SMTP id l2so10758460wgh.11 for ; Mon, 19 Jan 2015 08:56:35 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 19 Jan 2015 17:56:25 +0100 Message-Id: <1421686587-8354-2-git-send-email-pbonzini@redhat.com> In-Reply-To: <1421686587-8354-1-git-send-email-pbonzini@redhat.com> References: <1421686587-8354-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v3 1/3] pc: append ssdt-misc.dsl to the DSDT List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: imammedo@redhat.com, mst@redhat.com This part of the ACPI tables can vary in size across machine types, but does not depend on the command-line. It is an SSDT just because it is the same for i440fx and Q35, and making it an SSDT made the code a bit simpler. However, it also complicates backwards compatibility, so merge it with the DSDT. Signed-off-by: Paolo Bonzini --- hw/i386/acpi-build.c | 54 +++++++++++++++++++++++++++--------------- tests/acpi-test-data/pc/DSDT | Bin 3592 -> 3920 bytes tests/acpi-test-data/pc/SSDT | Bin 2279 -> 1951 bytes tests/acpi-test-data/q35/DSDT | Bin 8182 -> 8510 bytes tests/acpi-test-data/q35/SSDT | Bin 560 -> 232 bytes 5 files changed, 35 insertions(+), 19 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 6a2e9c5..c8eac00 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1064,26 +1064,18 @@ static void patch_pci_windows(PcPciInfo *pci, uint8_t *start, unsigned size) } } +#define SSDT_MISC_SIZE (sizeof(ssdt_misc_aml) - sizeof(AcpiTableHeader)) + static void -build_ssdt(GArray *table_data, GArray *linker, - AcpiCpuInfo *cpu, AcpiPmInfo *pm, AcpiMiscInfo *misc, - PcPciInfo *pci, PcGuestInfo *guest_info) +push_ssdt_misc(GArray *table_data, AcpiPmInfo *pm, AcpiMiscInfo *misc, + PcPciInfo *pci) { MachineState *machine = MACHINE(qdev_get_machine()); uint32_t nr_mem = machine->ram_slots; - unsigned acpi_cpus = guest_info->apic_id_limit; - int ssdt_start = table_data->len; uint8_t *ssdt_ptr; - int i; - - /* The current AML generator can cover the APIC ID range [0..255], - * inclusive, for VCPU hotplug. */ - QEMU_BUILD_BUG_ON(ACPI_CPU_HOTPLUG_ID_LIMIT > 256); - g_assert(acpi_cpus <= ACPI_CPU_HOTPLUG_ID_LIMIT); /* Copy header and patch values in the S3_ / S4_ / S5_ packages */ - ssdt_ptr = acpi_data_push(table_data, sizeof(ssdp_misc_aml)); - memcpy(ssdt_ptr, ssdp_misc_aml, sizeof(ssdp_misc_aml)); + ssdt_ptr = g_memdup(ssdp_misc_aml, sizeof(ssdp_misc_aml)); if (pm->s3_disabled) { ssdt_ptr[acpi_s3_name[0]] = 'X'; } @@ -1102,6 +1094,27 @@ build_ssdt(GArray *table_data, GArray *linker, ACPI_BUILD_SET_LE(ssdt_ptr, sizeof(ssdp_misc_aml), ssdt_mctrl_nr_slots[0], 32, nr_mem); + g_array_append_vals(table_data, ssdt_ptr + sizeof(AcpiTableHeader), SSDT_MISC_SIZE); + g_free(ssdt_ptr); +} + +static void +build_ssdt(GArray *table_data, GArray *linker, + AcpiCpuInfo *cpu, AcpiPmInfo *pm, PcGuestInfo *guest_info) +{ + MachineState *machine = MACHINE(qdev_get_machine()); + uint32_t nr_mem = machine->ram_slots; + unsigned acpi_cpus = guest_info->apic_id_limit; + int ssdt_start = table_data->len; + int i; + + acpi_data_push(table_data, sizeof(AcpiTableHeader)); + + /* The current AML generator can cover the APIC ID range [0..255], + * inclusive, for VCPU hotplug. */ + QEMU_BUILD_BUG_ON(ACPI_CPU_HOTPLUG_ID_LIMIT > 256); + g_assert(acpi_cpus <= ACPI_CPU_HOTPLUG_ID_LIMIT); + { GArray *sb_scope = build_alloc_array(); uint8_t op = 0x10; /* ScopeOp */ @@ -1426,18 +1439,22 @@ build_dmar_q35(GArray *table_data, GArray *linker) } static void -build_dsdt(GArray *table_data, GArray *linker, AcpiMiscInfo *misc) +build_dsdt(GArray *table_data, GArray *linker, AcpiPmInfo *pm, + AcpiMiscInfo *misc, PcPciInfo *pci) { AcpiTableHeader *dsdt; + size_t dsdt_start = table_data->len; assert(misc->dsdt_code && misc->dsdt_size); dsdt = acpi_data_push(table_data, misc->dsdt_size); memcpy(dsdt, misc->dsdt_code, misc->dsdt_size); + push_ssdt_misc(table_data, pm, misc, pci); + memset(dsdt, 0, sizeof *dsdt); - build_header(linker, table_data, dsdt, "DSDT", - misc->dsdt_size, 1); + build_header(linker, table_data, (void *)(table_data->data + dsdt_start), + "DSDT", table_data->len - dsdt_start, 1); } /* Build final rsdt table */ @@ -1594,7 +1611,7 @@ void acpi_build(PcGuestInfo *guest_info, AcpiBuildTables *tables) /* DSDT is pointed to by FADT */ dsdt = tables->table_data->len; - build_dsdt(tables->table_data, tables->linker, &misc); + build_dsdt(tables->table_data, tables->linker, &pm, &misc, &pci); /* Count the size of the DSDT and SSDT, we will need it for legacy * sizing of ACPI tables. @@ -1607,8 +1624,7 @@ void acpi_build(PcGuestInfo *guest_info, AcpiBuildTables *tables) ssdt = tables->table_data->len; acpi_add_table(table_offsets, tables->table_data); - build_ssdt(tables->table_data, tables->linker, &cpu, &pm, &misc, &pci, - guest_info); + build_ssdt(tables->table_data, tables->linker, &cpu, &pm, guest_info); aml_len += tables->table_data->len - ssdt; acpi_add_table(table_offsets, tables->table_data); diff --git a/tests/acpi-test-data/pc/DSDT b/tests/acpi-test-data/pc/DSDT index ee9cc6781cea3a9515b9a176eea3459f8e4d8655..9bcc9ba9540f768afeba95231229e093b538d020 100644 GIT binary patch delta 350 zcmZ9Iy-ve06os!tsH~fW{wMo7I}DbVg`V zs;M6!x3nD_i2uRlZ;)q2>Dr)oWV=b9(4gZpX6s3x(t!Kuq1U>zr9t= zBonEJR6XaY#LRHIlv#8w@|z?{QhSilCIF}&m6(>yIaWOdzeX7z?~^t|SU6IDblz%c z;L~rg8}F5wG7czHH+3A|mg>r|#k~tSjY{2*5XbgT`#bCbUR{KqoaV(=`c~fAdRfSA Ky+iFg4*UTB4N6r2 delta 19 acmca0*CE5@66_Mf!N*@IM^j*K05;gm*51I!GED0F;kfP7CH7E1!a2qb-m3(AXg?9I4(ruNBnr z;n$)c_litg2ehr~Dh_W7Z53PGxq#!SFi}^C3%Zm3hTX%;MZ#0le9}sv$2}0=xk5 zK+KGkbIJlY{r~@+exLkx^fnNg&D`NO0K0t^pIh_JXl)8yCl(_B_#h=QS}fkbxlSi2 z2&ERgq2NTDp+No*Mt_4mD~xZ0&JJ~>-NRlhU<|z8#~u#^2%_W;<{mYx$I*0m73~1^ zP$kOtv3$sdmJ`SERAudRnO`JHlF~uax)7ke({gN>cdWb*e~orL-bCyAF!Q8(Zaq~{ z!%I+$jdpg1T@!$uPnoErU delta 19 acmdnz^v#~jCD+&p>B+f_hXG9s2A2Q; delta 351 zcmZ9Iu};G<5QfhsRF;zhtui37vM}KY*eQ(#mYUSWrXZ!#Wn}EiRA6PQ`T`*30eFLU z;01UKo`P~tS>UGs|G(4klfT$|AgoQDYyq&(xj2{&wfWj9jFgbq^Hg#hKFQKN!+$I7Sh*BHm+eYCC*Q%|bb_M(Cs z-hx`}#ydr7oCn5Lbrnaqg>jlq?|r~=P}puqh)cSY{)Roki;qN0kFtCt1Cn=CuXDYr M_o#WtgZbgd4{V`Jg8%>k -- 1.8.3.1