[Qemu-devel] [PATCH 0/3] merge SSDT into DSDT

[Qemu-devel] [PATCH 0/3] merge SSDT into DSDT

[Igor Mammedov]

Merging both tables will allow for futher ASL
simplification and cleanups per device/subsystem
And it also allows to reduce number of expected
binary blobs for ACPI tests which reduces tests
maintenance.

Boot tested with RHEL72, WS2003, WS2012R2 guests.

git tree for testing:
https://github.com/imammedo/qemu.git merge_ssdt_into_dsdt_v1 

Igor Mammedov (3):
  pc: acpi: merge SSDT into DSDT
  tests: pc: acpi: drop not needed 'expected SSDT' blobs
  tests: pc: acpi: add expected DSDT.bridge blobs and update DSDT blobs

 hw/i386/acpi-build.c                 | 246 ++++++++++++++++-------------------
 tests/acpi-test-data/pc/DSDT         | Bin 3028 -> 5478 bytes
 tests/acpi-test-data/pc/DSDT.bridge  | Bin 0 -> 7337 bytes
 tests/acpi-test-data/pc/SSDT         | Bin 2486 -> 0 bytes
 tests/acpi-test-data/pc/SSDT.bridge  | Bin 4345 -> 0 bytes
 tests/acpi-test-data/q35/DSDT        | Bin 7666 -> 8321 bytes
 tests/acpi-test-data/q35/DSDT.bridge | Bin 0 -> 8338 bytes
 tests/acpi-test-data/q35/SSDT        | Bin 691 -> 0 bytes
 tests/acpi-test-data/q35/SSDT.bridge | Bin 708 -> 0 bytes
 9 files changed, 111 insertions(+), 135 deletions(-)
 create mode 100644 tests/acpi-test-data/pc/DSDT.bridge
 delete mode 100644 tests/acpi-test-data/pc/SSDT
 delete mode 100644 tests/acpi-test-data/pc/SSDT.bridge
 create mode 100644 tests/acpi-test-data/q35/DSDT.bridge
 delete mode 100644 tests/acpi-test-data/q35/SSDT
 delete mode 100644 tests/acpi-test-data/q35/SSDT.bridge

-- 
1.8.3.1

[Qemu-devel] [PATCH 1/3] pc: acpi: merge SSDT into DSDT

[Igor Mammedov]

Since both tables are built dynamically now,
there is no point in keeping ASL in them in separate
tables.
So do the same as we do for ARM where we have only
DSDT table, i.e. move SSDT ASL into DSDT and
drop SSDT altogether.
This patch doesn't change moved SSDT ASL in any way,
but it opens a way to relatively independently simplify
generated ASL on per device/subsystem basis in
followup series.
It also simplifies bios-tables-test where expected
SSDT blobs could be dropped and only DSDT ones
have to be maintained.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
 hw/i386/acpi-build.c | 246 +++++++++++++++++++++++----------------------------
 1 file changed, 111 insertions(+), 135 deletions(-)

diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 78758e2..b9a2ddd 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1936,24 +1936,113 @@ static Aml *build_q35_osc_method(void)
 }
 
 static void
