All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Alex Bennée" <alex.bennee@linaro.org>
To: Shannon Zhao <zhaoshenglong@huawei.com>
Cc: peter.maydell@linaro.org, hangaohuai@huawei.com, mst@redhat.com,
	a.spyridakis@virtualopensystems.com, claudio.fontana@huawei.com,
	qemu-devel@nongnu.org, peter.huangpeng@huawei.com,
	hanjun.guo@linaro.org, imammedo@redhat.com, pbonzini@redhat.com,
	lersek@redhat.com, christoffer.dall@linaro.org,
	shannon.zhao@linaro.org
Subject: Re: [Qemu-devel] [PATCH v6 06/22] hw/arm/virt-acpi-build: Generation of DSDT table for virt devices
Date: Mon, 18 May 2015 09:09:25 +0100	[thread overview]
Message-ID: <87y4kme28a.fsf@linaro.org> (raw)
In-Reply-To: <1430990964-10528-7-git-send-email-zhaoshenglong@huawei.com>


Shannon Zhao <zhaoshenglong@huawei.com> writes:

> From: Shannon Zhao <shannon.zhao@linaro.org>
>
> DSDT consists of the usual common table header plus a definition
> block in AML encoding which describes all devices in the platform.
>
> After initializing DSDT with header information the namespace is
> created which is followed by the device encodings. The devices are
> described using the Resource Template for the 32-Bit Fixed Memory
> Range and the Extended Interrupt Descriptors.
>
> Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com>
> Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>


