[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-arm] [Qemu-devel] [PATCH 7/9] acpi: move build_fadt() from i38
From: |
Auger Eric |
Subject: |
Re: [Qemu-arm] [Qemu-devel] [PATCH 7/9] acpi: move build_fadt() from i386 specific to generic ACPI source |
Date: |
Tue, 27 Feb 2018 15:15:55 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 |
On 22/02/18 13:42, Igor Mammedov wrote:
> it will be extended and reused in follow up patch by ARM target
>
> Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Eric Auger <address@hidden>
Eric
> ---
> include/hw/acpi/aml-build.h | 3 ++
> hw/acpi/aml-build.c | 105 +++++++++++++++++++++++++++++++++++++++++++
> hw/arm/virt-acpi-build.c | 6 +--
> hw/i386/acpi-build.c | 106
> --------------------------------------------
> 4 files changed, 111 insertions(+), 109 deletions(-)
>
> diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h
> index 8692ccc..6c36903 100644
> --- a/include/hw/acpi/aml-build.h
> +++ b/include/hw/acpi/aml-build.h
> @@ -413,4 +413,7 @@ void build_srat_memory(AcpiSratMemoryAffinity *numamem,
> uint64_t base,
> uint64_t len, int node, MemoryAffinityFlags flags);
>
> void build_slit(GArray *table_data, BIOSLinker *linker);
> +
> +void build_fadt(GArray *tbl, BIOSLinker *linker, const AcpiFadtData *f,
> + const char *oem_id, const char *oem_table_id);
> #endif
> diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
> index 3fef5f6..17fb71b 100644
> --- a/hw/acpi/aml-build.c
> +++ b/hw/acpi/aml-build.c
> @@ -1678,3 +1678,108 @@ void build_slit(GArray *table_data, BIOSLinker
> *linker)
> "SLIT",
> table_data->len - slit_start, 1, NULL, NULL);
> }
> +
> +/* build rev1/rev3 FADT */
> +void build_fadt(GArray *tbl, BIOSLinker *linker, const AcpiFadtData *f,
> + const char *oem_id, const char *oem_table_id)
> +{
> + int off;
> + int fadt_start = tbl->len;
> +
> + acpi_data_push(tbl, sizeof(AcpiTableHeader));
> +
> + /* FACS address to be filled by Guest linker at runtime */
> + off = tbl->len;
> + build_append_int_noprefix(tbl, 0, 4); /* FIRMWARE_CTRL */
> + if (f->facs_tbl_offset) {
> + bios_linker_loader_add_pointer(linker,
> + ACPI_BUILD_TABLE_FILE, off, 4,
> + ACPI_BUILD_TABLE_FILE, *f->facs_tbl_offset);
> + }
> +
> + /* DSDT address to be filled by Guest linker at runtime */
> + off = tbl->len;
> + build_append_int_noprefix(tbl, 0, 4); /* DSDT */
> + if (f->dsdt_tbl_offset) {
> + bios_linker_loader_add_pointer(linker,
> + ACPI_BUILD_TABLE_FILE, off, 4,
> + ACPI_BUILD_TABLE_FILE, *f->dsdt_tbl_offset);
> + }
> +
> + /* ACPI1.0: INT_MODEL, ACPI2.0+: Reserved */
> + build_append_int_noprefix(tbl, f->int_model /* Multiple APIC */, 1);
> + /* Preferred_PM_Profile */
> + build_append_int_noprefix(tbl, 0 /* Unspecified */, 1);
> + build_append_int_noprefix(tbl, f->sci_int, 2); /* SCI_INT */
> + build_append_int_noprefix(tbl, f->smi_cmd, 4); /* SMI_CMD */
> + build_append_int_noprefix(tbl, f->acpi_enable_cmd, 1); /* ACPI_ENABLE */
> + build_append_int_noprefix(tbl, f->acpi_disable_cmd, 1); /* ACPI_DISABLE
> */
> + build_append_int_noprefix(tbl, 0 /* not supported */, 1); /* S4BIOS_REQ
> */
> + /* ACPI1.0: Reserved, ACPI2.0+: PSTATE_CNT */
> + build_append_int_noprefix(tbl, 0, 1);
> + build_append_int_noprefix(tbl, f->pm1_evt.address, 4); /* PM1a_EVT_BLK */
> + build_append_int_noprefix(tbl, 0, 4); /* PM1b_EVT_BLK */
> + build_append_int_noprefix(tbl, f->pm1_cnt.address, 4); /* PM1a_CNT_BLK */
> + build_append_int_noprefix(tbl, 0, 4); /* PM1b_CNT_BLK */
> + build_append_int_noprefix(tbl, 0, 4); /* PM2_CNT_BLK */
> + build_append_int_noprefix(tbl, f->pm_tmr.address, 4); /* PM_TMR_BLK */
> + build_append_int_noprefix(tbl, f->gpe0_blk.address, 4); /* GPE0_BLK */
> + build_append_int_noprefix(tbl, 0, 4); /* GPE1_BLK */
> + /* PM1_EVT_LEN */
> + build_append_int_noprefix(tbl, f->pm1_evt.bit_width / 8, 1);
> + /* PM1_CNT_LEN */
> + build_append_int_noprefix(tbl, f->pm1_cnt.bit_width / 8, 1);
> + build_append_int_noprefix(tbl, 0, 1); /* PM2_CNT_LEN */
> + build_append_int_noprefix(tbl, f->pm_tmr.bit_width / 8, 1); /*
> PM_TMR_LEN */
> + /* GPE0_BLK_LEN */
> + build_append_int_noprefix(tbl, f->gpe0_blk.bit_width / 8, 1);
> + build_append_int_noprefix(tbl, 0, 1); /* GPE1_BLK_LEN */
> + build_append_int_noprefix(tbl, 0, 1); /* GPE1_BASE */
> + build_append_int_noprefix(tbl, 0, 1); /* CST_CNT */
> + build_append_int_noprefix(tbl, f->c2_latency, 2); /* P_LVL2_LAT */
> + build_append_int_noprefix(tbl, f->c3_latency, 2); /* P_LVL3_LAT */
> + build_append_int_noprefix(tbl, 0, 2); /* FLUSH_SIZE */
> + build_append_int_noprefix(tbl, 0, 2); /* FLUSH_STRIDE */
> + build_append_int_noprefix(tbl, 0, 1); /* DUTY_OFFSET */
> + build_append_int_noprefix(tbl, 0, 1); /* DUTY_WIDTH */
> + build_append_int_noprefix(tbl, 0, 1); /* DAY_ALRM */
> + build_append_int_noprefix(tbl, 0, 1); /* MON_ALRM */
> + build_append_int_noprefix(tbl, f->rtc_century, 1); /* CENTURY */
> + build_append_int_noprefix(tbl, 0, 2); /* IAPC_BOOT_ARCH */
> + build_append_int_noprefix(tbl, 0, 1); /* Reserved */
> + build_append_int_noprefix(tbl, f->flags, 4); /* Flags */
> +
> + if (f->rev == 1) {
> + goto build_hdr;
> + }
> +
> + build_append_gas_from_struct(tbl, &f->reset_reg); /* RESET_REG */
> + build_append_int_noprefix(tbl, f->reset_val, 1); /* RESET_VALUE */
> + build_append_int_noprefix(tbl, 0, 3); /* Reserved, ACPI 3.0 */
> + build_append_int_noprefix(tbl, 0, 8); /* X_FIRMWARE_CTRL */
> +
> + /* XDSDT address to be filled by Guest linker at runtime */
> + off = tbl->len;
> + build_append_int_noprefix(tbl, 0, 8); /* X_DSDT */
> + if (f->xdsdt_tbl_offset) {
> + bios_linker_loader_add_pointer(linker,
> + ACPI_BUILD_TABLE_FILE, off, 8,
> + ACPI_BUILD_TABLE_FILE, *f->xdsdt_tbl_offset);
> + }
> +
> + build_append_gas_from_struct(tbl, &f->pm1_evt); /* X_PM1a_EVT_BLK */
> + /* X_PM1b_EVT_BLK */
> + build_append_gas(tbl, AML_AS_SYSTEM_MEMORY, 0 , 0, 0, 0);
> + build_append_gas_from_struct(tbl, &f->pm1_cnt); /* X_PM1a_CNT_BLK */
> + /* X_PM1b_CNT_BLK */
> + build_append_gas(tbl, AML_AS_SYSTEM_MEMORY, 0 , 0, 0, 0);
> + /* X_PM2_CNT_BLK */
> + build_append_gas(tbl, AML_AS_SYSTEM_MEMORY, 0 , 0, 0, 0);
> + build_append_gas_from_struct(tbl, &f->pm_tmr); /* X_PM_TMR_BLK */
> + build_append_gas_from_struct(tbl, &f->gpe0_blk); /* X_GPE0_BLK */
> + build_append_gas(tbl, AML_AS_SYSTEM_MEMORY, 0 , 0, 0, 0); /* X_GPE1_BLK
> */
> +
> +build_hdr:
> + build_header(linker, tbl, (void *)(tbl->data + fadt_start),
> + "FACP", tbl->len - fadt_start, f->rev, oem_id,
> oem_table_id);
> +}
> diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
> index f7fa795..b644da9 100644
> --- a/hw/arm/virt-acpi-build.c
> +++ b/hw/arm/virt-acpi-build.c
> @@ -651,8 +651,8 @@ build_madt(GArray *table_data, BIOSLinker *linker,
> VirtMachineState *vms)
> }
>
> /* FADT */
> -static void build_fadt(GArray *table_data, BIOSLinker *linker,
> - VirtMachineState *vms, unsigned dsdt_tbl_offset)
> +static void build_fadt_rev5(GArray *table_data, BIOSLinker *linker,
> + VirtMachineState *vms, unsigned dsdt_tbl_offset)
> {
> int fadt_start = table_data->len;
> AcpiFadtDescriptorRev5_1 *fadt = acpi_data_push(table_data,
> sizeof(*fadt));
> @@ -761,7 +761,7 @@ void virt_acpi_build(VirtMachineState *vms,
> AcpiBuildTables *tables)
>
> /* FADT MADT GTDT MCFG SPCR pointed to by RSDT */
> acpi_add_table(table_offsets, tables_blob);
> - build_fadt(tables_blob, tables->linker, vms, dsdt);
> + build_fadt_rev5(tables_blob, tables->linker, vms, dsdt);
>
> acpi_add_table(table_offsets, tables_blob);
> build_madt(tables_blob, tables->linker, vms);
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index 544a4bc..898a7e8 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -299,112 +299,6 @@ build_facs(GArray *table_data, BIOSLinker *linker)
> facs->length = cpu_to_le32(sizeof(*facs));
> }
>
> -/* FADT */
> -static void
> -build_fadt(GArray *tbl, BIOSLinker *linker, AcpiFadtData *f,
> - const char *oem_id, const char *oem_table_id)
> -{
> - int off;
> - int fadt_start = tbl->len;
> -
> - acpi_data_push(tbl, sizeof(AcpiTableHeader));
> -
> - /* FACS address to be filled by Guest linker at runtime */
> - off = tbl->len;
> - build_append_int_noprefix(tbl, 0, 4); /* FIRMWARE_CTRL */
> - if (f->facs_tbl_offset) {
> - bios_linker_loader_add_pointer(linker,
> - ACPI_BUILD_TABLE_FILE, off, 4,
> - ACPI_BUILD_TABLE_FILE, *f->facs_tbl_offset);
> - }
> -
> - /* DSDT address to be filled by Guest linker at runtime */
> - off = tbl->len;
> - build_append_int_noprefix(tbl, 0, 4); /* DSDT */
> - if (f->dsdt_tbl_offset) {
> - bios_linker_loader_add_pointer(linker,
> - ACPI_BUILD_TABLE_FILE, off, 4,
> - ACPI_BUILD_TABLE_FILE, *f->dsdt_tbl_offset);
> - }
> -
> - /* ACPI1.0: INT_MODEL, ACPI2.0+: Reserved */
> - build_append_int_noprefix(tbl, f->int_model /* Multiple APIC */, 1);
> - /* Preferred_PM_Profile */
> - build_append_int_noprefix(tbl, 0 /* Unspecified */, 1);
> - build_append_int_noprefix(tbl, f->sci_int, 2); /* SCI_INT */
> - build_append_int_noprefix(tbl, f->smi_cmd, 4); /* SMI_CMD */
> - build_append_int_noprefix(tbl, f->acpi_enable_cmd, 1); /* ACPI_ENABLE */
> - build_append_int_noprefix(tbl, f->acpi_disable_cmd, 1); /* ACPI_DISABLE
> */
> - build_append_int_noprefix(tbl, 0 /* not supported */, 1); /* S4BIOS_REQ
> */
> - /* ACPI1.0: Reserved, ACPI2.0+: PSTATE_CNT */
> - build_append_int_noprefix(tbl, 0, 1);
> - build_append_int_noprefix(tbl, f->pm1_evt.address, 4); /* PM1a_EVT_BLK */
> - build_append_int_noprefix(tbl, 0, 4); /* PM1b_EVT_BLK */
> - build_append_int_noprefix(tbl, f->pm1_cnt.address, 4); /* PM1a_CNT_BLK */
> - build_append_int_noprefix(tbl, 0, 4); /* PM1b_CNT_BLK */
> - build_append_int_noprefix(tbl, 0, 4); /* PM2_CNT_BLK */
> - build_append_int_noprefix(tbl, f->pm_tmr.address, 4); /* PM_TMR_BLK */
> - build_append_int_noprefix(tbl, f->gpe0_blk.address, 4); /* GPE0_BLK */
> - build_append_int_noprefix(tbl, 0, 4); /* GPE1_BLK */
> - /* PM1_EVT_LEN */
> - build_append_int_noprefix(tbl, f->pm1_evt.bit_width / 8, 1);
> - /* PM1_CNT_LEN */
> - build_append_int_noprefix(tbl, f->pm1_cnt.bit_width / 8, 1);
> - build_append_int_noprefix(tbl, 0, 1); /* PM2_CNT_LEN */
> - build_append_int_noprefix(tbl, f->pm_tmr.bit_width / 8, 1); /*
> PM_TMR_LEN */
> - /* GPE0_BLK_LEN */
> - build_append_int_noprefix(tbl, f->gpe0_blk.bit_width / 8, 1);
> - build_append_int_noprefix(tbl, 0, 1); /* GPE1_BLK_LEN */
> - build_append_int_noprefix(tbl, 0, 1); /* GPE1_BASE */
> - build_append_int_noprefix(tbl, 0, 1); /* CST_CNT */
> - build_append_int_noprefix(tbl, f->c2_latency, 2); /* P_LVL2_LAT */
> - build_append_int_noprefix(tbl, f->c3_latency, 2); /* P_LVL3_LAT */
> - build_append_int_noprefix(tbl, 0, 2); /* FLUSH_SIZE */
> - build_append_int_noprefix(tbl, 0, 2); /* FLUSH_STRIDE */
> - build_append_int_noprefix(tbl, 0, 1); /* DUTY_OFFSET */
> - build_append_int_noprefix(tbl, 0, 1); /* DUTY_WIDTH */
> - build_append_int_noprefix(tbl, 0, 1); /* DAY_ALRM */
> - build_append_int_noprefix(tbl, 0, 1); /* MON_ALRM */
> - build_append_int_noprefix(tbl, f->rtc_century, 1); /* CENTURY */
> - build_append_int_noprefix(tbl, 0, 2); /* IAPC_BOOT_ARCH */
> - build_append_int_noprefix(tbl, 0, 1); /* Reserved */
> - build_append_int_noprefix(tbl, f->flags, 4); /* Flags */
> -
> - if (f->rev == 1) {
> - goto build_hdr;
> - }
> -
> - build_append_gas_from_struct(tbl, &f->reset_reg); /* RESET_REG */
> - build_append_int_noprefix(tbl, f->reset_val, 1); /* RESET_VALUE */
> - build_append_int_noprefix(tbl, 0, 3); /* Reserved, ACPI 3.0 */
> - build_append_int_noprefix(tbl, 0, 8); /* X_FIRMWARE_CTRL */
> -
> - /* XDSDT address to be filled by Guest linker at runtime */
> - off = tbl->len;
> - build_append_int_noprefix(tbl, 0, 8); /* X_DSDT */
> - if (f->xdsdt_tbl_offset) {
> - bios_linker_loader_add_pointer(linker,
> - ACPI_BUILD_TABLE_FILE, off, 8,
> - ACPI_BUILD_TABLE_FILE, *f->xdsdt_tbl_offset);
> - }
> -
> - build_append_gas_from_struct(tbl, &f->pm1_evt); /* X_PM1a_EVT_BLK */
> - /* X_PM1b_EVT_BLK */
> - build_append_gas(tbl, AML_AS_SYSTEM_MEMORY, 0 , 0, 0, 0);
> - build_append_gas_from_struct(tbl, &f->pm1_cnt); /* X_PM1a_CNT_BLK */
> - /* X_PM1b_CNT_BLK */
> - build_append_gas(tbl, AML_AS_SYSTEM_MEMORY, 0 , 0, 0, 0);
> - /* X_PM2_CNT_BLK */
> - build_append_gas(tbl, AML_AS_SYSTEM_MEMORY, 0 , 0, 0, 0);
> - build_append_gas_from_struct(tbl, &f->pm_tmr); /* X_PM_TMR_BLK */
> - build_append_gas_from_struct(tbl, &f->gpe0_blk); /* X_GPE0_BLK */
> - build_append_gas(tbl, AML_AS_SYSTEM_MEMORY, 0 , 0, 0, 0); /* X_GPE1_BLK
> */
> -
> -build_hdr:
> - build_header(linker, tbl, (void *)(tbl->data + fadt_start),
> - "FACP", tbl->len - fadt_start, f->rev, oem_id,
> oem_table_id);
> -}
> -
> void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid,
> const CPUArchIdList *apic_ids, GArray *entry)
> {
>
- [Qemu-arm] [PATCH 2/9] pc: replace pm object initialization with one-liner in acpi_get_pm_info(), (continued)
- [Qemu-arm] [PATCH 2/9] pc: replace pm object initialization with one-liner in acpi_get_pm_info(), Igor Mammedov, 2018/02/22
- [Qemu-arm] [PATCH 4/9] acpi: add build_append_gas() helper for Generic Address Structure, Igor Mammedov, 2018/02/22
- [Qemu-arm] [PATCH 5/9] pc: acpi: isolate FADT specific data into AcpiFadtData structure, Igor Mammedov, 2018/02/22
- [Qemu-arm] [PATCH 6/9] pc: acpi: use build_append_foo() API to construct FADT, Igor Mammedov, 2018/02/22
- [Qemu-arm] [PATCH 7/9] acpi: move build_fadt() from i386 specific to generic ACPI source, Igor Mammedov, 2018/02/22
- Re: [Qemu-arm] [Qemu-devel] [PATCH 7/9] acpi: move build_fadt() from i386 specific to generic ACPI source,
Auger Eric <=
- [Qemu-arm] [PATCH 8/9] virt_arm: acpi: reuse common build_fadt(), Igor Mammedov, 2018/02/22
- [Qemu-arm] [PATCH 9/9] tests: acpi: don't read all fields in test_acpi_fadt_table(), Igor Mammedov, 2018/02/22