-build_ssdt(GArray *table_data, GArray *linker,
+build_dsdt(GArray *table_data, GArray *linker,
            AcpiCpuInfo *cpu, AcpiPmInfo *pm, AcpiMiscInfo *misc,
            PcPciInfo *pci, PcGuestInfo *guest_info)
 {
+    CrsRangeEntry *entry;
+    Aml *dsdt, *sb_scope, *scope, *dev, *method, *field, *pkg, *crs;
+    GPtrArray *mem_ranges = g_ptr_array_new_with_free_func(crs_range_free);
+    GPtrArray *io_ranges = g_ptr_array_new_with_free_func(crs_range_free);
     MachineState *machine = MACHINE(qdev_get_machine());
     uint32_t nr_mem = machine->ram_slots;
-    Aml *ssdt, *sb_scope, *scope, *pkg, *dev, *method, *crs, *field;
-    PCIBus *bus = NULL;
-    GPtrArray *io_ranges = g_ptr_array_new_with_free_func(crs_range_free);
-    GPtrArray *mem_ranges = g_ptr_array_new_with_free_func(crs_range_free);
-    CrsRangeEntry *entry;
     int root_bus_limit = 0xFF;
+    PCIBus *bus = NULL;
     int i;
 
-    ssdt = init_aml_allocator();
+    dsdt = init_aml_allocator();
 
     /* Reserve space for header */
-    acpi_data_push(ssdt->buf, sizeof(AcpiTableHeader));
+    acpi_data_push(dsdt->buf, sizeof(AcpiTableHeader));
+
+    build_dbg_aml(dsdt);
+    if (misc->is_piix4) {
+        sb_scope = aml_scope("_SB");
+        dev = aml_device("PCI0");
+        aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0A03")));
+        aml_append(dev, aml_name_decl("_ADR", aml_int(0)));
+        aml_append(dev, aml_name_decl("_UID", aml_int(1)));
+        aml_append(sb_scope, dev);
+        aml_append(dsdt, sb_scope);
+
+        build_hpet_aml(dsdt);
+        build_piix4_pm(dsdt);
+        build_piix4_isa_bridge(dsdt);
+        build_isa_devices_aml(dsdt);
+        build_piix4_pci_hotplug(dsdt);
+        build_piix4_pci0_int(dsdt);
+    } else {
+        sb_scope = aml_scope("_SB");
+        aml_append(sb_scope,
+            aml_operation_region("PCST", AML_SYSTEM_IO, 0xae00, 0x0c));
+        aml_append(sb_scope,
+            aml_operation_region("PCSB", AML_SYSTEM_IO, 0xae0c, 0x01));
+        field = aml_field("PCSB", AML_ANY_ACC, AML_NOLOCK, AML_WRITE_AS_ZEROS);
+        aml_append(field, aml_named_field("PCIB", 8));
+        aml_append(sb_scope, field);
+        aml_append(dsdt, sb_scope);
+
+        sb_scope = aml_scope("_SB");
+        dev = aml_device("PCI0");
+        aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0A08")));
+        aml_append(dev, aml_name_decl("_CID", aml_eisaid("PNP0A03")));
+        aml_append(dev, aml_name_decl("_ADR", aml_int(0)));
+        aml_append(dev, aml_name_decl("_UID", aml_int(1)));
+        aml_append(dev, aml_name_decl("SUPP", aml_int(0)));
+        aml_append(dev, aml_name_decl("CTRL", aml_int(0)));
+        aml_append(dev, build_q35_osc_method());
+        aml_append(sb_scope, dev);
+        aml_append(dsdt, sb_scope);
+
+        build_hpet_aml(dsdt);
+        build_q35_isa_bridge(dsdt);
+        build_isa_devices_aml(dsdt);
+        build_q35_pci0_int(dsdt);
+    }
+
+    build_cpu_hotplug_aml(dsdt);
+    build_memory_hotplug_aml(dsdt, nr_mem, pm->mem_hp_io_base,
+                             pm->mem_hp_io_len);
+
+    scope =  aml_scope("_GPE");
+    {
+        aml_append(scope, aml_name_decl("_HID", aml_string("ACPI0006")));
+
+        aml_append(scope, aml_method("_L00", 0, AML_NOTSERIALIZED));
+
+        if (misc->is_piix4) {
+            method = aml_method("_E01", 0, AML_NOTSERIALIZED);
+            aml_append(method,
+                aml_acquire(aml_name("\\_SB.PCI0.BLCK"), 0xFFFF));
+            aml_append(method, aml_call0("\\_SB.PCI0.PCNT"));
+            aml_append(method, aml_release(aml_name("\\_SB.PCI0.BLCK")));
+            aml_append(scope, method);
+        } else {
+            aml_append(scope, aml_method("_L01", 0, AML_NOTSERIALIZED));
+        }
+
+        method = aml_method("_E02", 0, AML_NOTSERIALIZED);
+        aml_append(method, aml_call0("\\_SB." CPU_SCAN_METHOD));
+        aml_append(scope, method);
+
+        method = aml_method("_E03", 0, AML_NOTSERIALIZED);
+        aml_append(method, aml_call0(MEMORY_HOTPLUG_HANDLER_PATH));
+        aml_append(scope, method);
+
+        aml_append(scope, aml_method("_L04", 0, AML_NOTSERIALIZED));
+        aml_append(scope, aml_method("_L05", 0, AML_NOTSERIALIZED));
+        aml_append(scope, aml_method("_L06", 0, AML_NOTSERIALIZED));
+        aml_append(scope, aml_method("_L07", 0, AML_NOTSERIALIZED));
+        aml_append(scope, aml_method("_L08", 0, AML_NOTSERIALIZED));
+        aml_append(scope, aml_method("_L09", 0, AML_NOTSERIALIZED));
+        aml_append(scope, aml_method("_L0A", 0, AML_NOTSERIALIZED));
+        aml_append(scope, aml_method("_L0B", 0, AML_NOTSERIALIZED));
+        aml_append(scope, aml_method("_L0C", 0, AML_NOTSERIALIZED));
+        aml_append(scope, aml_method("_L0D", 0, AML_NOTSERIALIZED));
+        aml_append(scope, aml_method("_L0E", 0, AML_NOTSERIALIZED));
+        aml_append(scope, aml_method("_L0F", 0, AML_NOTSERIALIZED));
+    }
+    aml_append(dsdt, scope);
 
     bus = PC_MACHINE(machine)->bus;
     if (bus) {
@@ -1985,7 +2074,7 @@ build_ssdt(GArray *table_data, GArray *linker,
                             io_ranges, mem_ranges);
             aml_append(dev, aml_name_decl("_CRS", crs));
             aml_append(scope, dev);
-            aml_append(ssdt, scope);
+            aml_append(dsdt, scope);
         }
     }
 
@@ -2069,7 +2158,7 @@ build_ssdt(GArray *table_data, GArray *linker,
         aml_append(dev, aml_name_decl("_CRS", crs));
         aml_append(scope, dev);
     }
-    aml_append(ssdt, scope);
+    aml_append(dsdt, scope);
 
     /*  create S3_ / S4_ / S5_ packages if necessary */
     scope = aml_scope("\\");
@@ -2098,7 +2187,7 @@ build_ssdt(GArray *table_data, GArray *linker,
     aml_append(pkg, aml_int(0)); /* reserved */
     aml_append(pkg, aml_int(0)); /* reserved */
     aml_append(scope, aml_name_decl("_S5", pkg));
-    aml_append(ssdt, scope);
+    aml_append(dsdt, scope);
 
     if (misc->applesmc_io_base) {
         scope = aml_scope("\\_SB.PCI0.ISA");
@@ -2117,7 +2206,7 @@ build_ssdt(GArray *table_data, GArray *linker,
         aml_append(dev, aml_name_decl("_CRS", crs));
 
         aml_append(scope, dev);
-        aml_append(ssdt, scope);
+        aml_append(dsdt, scope);
     }
 
     if (misc->pvpanic_port) {
@@ -2151,7 +2240,7 @@ build_ssdt(GArray *table_data, GArray *linker,
         aml_append(dev, method);
 
         aml_append(scope, dev);
-        aml_append(ssdt, scope);
+        aml_append(dsdt, scope);
     }
 
     sb_scope = aml_scope("\\_SB");
@@ -2190,14 +2279,14 @@ build_ssdt(GArray *table_data, GArray *linker,
                 aml_append(sb_scope, scope);
             }
         }
-        aml_append(ssdt, sb_scope);
+        aml_append(dsdt, sb_scope);
     }
 
     /* copy AML table into ACPI tables blob and patch header there */
-    g_array_append_vals(table_data, ssdt->buf->data, ssdt->buf->len);
+    g_array_append_vals(table_data, dsdt->buf->data, dsdt->buf->len);
     build_header(linker, table_data,
-        (void *)(table_data->data + table_data->len - ssdt->buf->len),
-        "SSDT", ssdt->buf->len, 1, NULL);
+        (void *)(table_data->data + table_data->len - dsdt->buf->len),
+        "DSDT", dsdt->buf->len, 1, NULL);
     free_aml_allocator();
 }
 
@@ -2423,116 +2512,6 @@ build_dmar_q35(GArray *table_data, GArray *linker)
                  "DMAR", table_data->len - dmar_start, 1, NULL);
 }
 