> ---
>  hw/arm/virt-acpi-build.c | 128 +++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 128 insertions(+)
>
> diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
> index 960206d..1a00ad7 100644
> --- a/hw/arm/virt-acpi-build.c
> +++ b/hw/arm/virt-acpi-build.c
> @@ -42,6 +42,130 @@
>  #include "hw/hw.h"
>  #include "hw/acpi/aml-build.h"
>  
> +static void acpi_dsdt_add_cpus(Aml *scope, int smp_cpus)
> +{
> +    uint16_t i;
> +
> +    for (i = 0; i < smp_cpus; i++) {
> +        Aml *dev = aml_device("C%03x", i);
> +        aml_append(dev, aml_name_decl("_HID", aml_string("ACPI0007")));
> +        aml_append(dev, aml_name_decl("_UID", aml_int(i)));
> +        Aml *crs = aml_resource_template();
> +        aml_append(dev, aml_name_decl("_CRS", crs));
> +        aml_append(scope, dev);
> +    }
> +}
> +
> +static void acpi_dsdt_add_uart(Aml *scope, const MemMap *uart_memmap,
> +                                           const int *uart_irq)
> +{
> +    Aml *dev = aml_device("COM0");
> +    aml_append(dev, aml_name_decl("_HID", aml_string("ARMH0011")));
> +    aml_append(dev, aml_name_decl("_UID", aml_int(0)));
> +
> +    Aml *crs = aml_resource_template();
> +    aml_append(crs, aml_memory32_fixed(uart_memmap->addr,
> +                                       uart_memmap->size, aml_ReadWrite));
> +    aml_append(crs,
> +               aml_interrupt(aml_consumer, aml_level, aml_active_high,
> +               aml_exclusive, aml_not_wake_capable, *uart_irq + 32));
> +    aml_append(dev, aml_name_decl("_CRS", crs));
> +    aml_append(scope, dev);
> +}
> +
> +static void acpi_dsdt_add_rtc(Aml *scope, const MemMap *rtc_memmap,
> +                                          const int *rtc_irq)
> +{
> +    Aml *dev = aml_device("RTC0");
> +    aml_append(dev, aml_name_decl("_HID", aml_string("LNRO0013")));
> +    aml_append(dev, aml_name_decl("_UID", aml_int(0)));
> +
> +    Aml *crs = aml_resource_template();
> +    aml_append(crs, aml_memory32_fixed(rtc_memmap->addr,
> +                                       rtc_memmap->size, aml_ReadWrite));
> +    aml_append(crs,
> +               aml_interrupt(aml_consumer, aml_level, aml_active_high,
> +               aml_exclusive, aml_not_wake_capable, *rtc_irq + 32));
> +    aml_append(dev, aml_name_decl("_CRS", crs));
> +    aml_append(scope, dev);
> +}
> +
> +static void acpi_dsdt_add_flash(Aml *scope, const MemMap *flash_memmap)
> +{
> +    Aml *dev, *crs;
> +    hwaddr base = flash_memmap->addr;
> +    hwaddr size = flash_memmap->size;
> +
> +    dev = aml_device("FLS0");
> +    aml_append(dev, aml_name_decl("_HID", aml_string("LNRO0015")));
> +    aml_append(dev, aml_name_decl("_UID", aml_int(0)));
> +
> +    crs = aml_resource_template();
> +    aml_append(crs, aml_memory32_fixed(base, size, aml_ReadWrite));
> +    aml_append(dev, aml_name_decl("_CRS", crs));
> +    aml_append(scope, dev);
> +
> +    dev = aml_device("FLS1");
> +    aml_append(dev, aml_name_decl("_HID", aml_string("LNRO0015")));
> +    aml_append(dev, aml_name_decl("_UID", aml_int(1)));
> +    crs = aml_resource_template();
> +    aml_append(crs, aml_memory32_fixed(base + size, size, aml_ReadWrite));
> +    aml_append(dev, aml_name_decl("_CRS", crs));
> +    aml_append(scope, dev);
> +}
> +
> +static void acpi_dsdt_add_virtio(Aml *scope, const MemMap *virtio_mmio_memmap,
> +                                             const int *mmio_irq, int num)
> +{
> +    hwaddr base = virtio_mmio_memmap->addr;
> +    hwaddr size = virtio_mmio_memmap->size;
> +    int irq = *mmio_irq + 32;
> +    int i;
> +
> +    for (i = 0; i < num; i++) {
> +        Aml *dev = aml_device("VR%02u", i);
> +        aml_append(dev, aml_name_decl("_HID", aml_string("LNRO0005")));
> +        aml_append(dev, aml_name_decl("_UID", aml_int(i)));
> +
> +        Aml *crs = aml_resource_template();
> +        aml_append(crs, aml_memory32_fixed(base, size, aml_ReadWrite));
> +        aml_append(crs,
> +                   aml_interrupt(aml_consumer, aml_level, aml_active_high,
> +                   aml_exclusive, aml_not_wake_capable, irq + i));
> +        aml_append(dev, aml_name_decl("_CRS", crs));
> +        aml_append(scope, dev);
> +        base += size;
> +    }
> +}
> +
> +/* DSDT */
> +static void
> +build_dsdt(GArray *table_data, GArray *linker, VirtGuestInfo *guest_info)
> +{
> +    Aml *scope, *dsdt;
> +    AcpiDsdtInfo *info = guest_info->dsdt_info;
> +
> +    dsdt = init_aml_allocator();
> +    /* Reserve space for header */
> +    acpi_data_push(dsdt->buf, sizeof(AcpiTableHeader));
> +
> +    scope = aml_scope("\\_SB");
> +    acpi_dsdt_add_cpus(scope, guest_info->smp_cpus);
> +    acpi_dsdt_add_uart(scope, info->uart_memmap, info->uart_irq);
> +    acpi_dsdt_add_rtc(scope, info->rtc_memmap, info->rtc_irq);
> +    acpi_dsdt_add_flash(scope, info->flash_memmap);
> +    acpi_dsdt_add_virtio(scope, info->virtio_mmio_memmap,
> +             info->virtio_mmio_irq, info->virtio_mmio_num);
> +    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, 5);
> +    free_aml_allocator();
> +}
> +
>  typedef
>  struct AcpiBuildState {
>      /* Copy of table in RAM (for patching). */
> @@ -57,6 +181,7 @@ static
>  void virt_acpi_build(VirtGuestInfo *guest_info, AcpiBuildTables *tables)
>  {
>      GArray *table_offsets;
> +    GArray *tables_blob = tables->table_data;
>  
>      table_offsets = g_array_new(false, true /* clear */,
>                                          sizeof(uint32_t));
> @@ -74,6 +199,9 @@ void virt_acpi_build(VirtGuestInfo *guest_info, AcpiBuildTables *tables)
>       * DSDT
>       */
>  
> +    /* DSDT is pointed to by FADT */
> +    build_dsdt(tables_blob, tables->linker, guest_info);
> +
>      /* Cleanup memory that's no longer used. */
>      g_array_free(table_offsets, true);
>  }

-- 
Alex Bennée

  reply	other threads:[~2015-05-18  8:08 UTC|newest]

Thread overview: 56+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-07  9:29 [Qemu-devel] [PATCH v6 00/22] Generate ACPI v5.1 tables and expose them to guest over fw_cfg on ARM Shannon Zhao
2015-05-07  9:29 ` [Qemu-devel] [PATCH v6 01/22] hw/i386: Move ACPI header definitions in an arch-independent location Shannon Zhao
2015-05-07  9:29 ` [Qemu-devel] [PATCH v6 02/22] hw/i386/acpi-build: move generic acpi building helpers into dedictated file Shannon Zhao
2015-05-07  9:29 ` [Qemu-devel] [PATCH v6 03/22] hw/arm/virt-acpi-build: Basic framework for building ACPI tables on ARM Shannon Zhao
2015-05-07 10:50   ` Alex Bennée
2015-05-08  1:51     ` Shannon Zhao
2015-05-07 15:44   ` Peter Maydell
2015-05-08  1:46     ` Shannon Zhao
2015-05-07  9:29 ` [Qemu-devel] [PATCH v6 04/22] hw/acpi/aml-build: Add aml_memory32_fixed() term Shannon Zhao
2015-05-07 12:18   ` Alex Bennée
2015-05-15 12:15   ` Igor Mammedov
2015-05-07  9:29 ` [Qemu-devel] [PATCH v6 05/22] hw/acpi/aml-build: Add aml_interrupt() term Shannon Zhao
2015-05-07 15:51   ` Peter Maydell
2015-05-08  2:24     ` Shannon Zhao
2015-05-15 12:14     ` Igor Mammedov
2015-05-18  4:05       ` Shannon Zhao
2015-05-18 10:33         ` Michael S. Tsirkin
2015-05-19 12:02           ` Igor Mammedov
2015-05-15 12:45   ` Igor Mammedov
2015-05-18  4:00     ` Shannon Zhao
2015-05-18 10:34       ` Michael S. Tsirkin
2015-05-19 12:09         ` Igor Mammedov
2015-05-20  4:09           ` Shannon Zhao
2015-05-07  9:29 ` [Qemu-devel] [PATCH v6 06/22] hw/arm/virt-acpi-build: Generation of DSDT table for virt devices Shannon Zhao
2015-05-18  8:09   ` Alex Bennée [this message]
2015-05-07  9:29 ` [Qemu-devel] [PATCH v6 07/22] hw/arm/virt-acpi-build: Generate FADT table and update ACPI headers Shannon Zhao
2015-05-07  9:29 ` [Qemu-devel] [PATCH v6 08/22] hw/arm/virt-acpi-build: Generate MADT table Shannon Zhao
2015-05-07  9:29 ` [Qemu-devel] [PATCH v6 09/22] hw/arm/virt-acpi-build: Generate GTDT table Shannon Zhao
2015-05-07  9:29 ` [Qemu-devel] [PATCH v6 10/22] hw/arm/virt-acpi-build: Generate RSDT table Shannon Zhao
2015-05-07  9:29 ` [Qemu-devel] [PATCH v6 11/22] hw/arm/virt-acpi-build: Generate RSDP table Shannon Zhao
2015-05-07  9:29 ` [Qemu-devel] [PATCH v6 12/22] hw/arm/virt-acpi-build: Add PCIe info and generate MCFG table Shannon Zhao
2015-05-07  9:29 ` [Qemu-devel] [PATCH v6 13/22] hw/acpi/aml-build: Make aml_buffer() definition consistent with the spec Shannon Zhao
2015-05-15 13:08   ` Igor Mammedov
2015-05-07  9:29 ` [Qemu-devel] [PATCH v6 14/22] hw/acpi/aml-build: Add ToUUID macro Shannon Zhao
2015-05-15 13:19   ` Igor Mammedov
2015-05-07  9:29 ` [Qemu-devel] [PATCH v6 15/22] hw/acpi/aml-build: Add aml_or() term Shannon Zhao
2015-05-15 13:23   ` Igor Mammedov
2015-05-07  9:29 ` [Qemu-devel] [PATCH v6 16/22] hw/acpi/aml-build: Add aml_lnot() term Shannon Zhao
2015-05-15 13:24   ` Igor Mammedov
2015-05-07  9:29 ` [Qemu-devel] [PATCH v6 17/22] hw/acpi/aml-build: Add aml_else() term Shannon Zhao
2015-05-15 13:26   ` Igor Mammedov
2015-05-07  9:29 ` [Qemu-devel] [PATCH v6 18/22] hw/acpi/aml-build: Add aml_create_dword_field() term Shannon Zhao
2015-05-15 13:30   ` Igor Mammedov
2015-05-07  9:29 ` [Qemu-devel] [PATCH v6 19/22] hw/acpi/aml-build: Add aml_dword_io() term Shannon Zhao
2015-05-15 13:43   ` Igor Mammedov
2015-05-07  9:29 ` [Qemu-devel] [PATCH v6 20/22] hw/acpi/aml-build: Add Unicode macro Shannon Zhao
2015-05-15 14:13   ` Igor Mammedov
2015-05-18  6:05     ` Shannon Zhao
2015-05-19 12:19       ` Igor Mammedov
2015-05-07  9:29 ` [Qemu-devel] [PATCH v6 21/22] hw/arm/virt-acpi-build: Add PCIe controller in ACPI DSDT table Shannon Zhao
2015-05-07  9:29 ` [Qemu-devel] [PATCH v6 22/22] hw/arm/virt: Enable dynamic generation of ACPI v5.1 tables Shannon Zhao
2015-05-07 16:09   ` Peter Maydell
2015-05-08  8:21     ` Shannon Zhao
2015-05-07 16:34 ` [Qemu-devel] [PATCH v6 00/22] Generate ACPI v5.1 tables and expose them to guest over fw_cfg on ARM Peter Maydell
2015-05-08  9:48   ` Shannon Zhao
2015-05-08 15:39     ` Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87y4kme28a.fsf@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=a.spyridakis@virtualopensystems.com \
    --cc=christoffer.dall@linaro.org \
    --cc=claudio.fontana@huawei.com \
    --cc=hangaohuai@huawei.com \
    --cc=hanjun.guo@linaro.org \
    --cc=imammedo@redhat.com \
    --cc=lersek@redhat.com \
    --cc=mst@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.huangpeng@huawei.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=shannon.zhao@linaro.org \
    --cc=zhaoshenglong@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.