qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Shannon Zhao <zhaoshenglong@huawei.com>
To: Igor Mammedov <imammedo@redhat.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,
	alex.bennee@linaro.org, hanjun.guo@linaro.org,
	pbonzini@redhat.com, lersek@redhat.com,
	christoffer.dall@linaro.org, shannon.zhao@linaro.org
Subject: Re: [Qemu-devel] [PATCH v8 07/24] hw/arm/virt-acpi-build: Generation of DSDT table for virt devices
Date: Thu, 21 May 2015 17:10:00 +0800	[thread overview]
Message-ID: <555DA0E8.4080304@huawei.com> (raw)
In-Reply-To: <20150521104203.49b99dfe@nial.brq.redhat.com>



On 2015/5/21 16:42, Igor Mammedov wrote:
> On Thu, 21 May 2015 10:28:34 +0800
> Shannon Zhao <zhaoshenglong@huawei.com> wrote:
> 
>> 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>
>> ---
>>  hw/arm/virt-acpi-build.c | 130 +++++++++++++++++++++++++++++++++++++++++++++++
>>  1 file changed, 130 insertions(+)
>>
>> diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
>> index b8a5bd8..a1d6045 100644
>> --- a/hw/arm/virt-acpi-build.c
>> +++ b/hw/arm/virt-acpi-build.c
>> @@ -40,6 +40,132 @@
>>  #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));
> what is this empty _CRS for?
> 
Oops, I don't remember how this is introduced. Will remove it. Thanks.

> 
>> +        aml_append(scope, dev);
>> +    }
>> +}
>> +
>> +static void acpi_dsdt_add_uart(Aml *scope, const MemMapEntry *uart_memmap,
>> +                                           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->base,
>> +                                       uart_memmap->size, AML_READ_WRITE));
>> +    aml_append(crs,
>> +               aml_interrupt(AML_CONSUMER, AML_LEVEL, AML_ACTIVE_HIGH,
>> +                             AML_EXCLUSIVE, uart_irq + 32));
> what does magic "+ 32" do here?
> 
On ARM first 32 IRQs are for SGI and PPI, after IRQ 32 are for SPI. The
a15irqmap[] in virt.c records the irqs of devices and these irqs are
SPIs. For DT, it will add 32 by kernel, while for ACPI we must add 32
when generating tables.

>> +    aml_append(dev, aml_name_decl("_CRS", crs));
>> +    aml_append(scope, dev);
>> +}
>> +
>> +static void acpi_dsdt_add_rtc(Aml *scope, const MemMapEntry *rtc_memmap,
>> +                                          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->base,
>> +                                       rtc_memmap->size, AML_READ_WRITE));
>> +    aml_append(crs,
>> +               aml_interrupt(AML_CONSUMER, AML_LEVEL, AML_ACTIVE_HIGH,
>> +                             AML_EXCLUSIVE, rtc_irq + 32));
> ditto?
> 
>> +    aml_append(dev, aml_name_decl("_CRS", crs));
>> +    aml_append(scope, dev);
>> +}
>> +
>> +static void acpi_dsdt_add_flash(Aml *scope, const MemMapEntry *flash_memmap)
>> +{
>> +    Aml *dev, *crs;
>> +    hwaddr base = flash_memmap->base;
>> +    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_READ_WRITE));
>> +    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_READ_WRITE));
>> +    aml_append(dev, aml_name_decl("_CRS", crs));
>> +    aml_append(scope, dev);
>> +}
>> +
>> +static void acpi_dsdt_add_virtio(Aml *scope,
>> +                                 const MemMapEntry *virtio_mmio_memmap,
>> +                                 int mmio_irq, int num)
>> +{
>> +    hwaddr base = virtio_mmio_memmap->base;
>> +    hwaddr size = virtio_mmio_memmap->size;
>> +    int irq = mmio_irq + 32;
> again magic offset
> 
>> +    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_READ_WRITE));
>> +        aml_append(crs,
>> +                   aml_interrupt(AML_CONSUMER, AML_LEVEL, AML_ACTIVE_HIGH,
>> +                                 AML_EXCLUSIVE, 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;
>> +    const MemMapEntry *memmap = guest_info->memmap;
>> +    const int *irqmap = guest_info->irqmap;
>> +
>> +    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, &memmap[VIRT_UART], irqmap[VIRT_UART]);
>> +    acpi_dsdt_add_rtc(scope, &memmap[VIRT_RTC], irqmap[VIRT_RTC]);
>> +    acpi_dsdt_add_flash(scope, &memmap[VIRT_FLASH]);
>> +    acpi_dsdt_add_virtio(scope, &memmap[VIRT_MMIO],
>> +                                irqmap[VIRT_MMIO], NUM_VIRTIO_TRANSPORTS);
>> +    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). */
>> @@ -55,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));
>> @@ -72,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);
>>  }
> 
> 
> .
> 