-static void
-build_dsdt(GArray *table_data, GArray *linker,
-           AcpiPmInfo *pm, AcpiMiscInfo *misc)
-{
-    Aml *dsdt, *sb_scope, *scope, *dev, *method, *field;
-    MachineState *machine = MACHINE(qdev_get_machine());
-    uint32_t nr_mem = machine->ram_slots;
-
-    dsdt = init_aml_allocator();
-
-    /* Reserve space for header */
-    acpi_data_push(dsdt->buf, sizeof(AcpiTableHeader));
-
-    build_dbg_aml(dsdt);
-    if (misc->is_piix4) {
-        sb_scope = aml_scope("_SB");
-        dev = aml_device("PCI0");
-        aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0A03")));
-        aml_append(dev, aml_name_decl("_ADR", aml_int(0)));
-        aml_append(dev, aml_name_decl("_UID", aml_int(1)));
-        aml_append(sb_scope, dev);
-        aml_append(dsdt, sb_scope);
-
-        build_hpet_aml(dsdt);
-        build_piix4_pm(dsdt);
-        build_piix4_isa_bridge(dsdt);
-        build_isa_devices_aml(dsdt);
-        build_piix4_pci_hotplug(dsdt);
-        build_piix4_pci0_int(dsdt);
-    } else {
-        sb_scope = aml_scope("_SB");
-        aml_append(sb_scope,
-            aml_operation_region("PCST", AML_SYSTEM_IO, 0xae00, 0x0c));
-        aml_append(sb_scope,
-            aml_operation_region("PCSB", AML_SYSTEM_IO, 0xae0c, 0x01));
-        field = aml_field("PCSB", AML_ANY_ACC, AML_NOLOCK, AML_WRITE_AS_ZEROS);
-        aml_append(field, aml_named_field("PCIB", 8));
-        aml_append(sb_scope, field);
-        aml_append(dsdt, sb_scope);
-
-        sb_scope = aml_scope("_SB");
-        dev = aml_device("PCI0");
-        aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0A08")));
-        aml_append(dev, aml_name_decl("_CID", aml_eisaid("PNP0A03")));
-        aml_append(dev, aml_name_decl("_ADR", aml_int(0)));
-        aml_append(dev, aml_name_decl("_UID", aml_int(1)));
-        aml_append(dev, aml_name_decl("SUPP", aml_int(0)));
-        aml_append(dev, aml_name_decl("CTRL", aml_int(0)));
-        aml_append(dev, build_q35_osc_method());
-        aml_append(sb_scope, dev);
-        aml_append(dsdt, sb_scope);
-
-        build_hpet_aml(dsdt);
-        build_q35_isa_bridge(dsdt);
-        build_isa_devices_aml(dsdt);
-        build_q35_pci0_int(dsdt);
-    }
-
-    build_cpu_hotplug_aml(dsdt);
-    build_memory_hotplug_aml(dsdt, nr_mem, pm->mem_hp_io_base,
-                             pm->mem_hp_io_len);
-
-    scope =  aml_scope("_GPE");
-    {
-        aml_append(scope, aml_name_decl("_HID", aml_string("ACPI0006")));
-
-        aml_append(scope, aml_method("_L00", 0, AML_NOTSERIALIZED));
-
-        if (misc->is_piix4) {
-            method = aml_method("_E01", 0, AML_NOTSERIALIZED);
-            aml_append(method,
-                aml_acquire(aml_name("\\_SB.PCI0.BLCK"), 0xFFFF));
-            aml_append(method, aml_call0("\\_SB.PCI0.PCNT"));
-            aml_append(method, aml_release(aml_name("\\_SB.PCI0.BLCK")));
-            aml_append(scope, method);
-        } else {
-            aml_append(scope, aml_method("_L01", 0, AML_NOTSERIALIZED));
-        }
-
-        method = aml_method("_E02", 0, AML_NOTSERIALIZED);
-        aml_append(method, aml_call0("\\_SB." CPU_SCAN_METHOD));
-        aml_append(scope, method);
-
-        method = aml_method("_E03", 0, AML_NOTSERIALIZED);
-        aml_append(method, aml_call0(MEMORY_HOTPLUG_HANDLER_PATH));
-        aml_append(scope, method);
-
-        aml_append(scope, aml_method("_L04", 0, AML_NOTSERIALIZED));
-        aml_append(scope, aml_method("_L05", 0, AML_NOTSERIALIZED));
-        aml_append(scope, aml_method("_L06", 0, AML_NOTSERIALIZED));
-        aml_append(scope, aml_method("_L07", 0, AML_NOTSERIALIZED));
-        aml_append(scope, aml_method("_L08", 0, AML_NOTSERIALIZED));
-        aml_append(scope, aml_method("_L09", 0, AML_NOTSERIALIZED));
-        aml_append(scope, aml_method("_L0A", 0, AML_NOTSERIALIZED));
-        aml_append(scope, aml_method("_L0B", 0, AML_NOTSERIALIZED));
-        aml_append(scope, aml_method("_L0C", 0, AML_NOTSERIALIZED));
-        aml_append(scope, aml_method("_L0D", 0, AML_NOTSERIALIZED));
-        aml_append(scope, aml_method("_L0E", 0, AML_NOTSERIALIZED));
-        aml_append(scope, aml_method("_L0F", 0, AML_NOTSERIALIZED));
-    }
-    aml_append(dsdt, scope);
-
-    /* copy AML table into ACPI tables blob and patch header there */
-    g_array_append_vals(table_data, dsdt->buf->data, dsdt->buf->len);
-    build_header(linker, table_data,
-        (void *)(table_data->data + table_data->len - dsdt->buf->len),
-        "DSDT", dsdt->buf->len, 1, NULL);
-    free_aml_allocator();
-}
-
 static GArray *
 build_rsdp(GArray *rsdp_table, GArray *linker, unsigned rsdt)
 {
@@ -2612,7 +2591,7 @@ static
 void acpi_build(PcGuestInfo *guest_info, AcpiBuildTables *tables)
 {
     GArray *table_offsets;
-    unsigned facs, ssdt, dsdt, rsdt;
+    unsigned facs, dsdt, rsdt, fadt;
     AcpiCpuInfo cpu;
     AcpiPmInfo pm;
     AcpiMiscInfo misc;
@@ -2645,7 +2624,8 @@ void acpi_build(PcGuestInfo *guest_info, AcpiBuildTables *tables)
 
     /* DSDT is pointed to by FADT */
     dsdt = tables_blob->len;
-    build_dsdt(tables_blob, tables->linker, &pm, &misc);
+    build_dsdt(tables_blob, tables->linker, &cpu, &pm, &misc, &pci,
+               guest_info);
 
     /* Count the size of the DSDT and SSDT, we will need it for legacy
      * sizing of ACPI tables.
@@ -2653,14 +2633,10 @@ void acpi_build(PcGuestInfo *guest_info, AcpiBuildTables *tables)
     aml_len += tables_blob->len - dsdt;
 
     /* ACPI tables pointed to by RSDT */
+    fadt = tables_blob->len;
     acpi_add_table(table_offsets, tables_blob);
     build_fadt(tables_blob, tables->linker, &pm, facs, dsdt);
-
-    ssdt = tables_blob->len;
-    acpi_add_table(table_offsets, tables_blob);
-    build_ssdt(tables_blob, tables->linker, &cpu, &pm, &misc, &pci,
-               guest_info);
-    aml_len += tables_blob->len - ssdt;
+    aml_len += tables_blob->len - fadt;
 
     acpi_add_table(table_offsets, tables_blob);
     build_madt(tables_blob, tables->linker, &cpu, guest_info);
-- 
1.8.3.1

[Qemu-devel] [PATCH 2/3] tests: pc: acpi: drop not needed 'expected SSDT' blobs

[Igor Mammedov]

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
 tests/acpi-test-data/pc/SSDT         | Bin 2486 -> 0 bytes
 tests/acpi-test-data/pc/SSDT.bridge  | Bin 4345 -> 0 bytes
 tests/acpi-test-data/q35/SSDT        | Bin 691 -> 0 bytes
 tests/acpi-test-data/q35/SSDT.bridge | Bin 708 -> 0 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 tests/acpi-test-data/pc/SSDT
 delete mode 100644 tests/acpi-test-data/pc/SSDT.bridge
 delete mode 100644 tests/acpi-test-data/q35/SSDT
 delete mode 100644 tests/acpi-test-data/q35/SSDT.bridge

diff --git a/tests/acpi-test-data/pc/SSDT b/tests/acpi-test-data/pc/SSDT
deleted file mode 100644
index 210d6a71e58aa34ce8e94121d25bcf58c3bd503c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2486
zcma)-Pjk~o7{=eVMWU=_A{&JSLWr(#pbjB{-fT-EjvFaES~~;d%;?ZzYGyhO1LeTv
zl7zwSy<dO>XMF3m{RqAF%6I5Yn^WEQmHaw6upNAm_tEp)XaBFX4tu{Y0Ej=^`$0$h
z?I$YG_)Y)-mFeG&YKQkS-Og07+px1B)wTA#{Nd*+lpM4HCiD<H;@mlRgpKcoQ>It{
zpndMlbag`DUq3Aa6h452$)rLk{z{NL)FS=t$>g_xi{kHpzk$J7VC|>~+wbg#Rh6hl
ztFaAs)<;F}{g=;P9ld_}?Xy?-QukW2QuMSc<&O9?{xlXAg>)^|QR(MGaBzO-=*Jh|
zzy9ujv*06q6y6(f?;KJ~n^}F%64+@hKgjB~B}=lDt1WV90B-BuAx+=l>>KMI&7n#o
zop-@${UPUyF$AjrWzCOaEPNcwiAr@(RA4Oq!KsrAd}K{`@OCp$jYctbo|DC`9()K?
z+yWFhGbD5mylNJ88v;etg`rnVdXJx$-pgNxFrw<u?Lh4(^|BCdY#)AA=Jk&|DzxJ;
zNpZlm6Y}}Rb(F9|o$9DK#ZF1NGB{l)QI6C0o{x_XKK7`zhb8qS!(Oiu(1NCnBb|wO
zH_;+a;{y>#-AoKlmx}s2!dm;$0X}r#dvh^$)Qykw-PlGKm$jlBjm*wkVT$6e-k1v9
ze<kp6Wi~?ikQeTAVUr4jvpag@5mwawM3(dVSfvbJJ)avDL|tltY(no-ETI;omJ#LD
zD~w(-p_`nFI{^oP9hftsoI20wya|24sWzjw5#`hcMi)%z7N<%^r4i*+Jcz}xDkgNB
zQyoSfBg&~&Myn?DA*Wtt^r{i%)I~-YP3R*|bs2SyD5usKt(nlTIknDc-H3APHAb(Q
z&=#lS5h#|xGoqZj#ORU<ZFA~%Mz0%DPF-en*@On1y29v+5#`hyjNUMzA*bGC^rjKz
z)Kx}TO=!faw-~);L^*Yh(KQqLm{V^vdfSL{>N=zApF_RQYIu<JO7ETHp|oK{cir<`
zxG3;8D}+yiohAyrkqYO81Uc2?VFd&#yjG^FL~7<)sPJ-_deqj|%%jHeh)+FgZF}ZX
zb9hjv9<}$7yv5@o-h=p69cesptns^w`ohPr>qz6#Vc*X6h3}HaL%_bD>kGe08n-k1
zC%L}x^AY35WFJ2!BOP4wY1FvIW<HHOyyVl!akI>PpY$cai5i!E=AV#8-&<Ef(t{V!
RPWmw|A%5%nVp<4g`9EqZL>~YE

diff --git a/tests/acpi-test-data/pc/SSDT.bridge b/tests/acpi-test-data/pc/SSDT.bridge
deleted file mode 100644
index 6e6660b1fbe0bdb7fe0b257cb53c31fa9bb21a14..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4345
zcmeH}KX2Pc7{>1;#%4}bOeu8iIC0FOL!H5u<3DjXNhD)gG3f(OG7``zha#u~6itvc
z1p+U&3aH)t1w3SqK0^Bu`Vlhp8x&}rrRw{VdSws3qGJYWpzh)G<8yc9@m?zBcRt#T
zakqKkwUpa@B0UA?IAaXk_-_Z5qqS5uQ|ay1%+!ljr8z6U`?<^t7TAo9@W6NZxpi)F
z6V7w1h^PJr``nu7@(95{e_CKH_ZbsxG%6tqzXHn~>=A$FX!PqpdGoiw-m;|c8M`uo
z{#$!~Sw^zfsBJSd?SjJd?yG07U%Yws^|RM-Qgs@ll#jG5#4i6Z{4nGOhO`aYlJQj`
zFgdsN;`^81zWL@qv)Fs~o;z=uy?TT_ZKTy1gTtVqy_r@`Lli_IQ(NfZ1Z@A~5#GL}
z|JYc=dnn^TWkawUzl)iC4xa4(zwU=@$X%GqiHuc;m)KCa$*GkIIHYwu`EkROwOW4b
z94ieQ9rn(XVS|ByJA*=Xm{U%Jc8!Aw+N|ePqRykIg){L>j}7qh=cXqQqH2+IJ2a2J
zDAMx}Thcc}KZ;?(xDvAa3(rxoMI2O1hA|9Eh{fb|1w}E8oBJ*tT5#CM);_f4lN3h1
zj6j3cMHr}*hkKFYVH_UvFleVdIi1h1R{>mg5FElmd9E`P;y~^CAK7Ybf(wteq-wR)
zOdEa-;=WoR3s`>z=D?F#_u0Fw@qii|*hu;ZKdAMc{7Qg}%)~&R^gqi3RX2ipVysim
zZkP0eHX<oFN&j<I!;7KKGYTU3)#PeECLl$DP#D@(p@5D<MUl{=4t;<##Z-e(LyJ=C
zHA1iH&<#q3#R-##Y0YR+N}VNiR)=m<s!6D+MJe?<q1Scj7NrV8g%+h$*c<X`m2~Jf
zrCNkqT9i`DgqC&aLrT3t=nXAOsdI$R>ChcYwF$MgD5X{it?1A%DYZ&yRf|&UO+s(#
z&<3T#TbVxsM~hPGJfZVCv`MMA2)(66DRqI+1s&>9>LQ_wT9i_66M9>R`jomv=#mzt
z)H{UU(V+pQ-X-*|7Nyi>LYH;uBTBtT=shh;sVju8T!lK(vVRzL3TLI`9%lpGWuKo}
z$33W-Aa=&W00Db=?wBaZu|dF|mpd*Ba_S&p-^!g66zG(XdnMSD2MRWyvBI7<CmwbM
zTgceMzP2VFb_N^4*u&noCmwbOuk+Z${vM(?cihX00BCqENy7&L=nEe{3kC{aF!Iez
zU-<ArHc;@Yknd*t!mp!-MNj@orZ4<##;|<JhblNw-X$Mr4GVGN<GlS#KF%DL)WmmD
zU-IjqVR20S6V%{4E7FTP>?LnT-4Gu%6zMJ>H+)e{`m6Z(rX?%C1JjZ<Em_l&^{JPv
g$4hz1!ZJ0jKUm*B-TJed*B_>-KVPlkrvx(p0-RC(E&u=k

diff --git a/tests/acpi-test-data/q35/SSDT b/tests/acpi-test-data/q35/SSDT
deleted file mode 100644
index 0970c67ddb1456707c0111f7e5e659ef385af408..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 691
zcmaJ<&2G~`5S~pUV{JB)8wF7g2w&k)41tOhs=apOgsijjx>b=Q?EzI33AL!DhaQkf
zkbpZcz@cxz1HdD2%zJPkC(MjZIkJcG_sx&K`LQu^@wElO-bOQ-8b3PF(x8t40Ac!i
zV=>>dCbC+N1J}yjY(&@i@uwcN1cm`BGHk@wVl9}9ekR)F`i0@O_{Vz{CI0+)1E7fm
zaHy&-rQ&Nr9U(<}->d4|@4xWL1(ZwK8R-P|({bF>nGV8W8(h1GjQsxT;n~Ug>GQ)g
zbebaM-KNtX=OgAjzQeo=@b1hhI<$SK!%ztEL)&*dyv1<`$R1IIM7_z)IgMN{pLVur
zZk;El))wIp?lihm@A>J;o7b<-U;I~oC02s@IKw-gn}T&$g8St{)C7&)@yho@se_;y
zcOa|^3%Hb8g@6R7Az}&`^lUN-7?NZHM}v*5*nQUe!apCu2P%K*N<GW^ZN@z1&hNFa
zZl+QlyDH9d9FeY9?*w<xVUwClwaQr+INvN6w~4e>9!-5TDViyvDI$GfvFlru5W)^u
ziLp$LGs9G__L)j1mX(X^O}$C5YL@JyG14D6iW>EHJG9Ai*)>66T^q(Zp7pK?9ybL4
X76t>n!u=R7Yw+L-3~S(MnHBH{@bQ-c

diff --git a/tests/acpi-test-data/q35/SSDT.bridge b/tests/acpi-test-data/q35/SSDT.bridge
deleted file mode 100644
index a77868861754ce0b3333b2b7bc8091c03a53754d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 708
zcmaJ<&2G~`5T12{u{ImwMn+Uf6~4luxC9U<RA+7Cq*-_6b*myr+5@U65~8T3hu%n#
zfIBb1q3;0)9)M%sg9ABXX5yA3dl-M;{OFq>8<Uhj900a4*p-<H2M1aj^f3S+OkaN_
zrkmCbtd^t5v$8O2gX{dw=Poz`!vHlIHe^e&6wE_E6D@N6#_&@7<K3DPe|@?I(8K{a
z)OCka@j0-HkRrYBb^YznC471g)m*lRIz|0#lyr5jqd0mDp4~%6{_y1R^!V)L#o;MB
zO&Rk}(`lFUAq(BmW&Sz%cc&EX+n(EID1`W-?RjnPaNGg1M-(AZf9Lj;My}>N?M<3n
z7pYlki})vZ8(pdQ!tD6n+t+6=|0}-`3&BF1;k_<Q$vO+c!)hj01dZMHs}Fstqo^4-
z5LU${Tu7~AK!Vc{F(m|Dn~o!fBpt(1u$Gt4o;zRpmm~N{<*z)cck^D0F<*Jp`>m^+
zsZ1xHO7a3nr0cDAg1hIiPEBQ66|4iCuUE4>L|UpCOhPmnnhBu^B7I=7>kUeXVVkSe
zSf)m~VX9F3Or>MXs@ct^-lSNyo9?4AG7MZrjrzlDw8?7TF;Qea8z%*x^`42IGz9+^
g1_54SD}jp@cyI;!1giNBvvpaBxef%bmU#((0Zb>F0RR91

-- 
1.8.3.1

[Qemu-devel] [PATCH 3/3] tests: pc: acpi: add expected DSDT.bridge blobs and update DSDT blobs

[Igor Mammedov]

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
 tests/acpi-test-data/pc/DSDT         | Bin 3028 -> 5478 bytes
 tests/acpi-test-data/pc/DSDT.bridge  | Bin 0 -> 7337 bytes
 tests/acpi-test-data/q35/DSDT        | Bin 7666 -> 8321 bytes
 tests/acpi-test-data/q35/DSDT.bridge | Bin 0 -> 8338 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 tests/acpi-test-data/pc/DSDT.bridge
 create mode 100644 tests/acpi-test-data/q35/DSDT.bridge

diff --git a/tests/acpi-test-data/pc/DSDT b/tests/acpi-test-data/pc/DSDT
index c658203db94a7e7db7c36fde99a7075a8d75498d..ec0e642b06967d3ec4d7a7d252b82b916f37a5e0 100644
GIT binary patch
delta 2489
zcma)-zi!)B6voe$6q~uCVoIT7Cyrw+9g-oHqu6mbNhEDqHI)lp$!H-19E!9uP}D)v
z41ovQE~<9#3wX#Jp-<4xojUXZGUWvdw4SP-L+Z$`kPDOpaX)@Pe)k^UKm23q{R8Q1
zzx(APfO!A2{4F0lLGj>Wq#Kd)b}Lrob#$>YFTeS*02v$T8q-behzt9|78X7ic9tIf
zjrN5-)rB#EfBvupkoo`;#^XGpcx51QM5@3VkAL}x+A+Ydf4zqOnU~v90S=(K>laj8
zRqB;Zu%aF+dR~6<?B&s`7hgPki4S$RF7xS73sUZgccXVBk)x1SPBm5MLm^mQxq0;M
z^RHih^`ESGHVodvTj9P2=l%h8RgFq>If28*_T#8z<zz-?6171NmEhFBKcElTKl?QI
zkiMeo1UeamUH@IqrA2tE_doj|!AO*`m=o2}U6F^8EcZ|CMBpu|IsNado~l%+YXH}d
z!g?3pcq*)uz;a0FF1Up#XjKG?palcB*zRtBo;jC44PZ#GA6lMz+AhUeA)L@U_&CdJ
zAZ#k%3jKBmOQzM3d}5qS3ClF9rV2YaDk+!yr)wm#VW+WI##<9_d(_&)mijEhVXqQU
zhnfrn9f@$atwq=g_eB`ABGErxY^s<7bbzlt4fgS-y|OzO(omi7C|QyXba86)x>AX(
zsP1=AJkaYCfr~H$E>6z64{wsjBW_fw(LcMd*SGLR-D}Hi@;<(j1-F!Z9Tj^)i+UiR
z*hiF0Y>wI7l$}L6_8OztOlXx;aW!BCID)we8VfZOTjkh!X6H?@k2%(2)H0%+dY#eh
z2^!-PnH|9f$4X|UDRzTnaX+So<xS`&r`n9#h{owO%zT4Qjx8`-FvULM*c*)AFru8g
zz~}<Rybxwau*I<svyLfti(`w77ES0UoLXWuE*V*ly~*rN6I$n3+z9C`xJHyy7gH3^
z-$fJK;MiLnd&`J&>=L6(Ce-89WkO@x49iBAV{dcpZ4>Hq>>Wn$7*S4Lv7$KrUMnUx
z;Mltyd)J6^>?)(HCUl!q@5RjCGqN1J#^~CIP`A0_@3*^|bNhH8Ef~_NcbEtV1s-du
zD3f5P2E$n6*_2u*XyM^=cwRUj<Uydq^JStkq^4dD6&?~3k2=G1V4|ou-0BlW-Qi}Q
zDC|$;ew`@l?@3JN!tnrC0sdr%8uuM*{LP}i^zmmq)VPD#w-SBnJEU<duwPE}rC%eB
zYnuHN(sAPwNNUFA$pHRYhT6O0Q{A}Erao2fU-7ASTrg9=O!|snLyc2E^-o~<k={nY
ZT~l7W3(uj^?u9gs_~+}1NyC@fe*yRDOW6Pb

delta 19
acmaE+bw!-ZCD<k83O54-W6MUaQ``VTv<4{v

diff --git a/tests/acpi-test-data/pc/DSDT.bridge b/tests/acpi-test-data/pc/DSDT.bridge
new file mode 100644
index 0000000000000000000000000000000000000000..7b1c14b529f9f63fc3731c02225ce37c5cfbc0db
GIT binary patch
literal 7337
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
OKt%m{_X=Gl2=iY>7yVlR

literal 0
HcmV?d00001

diff --git a/tests/acpi-test-data/q35/DSDT b/tests/acpi-test-data/q35/DSDT
index 4723e5954dccb00995ccaf521b7daf6bf15cf1d4..b492f04b8866ae82eaded81aa0ea2d3a4969dc5c 100644
GIT binary patch
delta 680
zcmaJ<&2G~`5S~pUV{JB)8yQg!6~4lu7y<|h3DvRPI3eq<ylw?@q&-v>MM4y{^w5(@
zkbpZcz@aa|6VNj!j(G&ma3CkljIDBH52Np!ncZ)G_UEH{z#|>ya}R)h`@(;0l+IYp
zHjN${6^?z|gqdC&Ug57k_MjzzPDO@|*h;Jfv(e8)n_Ry!yb}L-ucE|XAFcs3aR3fg
z)umKCEvO@`VQ^7ZU;hv;0WKb&L9qxsBNbx-$vEn%RQZAb0Bp01jQrm5!O79-@&3UH
zI&~iKZc}QH^AYnb&tlFQI5%e$9hkn=VW@=op6S~i-r}vA-KPktI+N=&>bY2yPdb~_
zxyoW)i;Lhpw;JJ4?Rv@4o7XQ-pZ`~XDVBnH*u-0v>6~?!f_ueW)C7&$a*B6@Q29Pd
z1GvJ-Acyl%$pA`Z*bgzCgWEIl#Ait22^_j>X}<le^_hP<g!gp+g&nG$wBKgTk@oC%
z`*LkEQIRd9G{cr@f%Q~y{2bP)szk|*b%FEsVt#{2TV}(lhbHk#nN0~!6HltA2J7CS
zi~zQ{jJ08MoN6XBxyNKYF|3$hZ644u-r9-x(CE-}ElHI++Z~!^vFK{wH?|3)3^#jA
d`wts}KZb#eYq=A_c@6HmmuOG}OND6;e*yABm`VTu

delta 19
acmZp4{AA7L66_N4NtS_u@z6%D7qS3EV+Okb

diff --git a/tests/acpi-test-data/q35/DSDT.bridge b/tests/acpi-test-data/q35/DSDT.bridge
new file mode 100644
index 0000000000000000000000000000000000000000..3b72e250fa866ec34c315450643025e03c8c8cab
GIT binary patch
literal 8338
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

literal 0
HcmV?d00001

-- 
1.8.3.1

Re: [Qemu-devel] [PATCH 0/3] merge SSDT into DSDT

[Michael S. Tsirkin]

On Fri, Jan 22, 2016 at 03:36:05PM +0100, Igor Mammedov wrote:
> Merging both tables will allow for futher ASL
> simplification and cleanups per device/subsystem
> And it also allows to reduce number of expected
> binary blobs for ACPI tests which reduces tests
> maintenance.

What this does break, however, is adding XSDT which
we might need to do in the future.
I'd rather do the reverse and have as much as possible
in the SSDT.

> Boot tested with RHEL72, WS2003, WS2012R2 guests.
> 
> git tree for testing:
> https://github.com/imammedo/qemu.git merge_ssdt_into_dsdt_v1 
> 
> Igor Mammedov (3):
>   pc: acpi: merge SSDT into DSDT
>   tests: pc: acpi: drop not needed 'expected SSDT' blobs
>   tests: pc: acpi: add expected DSDT.bridge blobs and update DSDT blobs
> 
>  hw/i386/acpi-build.c                 | 246 ++++++++++++++++-------------------
>  tests/acpi-test-data/pc/DSDT         | Bin 3028 -> 5478 bytes
>  tests/acpi-test-data/pc/DSDT.bridge  | Bin 0 -> 7337 bytes
>  tests/acpi-test-data/pc/SSDT         | Bin 2486 -> 0 bytes
>  tests/acpi-test-data/pc/SSDT.bridge  | Bin 4345 -> 0 bytes
>  tests/acpi-test-data/q35/DSDT        | Bin 7666 -> 8321 bytes
>  tests/acpi-test-data/q35/DSDT.bridge | Bin 0 -> 8338 bytes
>  tests/acpi-test-data/q35/SSDT        | Bin 691 -> 0 bytes
>  tests/acpi-test-data/q35/SSDT.bridge | Bin 708 -> 0 bytes
>  9 files changed, 111 insertions(+), 135 deletions(-)
>  create mode 100644 tests/acpi-test-data/pc/DSDT.bridge
>  delete mode 100644 tests/acpi-test-data/pc/SSDT
>  delete mode 100644 tests/acpi-test-data/pc/SSDT.bridge
>  create mode 100644 tests/acpi-test-data/q35/DSDT.bridge
>  delete mode 100644 tests/acpi-test-data/q35/SSDT
>  delete mode 100644 tests/acpi-test-data/q35/SSDT.bridge
> 
> -- 
> 1.8.3.1

Re: [Qemu-devel] [PATCH 0/3] merge SSDT into DSDT

[Igor Mammedov]

On Sun, 24 Jan 2016 08:32:23 +0200
"Michael S. Tsirkin" <mst@redhat.com> wrote:

> On Fri, Jan 22, 2016 at 03:36:05PM +0100, Igor Mammedov wrote:
> > Merging both tables will allow for futher ASL
> > simplification and cleanups per device/subsystem
> > And it also allows to reduce number of expected
> > binary blobs for ACPI tests which reduces tests
> > maintenance.
> 
> What this does break, however, is adding XSDT which
> we might need to do in the future.
> I'd rather do the reverse and have as much as possible
> in the SSDT.
It doesn't forbid us adding XSDT later,
DSDT should be kept XP compatible as it's more or less now
and incompatible features we could put in their own SSDTs
if we decide to go for XSDT approach to hide them form XP.
For example I plan to move cpu/memory hotplug ASL into separate
SSDTs and continue to simplify DSDT on top of this series.

> 
> > Boot tested with RHEL72, WS2003, WS2012R2 guests.
> > 
> > git tree for testing:
> > https://github.com/imammedo/qemu.git merge_ssdt_into_dsdt_v1 
> > 
> > Igor Mammedov (3):
> >   pc: acpi: merge SSDT into DSDT
> >   tests: pc: acpi: drop not needed 'expected SSDT' blobs
> >   tests: pc: acpi: add expected DSDT.bridge blobs and update DSDT
> > blobs
> > 
> >  hw/i386/acpi-build.c                 | 246
> > ++++++++++++++++-------------------
> > tests/acpi-test-data/pc/DSDT         | Bin 3028 -> 5478 bytes
> > tests/acpi-test-data/pc/DSDT.bridge  | Bin 0 -> 7337 bytes
> > tests/acpi-test-data/pc/SSDT         | Bin 2486 -> 0 bytes
> > tests/acpi-test-data/pc/SSDT.bridge  | Bin 4345 -> 0 bytes
> > tests/acpi-test-data/q35/DSDT        | Bin 7666 -> 8321 bytes
> > tests/acpi-test-data/q35/DSDT.bridge | Bin 0 -> 8338 bytes
> > tests/acpi-test-data/q35/SSDT        | Bin 691 -> 0 bytes
> > tests/acpi-test-data/q35/SSDT.bridge | Bin 708 -> 0 bytes 9 files
> > changed, 111 insertions(+), 135 deletions(-) create mode 100644
> > tests/acpi-test-data/pc/DSDT.bridge delete mode 100644
> > tests/acpi-test-data/pc/SSDT delete mode 100644
> > tests/acpi-test-data/pc/SSDT.bridge create mode 100644
> > tests/acpi-test-data/q35/DSDT.bridge delete mode 100644
> > tests/acpi-test-data/q35/SSDT delete mode 100644
> > tests/acpi-test-data/q35/SSDT.bridge
> > 
> > -- 
> > 1.8.3.1
> 

Re: [Qemu-devel] [PATCH 0/3] merge SSDT into DSDT

[Michael S. Tsirkin]

On Mon, Jan 25, 2016 at 12:57:28PM +0100, Igor Mammedov wrote:
> On Sun, 24 Jan 2016 08:32:23 +0200
> "Michael S. Tsirkin" <mst@redhat.com> wrote:
> 
> > On Fri, Jan 22, 2016 at 03:36:05PM +0100, Igor Mammedov wrote:
> > > Merging both tables will allow for futher ASL
> > > simplification and cleanups per device/subsystem
> > > And it also allows to reduce number of expected
> > > binary blobs for ACPI tests which reduces tests
> > > maintenance.
> > 
> > What this does break, however, is adding XSDT which
> > we might need to do in the future.
> > I'd rather do the reverse and have as much as possible
> > in the SSDT.
> It doesn't forbid us adding XSDT later,

Right but we'll have to duplicate dsdt in xsdt, right?

> DSDT should be kept XP compatible as it's more or less now
> and incompatible features we could put in their own SSDTs
> if we decide to go for XSDT approach to hide them form XP.
> For example I plan to move cpu/memory hotplug ASL into separate
> SSDTs and continue to simplify DSDT on top of this series.

So I'm kind of confused. Why move hotplug to dsdt then move
them back out to an SSDT? Let's just put everything in an
SSDT ...

> > 
> > > Boot tested with RHEL72, WS2003, WS2012R2 guests.
> > > 
> > > git tree for testing:
> > > https://github.com/imammedo/qemu.git merge_ssdt_into_dsdt_v1 
> > > 
> > > Igor Mammedov (3):
> > >   pc: acpi: merge SSDT into DSDT
> > >   tests: pc: acpi: drop not needed 'expected SSDT' blobs
> > >   tests: pc: acpi: add expected DSDT.bridge blobs and update DSDT
> > > blobs
> > > 
> > >  hw/i386/acpi-build.c                 | 246
> > > ++++++++++++++++-------------------
> > > tests/acpi-test-data/pc/DSDT         | Bin 3028 -> 5478 bytes
> > > tests/acpi-test-data/pc/DSDT.bridge  | Bin 0 -> 7337 bytes
> > > tests/acpi-test-data/pc/SSDT         | Bin 2486 -> 0 bytes
> > > tests/acpi-test-data/pc/SSDT.bridge  | Bin 4345 -> 0 bytes
> > > tests/acpi-test-data/q35/DSDT        | Bin 7666 -> 8321 bytes
> > > tests/acpi-test-data/q35/DSDT.bridge | Bin 0 -> 8338 bytes
> > > tests/acpi-test-data/q35/SSDT        | Bin 691 -> 0 bytes
> > > tests/acpi-test-data/q35/SSDT.bridge | Bin 708 -> 0 bytes 9 files
> > > changed, 111 insertions(+), 135 deletions(-) create mode 100644
> > > tests/acpi-test-data/pc/DSDT.bridge delete mode 100644
> > > tests/acpi-test-data/pc/SSDT delete mode 100644
> > > tests/acpi-test-data/pc/SSDT.bridge create mode 100644
> > > tests/acpi-test-data/q35/DSDT.bridge delete mode 100644
> > > tests/acpi-test-data/q35/SSDT delete mode 100644
> > > tests/acpi-test-data/q35/SSDT.bridge
> > > 
> > > -- 
> > > 1.8.3.1
> > 

Re: [Qemu-devel] [PATCH 0/3] merge SSDT into DSDT

[Igor Mammedov]

On Mon, 25 Jan 2016 15:01:36 +0200
"Michael S. Tsirkin" <mst@redhat.com> wrote:

> On Mon, Jan 25, 2016 at 12:57:28PM +0100, Igor Mammedov wrote:
> > On Sun, 24 Jan 2016 08:32:23 +0200
> > "Michael S. Tsirkin" <mst@redhat.com> wrote:
> >   
> > > On Fri, Jan 22, 2016 at 03:36:05PM +0100, Igor Mammedov wrote:  
> > > > Merging both tables will allow for futher ASL
> > > > simplification and cleanups per device/subsystem
> > > > And it also allows to reduce number of expected
> > > > binary blobs for ACPI tests which reduces tests
> > > > maintenance.  
> > > 
> > > What this does break, however, is adding XSDT which
> > > we might need to do in the future.
> > > I'd rather do the reverse and have as much as possible
> > > in the SSDT.  
> > It doesn't forbid us adding XSDT later,  
> 
> Right but we'll have to duplicate dsdt in xsdt, right?
nope, DSDT is pointed by FADT while SSDTs by RSDT/XSDT.

The only reason why we have DSDT/SSDT split now is that
DSDT used to be static while SSDT generated dynamically.
Now when both tables are dynamically generated there
is no point to keep them separate.

I don't see any benefit in keeping empty DSDT as you
suggest with all the content in SSDT, it the same as
having only DSDT table but we have to maintain 2 tables
in code and tests.
If at some point we use XSDT to hide non XP compatible
ASL (if that works at all) then SSDT is the place where
that non compat ASL should be put and pointed only by XSDT,
while the the rest of compatible code should stay in 
the main mandatory table (i.e. DSDT).

> 
> > DSDT should be kept XP compatible as it's more or less now
> > and incompatible features we could put in their own SSDTs
> > if we decide to go for XSDT approach to hide them form XP.
> > For example I plan to move cpu/memory hotplug ASL into separate
> > SSDTs and continue to simplify DSDT on top of this series.  
> 
> So I'm kind of confused. Why move hotplug to dsdt then move
> them back out to an SSDT? Let's just put everything in an
> SSDT ...
because right now cpu/mem hotplug ASL is split between both
tables so the first step to isolating and consolidating scattered
parts is to put everything into one table. After that it
will be more easy to verify changes that refactoring will
introduce using bios-tables-test and should simplify refactoring
patches and review.

As for moving hotplug into dedicated SSDTs, it's for purpose
of sharing that code with ARM target and later we possible
could use it also to hide XP incompatible ASL in them by
referencing them from only XSDT.

Why do you insist on putting everything into SSDT instead of DSDT?

> 
> > >   
> > > > Boot tested with RHEL72, WS2003, WS2012R2 guests.
> > > > 
> > > > git tree for testing:
> > > > https://github.com/imammedo/qemu.git merge_ssdt_into_dsdt_v1 
> > > > 
> > > > Igor Mammedov (3):
> > > >   pc: acpi: merge SSDT into DSDT
> > > >   tests: pc: acpi: drop not needed 'expected SSDT' blobs
> > > >   tests: pc: acpi: add expected DSDT.bridge blobs and update DSDT
> > > > blobs
> > > > 
> > > >  hw/i386/acpi-build.c                 | 246
> > > > ++++++++++++++++-------------------
> > > > tests/acpi-test-data/pc/DSDT         | Bin 3028 -> 5478 bytes
> > > > tests/acpi-test-data/pc/DSDT.bridge  | Bin 0 -> 7337 bytes
> > > > tests/acpi-test-data/pc/SSDT         | Bin 2486 -> 0 bytes
> > > > tests/acpi-test-data/pc/SSDT.bridge  | Bin 4345 -> 0 bytes
> > > > tests/acpi-test-data/q35/DSDT        | Bin 7666 -> 8321 bytes
> > > > tests/acpi-test-data/q35/DSDT.bridge | Bin 0 -> 8338 bytes
> > > > tests/acpi-test-data/q35/SSDT        | Bin 691 -> 0 bytes
> > > > tests/acpi-test-data/q35/SSDT.bridge | Bin 708 -> 0 bytes 9 files
> > > > changed, 111 insertions(+), 135 deletions(-) create mode 100644
> > > > tests/acpi-test-data/pc/DSDT.bridge delete mode 100644
> > > > tests/acpi-test-data/pc/SSDT delete mode 100644
> > > > tests/acpi-test-data/pc/SSDT.bridge create mode 100644
> > > > tests/acpi-test-data/q35/DSDT.bridge delete mode 100644
> > > > tests/acpi-test-data/q35/SSDT delete mode 100644
> > > > tests/acpi-test-data/q35/SSDT.bridge
> > > > 
> > > > -- 
> > > > 1.8.3.1  
> > >   
> 

Re: [Qemu-devel] [PATCH 0/3] merge SSDT into DSDT

[Michael S. Tsirkin]

On Tue, Jan 26, 2016 at 10:55:04AM +0100, Igor Mammedov wrote:
> On Mon, 25 Jan 2016 15:01:36 +0200
> "Michael S. Tsirkin" <mst@redhat.com> wrote:
> 
> > On Mon, Jan 25, 2016 at 12:57:28PM +0100, Igor Mammedov wrote:
> > > On Sun, 24 Jan 2016 08:32:23 +0200
> > > "Michael S. Tsirkin" <mst@redhat.com> wrote:
> > >   
> > > > On Fri, Jan 22, 2016 at 03:36:05PM +0100, Igor Mammedov wrote:  
> > > > > Merging both tables will allow for futher ASL
> > > > > simplification and cleanups per device/subsystem
> > > > > And it also allows to reduce number of expected
> > > > > binary blobs for ACPI tests which reduces tests
> > > > > maintenance.  
> > > > 
> > > > What this does break, however, is adding XSDT which
> > > > we might need to do in the future.
> > > > I'd rather do the reverse and have as much as possible
> > > > in the SSDT.  
> > > It doesn't forbid us adding XSDT later,  
> > 
> > Right but we'll have to duplicate dsdt in xsdt, right?
> nope, DSDT is pointed by FADT while SSDTs by RSDT/XSDT.

Oops, I was confused when I wrote this.
You are right, I'll go back and review
everything in light of this.


> The only reason why we have DSDT/SSDT split now is that
> DSDT used to be static while SSDT generated dynamically.
> Now when both tables are dynamically generated there
> is no point to keep them separate.
> 
> I don't see any benefit in keeping empty DSDT as you
> suggest with all the content in SSDT, it the same as
> having only DSDT table but we have to maintain 2 tables
> in code and tests.
> If at some point we use XSDT to hide non XP compatible
> ASL (if that works at all) then SSDT is the place where
> that non compat ASL should be put and pointed only by XSDT,
> while the the rest of compatible code should stay in 
> the main mandatory table (i.e. DSDT).
> > 
> > > DSDT should be kept XP compatible as it's more or less now
> > > and incompatible features we could put in their own SSDTs
> > > if we decide to go for XSDT approach to hide them form XP.
> > > For example I plan to move cpu/memory hotplug ASL into separate
> > > SSDTs and continue to simplify DSDT on top of this series.  
> > 
> > So I'm kind of confused. Why move hotplug to dsdt then move
> > them back out to an SSDT? Let's just put everything in an
> > SSDT ...
> because right now cpu/mem hotplug ASL is split between both
> tables so the first step to isolating and consolidating scattered
> parts is to put everything into one table. After that it
> will be more easy to verify changes that refactoring will
> introduce using bios-tables-test and should simplify refactoring
> patches and review.
> 
> As for moving hotplug into dedicated SSDTs, it's for purpose
> of sharing that code with ARM target and later we possible
> could use it also to hide XP incompatible ASL in them by
> referencing them from only XSDT.
> 
> Why do you insist on putting everything into SSDT instead of DSDT?
> > 
> > > >   
> > > > > Boot tested with RHEL72, WS2003, WS2012R2 guests.
> > > > > 
> > > > > git tree for testing:
> > > > > https://github.com/imammedo/qemu.git merge_ssdt_into_dsdt_v1 
> > > > > 
> > > > > Igor Mammedov (3):
> > > > >   pc: acpi: merge SSDT into DSDT
> > > > >   tests: pc: acpi: drop not needed 'expected SSDT' blobs
> > > > >   tests: pc: acpi: add expected DSDT.bridge blobs and update DSDT
> > > > > blobs
> > > > > 
> > > > >  hw/i386/acpi-build.c                 | 246
> > > > > ++++++++++++++++-------------------
> > > > > tests/acpi-test-data/pc/DSDT         | Bin 3028 -> 5478 bytes
> > > > > tests/acpi-test-data/pc/DSDT.bridge  | Bin 0 -> 7337 bytes
> > > > > tests/acpi-test-data/pc/SSDT         | Bin 2486 -> 0 bytes
> > > > > tests/acpi-test-data/pc/SSDT.bridge  | Bin 4345 -> 0 bytes
> > > > > tests/acpi-test-data/q35/DSDT        | Bin 7666 -> 8321 bytes
> > > > > tests/acpi-test-data/q35/DSDT.bridge | Bin 0 -> 8338 bytes
> > > > > tests/acpi-test-data/q35/SSDT        | Bin 691 -> 0 bytes
> > > > > tests/acpi-test-data/q35/SSDT.bridge | Bin 708 -> 0 bytes 9 files
> > > > > changed, 111 insertions(+), 135 deletions(-) create mode 100644
> > > > > tests/acpi-test-data/pc/DSDT.bridge delete mode 100644
> > > > > tests/acpi-test-data/pc/SSDT delete mode 100644
> > > > > tests/acpi-test-data/pc/SSDT.bridge create mode 100644
> > > > > tests/acpi-test-data/q35/DSDT.bridge delete mode 100644
> > > > > tests/acpi-test-data/q35/SSDT delete mode 100644
> > > > > tests/acpi-test-data/q35/SSDT.bridge
> > > > > 
> > > > > -- 
> > > > > 1.8.3.1  
> > > >   
> > 

Re: [Qemu-devel] [PATCH 0/3] merge SSDT into DSDT

[Igor Mammedov]

On Fri, 22 Jan 2016 15:36:05 +0100
Igor Mammedov <imammedo@redhat.com> wrote:

> Merging both tables will allow for futher ASL
> simplification and cleanups per device/subsystem
> And it also allows to reduce number of expected
> binary blobs for ACPI tests which reduces tests
> maintenance.
ping

> 
> Boot tested with RHEL72, WS2003, WS2012R2 guests.
> 
> git tree for testing:
> https://github.com/imammedo/qemu.git merge_ssdt_into_dsdt_v1 
> 
> Igor Mammedov (3):
>   pc: acpi: merge SSDT into DSDT
>   tests: pc: acpi: drop not needed 'expected SSDT' blobs
>   tests: pc: acpi: add expected DSDT.bridge blobs and update DSDT blobs
> 
>  hw/i386/acpi-build.c                 | 246 ++++++++++++++++-------------------
>  tests/acpi-test-data/pc/DSDT         | Bin 3028 -> 5478 bytes
>  tests/acpi-test-data/pc/DSDT.bridge  | Bin 0 -> 7337 bytes
>  tests/acpi-test-data/pc/SSDT         | Bin 2486 -> 0 bytes
>  tests/acpi-test-data/pc/SSDT.bridge  | Bin 4345 -> 0 bytes
>  tests/acpi-test-data/q35/DSDT        | Bin 7666 -> 8321 bytes
>  tests/acpi-test-data/q35/DSDT.bridge | Bin 0 -> 8338 bytes
>  tests/acpi-test-data/q35/SSDT        | Bin 691 -> 0 bytes
>  tests/acpi-test-data/q35/SSDT.bridge | Bin 708 -> 0 bytes
>  9 files changed, 111 insertions(+), 135 deletions(-)
>  create mode 100644 tests/acpi-test-data/pc/DSDT.bridge
>  delete mode 100644 tests/acpi-test-data/pc/SSDT
>  delete mode 100644 tests/acpi-test-data/pc/SSDT.bridge
>  create mode 100644 tests/acpi-test-data/q35/DSDT.bridge
>  delete mode 100644 tests/acpi-test-data/q35/SSDT
>  delete mode 100644 tests/acpi-test-data/q35/SSDT.bridge
>