-- 
Shannon

  reply	other threads:[~2015-05-21  9:10 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-21  2:28 [Qemu-devel] [PATCH v8 00/24] Generate ACPI v5.1 tables and expose them to guest over fw_cfg on ARM Shannon Zhao
2015-05-21  2:28 ` [Qemu-devel] [PATCH v8 01/24] hw/acpi/aml-build: Make enum values to be upper case to match coding style Shannon Zhao
2015-05-21  8:12   ` Igor Mammedov
2015-05-21  2:28 ` [Qemu-devel] [PATCH v8 02/24] hw/arm/virt: Move common definitions to virt.h Shannon Zhao
2015-05-21  8:25   ` Igor Mammedov
2015-05-21  9:19     ` Peter Maydell
2015-05-21  9:42     ` Laszlo Ersek
2015-05-21  2:28 ` [Qemu-devel] [PATCH v8 03/24] hw/arm/virt: Record PCIe ranges in MemMapEntry array Shannon Zhao
2015-05-21  2:28 ` [Qemu-devel] [PATCH v8 04/24] hw/arm/virt-acpi-build: Basic framework for building ACPI tables on ARM Shannon Zhao
2015-05-21  8:32   ` Igor Mammedov
2015-05-21  2:28 ` [Qemu-devel] [PATCH v8 05/24] hw/acpi/aml-build: Add aml_memory32_fixed() term Shannon Zhao
2015-05-21  2:28 ` [Qemu-devel] [PATCH v8 06/24] hw/acpi/aml-build: Add aml_interrupt() term Shannon Zhao
2015-05-21  8:17   ` Igor Mammedov
2015-05-21  2:28 ` [Qemu-devel] [PATCH v8 07/24] hw/arm/virt-acpi-build: Generation of DSDT table for virt devices Shannon Zhao
2015-05-21  8:42   ` Igor Mammedov
2015-05-21  9:10     ` Shannon Zhao [this message]
2015-05-21  9:22       ` Igor Mammedov
2015-05-21  2:28 ` [Qemu-devel] [PATCH v8 08/24] hw/arm/virt-acpi-build: Generate FADT table and update ACPI headers Shannon Zhao
2015-05-21  2:28 ` [Qemu-devel] [PATCH v8 09/24] hw/arm/virt-acpi-build: Generate MADT table Shannon Zhao
2015-05-21  2:28 ` [Qemu-devel] [PATCH v8 10/24] hw/arm/virt-acpi-build: Generate GTDT table Shannon Zhao
2015-05-21  2:28 ` [Qemu-devel] [PATCH v8 11/24] hw/arm/virt-acpi-build: Generate RSDT table Shannon Zhao
2015-05-21  2:28 ` [Qemu-devel] [PATCH v8 12/24] hw/arm/virt-acpi-build: Generate RSDP table Shannon Zhao
2015-05-21  2:28 ` [Qemu-devel] [PATCH v8 13/24] hw/arm/virt-acpi-build: Generate MCFG table Shannon Zhao
2015-05-21  2:28 ` [Qemu-devel] [PATCH v8 14/24] hw/acpi/aml-build: Make aml_buffer() definition consistent with the spec Shannon Zhao
2015-05-21  8:19   ` Igor Mammedov
2015-05-21  2:28 ` [Qemu-devel] [PATCH v8 15/24] hw/acpi/aml-build: Add ToUUID macro Shannon Zhao
2015-05-21  2:28 ` [Qemu-devel] [PATCH v8 16/24] hw/acpi/aml-build: Add aml_or() term Shannon Zhao
2015-05-21  2:28 ` [Qemu-devel] [PATCH v8 17/24] hw/acpi/aml-build: Add aml_lnot() term Shannon Zhao
2015-05-21  2:28 ` [Qemu-devel] [PATCH v8 18/24] hw/acpi/aml-build: Add aml_else() term Shannon Zhao
2015-05-21  2:28 ` [Qemu-devel] [PATCH v8 19/24] hw/acpi/aml-build: Add aml_create_dword_field() term Shannon Zhao
2015-05-21  2:28 ` [Qemu-devel] [PATCH v8 20/24] hw/acpi/aml-build: Add aml_dword_io() term Shannon Zhao
2015-05-21  2:28 ` [Qemu-devel] [PATCH v8 21/24] hw/acpi/aml-build: Add Unicode macro Shannon Zhao
2015-05-21  2:28 ` [Qemu-devel] [PATCH v8 22/24] hw/arm/virt-acpi-build: Add PCIe controller in ACPI DSDT table Shannon Zhao
2015-05-21  2:28 ` [Qemu-devel] [PATCH v8 23/24] ACPI: split CONFIG_ACPI into 4 pieces Shannon Zhao
2015-05-21  2:28 ` [Qemu-devel] [PATCH v8 24/24] hw/arm/virt: Enable dynamic generation of ACPI v5.1 tables Shannon Zhao

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=555DA0E8.4080304@huawei.com \
    --to=zhaoshenglong@huawei.com \
    --cc=a.spyridakis@virtualopensystems.com \
    --cc=alex.bennee@linaro.org \
    --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 \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).