From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CDD69C433EF for ; Fri, 3 Sep 2021 13:48:28 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 61C656056C for ; Fri, 3 Sep 2021 13:48:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 61C656056C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:47592 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mM9YR-0005EY-D5 for qemu-devel@archiver.kernel.org; Fri, 03 Sep 2021 09:48:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54584) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mM9VG-0007oo-3H for qemu-devel@nongnu.org; Fri, 03 Sep 2021 09:45:10 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:40477) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mM9VC-00055g-0m for qemu-devel@nongnu.org; Fri, 03 Sep 2021 09:45:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630676704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1ezjYLPe6WPP+UOinEYxPXASuUF6NQdxTSfCQbWT9jk=; b=BsBgafwkFuM80vrd136cHCeFo82+QqLemud66WNGBp4Pl9oRarnFiLDy9/o/UZ2ueL+tRm A3VhcDLoLQq6kLS9EbAR5qIJO6G04T8Q0wwi5/ZjXeBT2srA7TIoEoezbpTxRTy/BBsZSO gGkhs3Nofsf24CAQ/EDMs7HygcnQpVc= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-520-2NExjfTaNgCp1Sp7lcCCSw-1; Fri, 03 Sep 2021 09:45:03 -0400 X-MC-Unique: 2NExjfTaNgCp1Sp7lcCCSw-1 Received: by mail-wr1-f70.google.com with SMTP id z15-20020adff74f000000b001577d70c98dso1599921wrp.12 for ; Fri, 03 Sep 2021 06:45:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=1ezjYLPe6WPP+UOinEYxPXASuUF6NQdxTSfCQbWT9jk=; b=qUlMdcJ17NCpjk93YKHIECwsSXg0XRIp8ODwabJxkwa3EwvKd44/fR3V3LVMvg5T4V wB1iM/gxtEBwZT3qKhlaYXoTJ4TV6uiP62XNxbcqZafFFsSPjrx0biHTWNMI4Ut2Vx/u Ig7p7mmNnTZ4h0+nLIQYi9v8hPxBdW6uadFTZL3sshcC8PUICxc1D+Ja7M7ghBTdbte4 +ixryu7XRs8YwyPZFMb9g0GIpFl9CapvMFtjHubieQuHfeqVnL5aAdez82tqga40S8Yd OEoJCqEV1tQlt2v7qOTjsq3Qa7xQ6PUoRHuwk+Yx5+0sjwESIqrIx5kVR99NhfxG7kQx wl9A== X-Gm-Message-State: AOAM530QAi+Wn3Ts5P/N/3wNRBs62WSAQELuurqrm5rA8TXhq2p/kY5i vt20Bm+hR4AoXYvrdenRfFo2M8q1Z7CGc3sF2FhZK3KsFlMKuvx5f619WOSU/Wolr7JmzMd3oel b8Igdz8dfen1OG9Q= X-Received: by 2002:a1c:80d7:: with SMTP id b206mr8719714wmd.36.1630676702441; Fri, 03 Sep 2021 06:45:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx/BT6IH8kNzkuwIyOcW0ebJYBBcZ9OnPX4gEpiF4mDsJjEXzSRveVbROKHblBGm0AooRFz7A== X-Received: by 2002:a1c:80d7:: with SMTP id b206mr8719682wmd.36.1630676702174; Fri, 03 Sep 2021 06:45:02 -0700 (PDT) Received: from ?IPv6:2a01:e0a:59e:9d80:527b:9dff:feef:3874? ([2a01:e0a:59e:9d80:527b:9dff:feef:3874]) by smtp.gmail.com with ESMTPSA id z14sm4219008wmi.24.2021.09.03.06.45.00 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 03 Sep 2021 06:45:01 -0700 (PDT) Subject: Re: [PATCH v2 25/35] acpi: arm/virt: madt: use build_append_int_noprefix() API to compose MADT table To: Igor Mammedov , qemu-devel@nongnu.org References: <20210708154617.1538485-1-imammedo@redhat.com> <20210708154617.1538485-26-imammedo@redhat.com> From: Eric Auger Message-ID: <0c92c5cd-446f-142b-ad2d-42ce5722a71a@redhat.com> Date: Fri, 3 Sep 2021 15:45:00 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 In-Reply-To: <20210708154617.1538485-26-imammedo@redhat.com> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eauger@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=eauger@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.392, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.888, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, drjones@redhat.com, qemu-arm@nongnu.org, mst@redhat.com, shannon.zhaosl@gmail.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Hi Igor, On 7/8/21 5:46 PM, Igor Mammedov wrote: > Drop usage of packed structures and explicit endian conversions > when building MADT table for arm/x86 and use endian agnostic > build_append_int_noprefix() API to build it. > > Signed-off-by: Igor Mammedov > --- > CC: drjones@redhat.com > CC: peter.maydell@linaro.org > CC: shannon.zhaosl@gmail.com > CC: qemu-arm@nongnu.org > --- > include/hw/acpi/acpi-defs.h | 84 -------------------- > hw/arm/virt-acpi-build.c | 149 +++++++++++++++++++++--------------- > 2 files changed, 89 insertions(+), 144 deletions(-) > > diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h > index 3f174ba208..bcada37601 100644 > --- a/include/hw/acpi/acpi-defs.h > +++ b/include/hw/acpi/acpi-defs.h > @@ -163,90 +163,6 @@ struct AcpiFacsDescriptorRev1 { > } QEMU_PACKED; > typedef struct AcpiFacsDescriptorRev1 AcpiFacsDescriptorRev1; > > -/* Values for Type in APIC sub-headers */ > - > -#define ACPI_APIC_GENERIC_CPU_INTERFACE 11 > -#define ACPI_APIC_GENERIC_DISTRIBUTOR 12 > -#define ACPI_APIC_GENERIC_MSI_FRAME 13 > -#define ACPI_APIC_GENERIC_REDISTRIBUTOR 14 > -#define ACPI_APIC_GENERIC_TRANSLATOR 15 > -#define ACPI_APIC_RESERVED 16 /* 16 and greater are reserved */ > - > -/* > - * MADT sub-structures (Follow MULTIPLE_APIC_DESCRIPTION_TABLE) > - */ > -#define ACPI_SUB_HEADER_DEF /* Common ACPI sub-structure header */\ > - uint8_t type; \ > - uint8_t length; > - > -/* Sub-structures for MADT */ > - > -struct AcpiMadtGenericCpuInterface { > - ACPI_SUB_HEADER_DEF > - uint16_t reserved; > - uint32_t cpu_interface_number; > - uint32_t uid; > - uint32_t flags; > - uint32_t parking_version; > - uint32_t performance_interrupt; > - uint64_t parked_address; > - uint64_t base_address; > - uint64_t gicv_base_address; > - uint64_t gich_base_address; > - uint32_t vgic_interrupt; > - uint64_t gicr_base_address; > - uint64_t arm_mpidr; > -} QEMU_PACKED; > - > -typedef struct AcpiMadtGenericCpuInterface AcpiMadtGenericCpuInterface; > - > -/* GICC CPU Interface Flags */ > -#define ACPI_MADT_GICC_ENABLED 1 > - > -struct AcpiMadtGenericDistributor { > - ACPI_SUB_HEADER_DEF > - uint16_t reserved; > - uint32_t gic_id; > - uint64_t base_address; > - uint32_t global_irq_base; > - /* ACPI 5.1 Errata 1228 Present GIC version in MADT table */ > - uint8_t version; > - uint8_t reserved2[3]; > -} QEMU_PACKED; > - > -typedef struct AcpiMadtGenericDistributor AcpiMadtGenericDistributor; > - > -struct AcpiMadtGenericMsiFrame { > - ACPI_SUB_HEADER_DEF > - uint16_t reserved; > - uint32_t gic_msi_frame_id; > - uint64_t base_address; > - uint32_t flags; > - uint16_t spi_count; > - uint16_t spi_base; > -} QEMU_PACKED; > - > -typedef struct AcpiMadtGenericMsiFrame AcpiMadtGenericMsiFrame; > - > -struct AcpiMadtGenericRedistributor { > - ACPI_SUB_HEADER_DEF > - uint16_t reserved; > - uint64_t base_address; > - uint32_t range_length; > -} QEMU_PACKED; > - > -typedef struct AcpiMadtGenericRedistributor AcpiMadtGenericRedistributor; > - > -struct AcpiMadtGenericTranslator { > - ACPI_SUB_HEADER_DEF > - uint16_t reserved; > - uint32_t translation_id; > - uint64_t base_address; > - uint32_t reserved2; > -} QEMU_PACKED; > - > -typedef struct AcpiMadtGenericTranslator AcpiMadtGenericTranslator; > - > /* > * Generic Timer Description Table (GTDT) > */ > diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c > index cd8b73dde9..dd8011a670 100644 > --- a/hw/arm/virt-acpi-build.c > +++ b/hw/arm/virt-acpi-build.c > @@ -476,94 +476,123 @@ build_gtdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) > } > > /* > - * ACPI spec, Revision 5.0 > + * ACPI spec, Revision 5.1 Errata A It is a bit difficult to follow both the conversion and the upgrade of the version. May be worth splitting both concerns if sensible. > * 5.2.12 Multiple APIC Description Table (MADT) > */ > +static void build_append_gicr(GArray *table_data, uint64_t base, uint32_t size) > +{ > + build_append_int_noprefix(table_data, 0xE, 1); /* Type */ > + build_append_int_noprefix(table_data, 16, 1); /* Length */ > + build_append_int_noprefix(table_data, 0, 2); /* Reserved */ > + /* Discovery Range Base Addres */ > + build_append_int_noprefix(table_data, base, 8); > + build_append_int_noprefix(table_data, size, 4); /* Discovery Range Length */ > +} > + > static void > build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) > { > + int i; > VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms); > const MemMapEntry *memmap = vms->memmap; > - const int *irqmap = vms->irqmap; > - AcpiMadtGenericDistributor *gicd; > - AcpiMadtGenericMsiFrame *gic_msi; > - int i; > AcpiTable table = { .sig = "APIC", .rev = 3, .oem_id = vms->oem_id, > .oem_table_id = vms->oem_table_id }; > > acpi_init_table(&table, table_data); > /* Local Interrupt Controller Address */ > build_append_int_noprefix(table_data, 0, 4); > - build_append_int_noprefix(table_data, 0, 4); /* Flags */ > - > - gicd = acpi_data_push(table_data, sizeof *gicd); > - gicd->type = ACPI_APIC_GENERIC_DISTRIBUTOR; > - gicd->length = sizeof(*gicd); > - gicd->base_address = cpu_to_le64(memmap[VIRT_GIC_DIST].base); > - gicd->version = vms->gic_version; > + build_append_int_noprefix(table_data, 0, 4); /* Flags */ > + > + /* 5.2.12.15 GIC Distributor Structure */ > + build_append_int_noprefix(table_data, 0xC, 1); /* Type */ > + build_append_int_noprefix(table_data, 24, 1); /* Length */ > + build_append_int_noprefix(table_data, 0, 2); /* Reserved */ > + build_append_int_noprefix(table_data, 0, 4); /* GIC ID */ > + /* Physical Base Address */ > + build_append_int_noprefix(table_data, memmap[VIRT_GIC_DIST].base, 8); > + build_append_int_noprefix(table_data, 0, 4); /* System Vector Base */ > + /* GIC version */ > + build_append_int_noprefix(table_data, vms->gic_version, 1); > + build_append_int_noprefix(table_data, 0, 3); /* Reserved */ > > for (i = 0; i < MACHINE(vms)->smp.cpus; i++) { > - AcpiMadtGenericCpuInterface *gicc = acpi_data_push(table_data, > - sizeof(*gicc)); > ARMCPU *armcpu = ARM_CPU(qemu_get_cpu(i)); > + uint64_t physical_base_address = 0, gich = 0, gicv = 0; > + uint32_t vgic_interrupt = vms->virt ? PPI(ARCH_GIC_MAINT_IRQ) : 0; > + uint32_t pmu_interrupt = arm_feature(&armcpu->env, ARM_FEATURE_PMU) ? > + PPI(VIRTUAL_PMU_IRQ) : 0; > > - gicc->type = ACPI_APIC_GENERIC_CPU_INTERFACE; > - gicc->length = sizeof(*gicc); > if (vms->gic_version == 2) { > - gicc->base_address = cpu_to_le64(memmap[VIRT_GIC_CPU].base); > - gicc->gich_base_address = cpu_to_le64(memmap[VIRT_GIC_HYP].base); > - gicc->gicv_base_address = cpu_to_le64(memmap[VIRT_GIC_VCPU].base); > + physical_base_address = memmap[VIRT_GIC_CPU].base; > + gicv = memmap[VIRT_GIC_VCPU].base; > + gich = memmap[VIRT_GIC_HYP].base; > } > - gicc->cpu_interface_number = cpu_to_le32(i); > - gicc->arm_mpidr = cpu_to_le64(armcpu->mp_affinity); > - gicc->uid = cpu_to_le32(i); > - gicc->flags = cpu_to_le32(ACPI_MADT_GICC_ENABLED); > > - if (arm_feature(&armcpu->env, ARM_FEATURE_PMU)) { > - gicc->performance_interrupt = cpu_to_le32(PPI(VIRTUAL_PMU_IRQ)); > - } > - if (vms->virt) { > - gicc->vgic_interrupt = cpu_to_le32(PPI(ARCH_GIC_MAINT_IRQ)); > - } > + /* 5.2.12.14 GIC Structure */ > + build_append_int_noprefix(table_data, 0xB, 1); /* Type */ > + build_append_int_noprefix(table_data, 76, 1); /* Length */ > + build_append_int_noprefix(table_data, 0, 2); /* Reserved */ > + build_append_int_noprefix(table_data, i, 4); /* GIC ID */ > + build_append_int_noprefix(table_data, i, 4); /* ACPI Processor UID */ > + /* Flags */ > + build_append_int_noprefix(table_data, 1, 4); /* Enabled */ > + /* Parking Protocol Version */ > + build_append_int_noprefix(table_data, 0, 4); > + /* Performance Interrupt GSIV */ > + build_append_int_noprefix(table_data, pmu_interrupt, 4); > + build_append_int_noprefix(table_data, 0, 8); /* Parked Address */ > + /* Physical Base Address */ > + build_append_int_noprefix(table_data, physical_base_address, 8); > + build_append_int_noprefix(table_data, gicv, 8); /* GICV */ > + build_append_int_noprefix(table_data, gich, 8); /* GICH */ > + /* VGIC Maintenance interrupt */ > + build_append_int_noprefix(table_data, vgic_interrupt, 4); > + build_append_int_noprefix(table_data, 0, 8); /* GICR Base Address*/ > + /* MPIDR */ > + build_append_int_noprefix(table_data, armcpu->mp_affinity, 8); > } > > if (vms->gic_version == 3) { > - AcpiMadtGenericTranslator *gic_its; > - int nb_redist_regions = virt_gicv3_redist_region_count(vms); > - AcpiMadtGenericRedistributor *gicr = acpi_data_push(table_data, > - sizeof *gicr); > - > - gicr->type = ACPI_APIC_GENERIC_REDISTRIBUTOR; > - gicr->length = sizeof(*gicr); > - gicr->base_address = cpu_to_le64(memmap[VIRT_GIC_REDIST].base); > - gicr->range_length = cpu_to_le32(memmap[VIRT_GIC_REDIST].size); > - > - if (nb_redist_regions == 2) { > - gicr = acpi_data_push(table_data, sizeof(*gicr)); > - gicr->type = ACPI_APIC_GENERIC_REDISTRIBUTOR; > - gicr->length = sizeof(*gicr); > - gicr->base_address = > - cpu_to_le64(memmap[VIRT_HIGH_GIC_REDIST2].base); > - gicr->range_length = > - cpu_to_le32(memmap[VIRT_HIGH_GIC_REDIST2].size); > + build_append_gicr(table_data, memmap[VIRT_GIC_REDIST].base, > + memmap[VIRT_GIC_REDIST].size); > + if (virt_gicv3_redist_region_count(vms) == 2) { > + build_append_gicr(table_data, memmap[VIRT_HIGH_GIC_REDIST2].base, > + memmap[VIRT_HIGH_GIC_REDIST2].size); > } > > if (its_class_name() && !vmc->no_its) { > - gic_its = acpi_data_push(table_data, sizeof *gic_its); > - gic_its->type = ACPI_APIC_GENERIC_TRANSLATOR; > - gic_its->length = sizeof(*gic_its); > - gic_its->translation_id = 0; > - gic_its->base_address = cpu_to_le64(memmap[VIRT_GIC_ITS].base); > + /* > + * FIXME: Structure is from Revision 6.0 where 'GIC Structure' > + * has additional fields on top of implemented 5.1 Errata A > + * make it consistent with v6.0 if ITS is present or bump > + * everything to v6.0 unconditionally Do you mean some parts are 5.1 errata A and some others are 6.0 already? > + */ > + /* > + * ACPI spec, Revision 6.0 > + * 5.2.12.18 GIC ITS Structure > + */ > + build_append_int_noprefix(table_data, 0xF, 1); /* Type */ > + build_append_int_noprefix(table_data, 16, 1); /* Length */ this is 20 and not 16. Currently it fails with ITS. With that fix Reviewed-by: Eric Auger Thanks Eric > + build_append_int_noprefix(table_data, 0, 2); /* Reserved */ > + build_append_int_noprefix(table_data, 0, 4); /* GIC ITS ID */ > + /* Physical Base Address */ > + build_append_int_noprefix(table_data, memmap[VIRT_GIC_ITS].base, 8); > + build_append_int_noprefix(table_data, 0, 4); /* Reserved */ > } > } else { > - gic_msi = acpi_data_push(table_data, sizeof *gic_msi); > - gic_msi->type = ACPI_APIC_GENERIC_MSI_FRAME; > - gic_msi->length = sizeof(*gic_msi); > - gic_msi->gic_msi_frame_id = 0; > - gic_msi->base_address = cpu_to_le64(memmap[VIRT_GIC_V2M].base); > - gic_msi->flags = cpu_to_le32(1); > - gic_msi->spi_count = cpu_to_le16(NUM_GICV2M_SPIS); > - gic_msi->spi_base = cpu_to_le16(irqmap[VIRT_GIC_V2M] + ARM_SPI_BASE); > + const uint16_t spi_base = vms->irqmap[VIRT_GIC_V2M] + ARM_SPI_BASE; > + > + /* 5.2.12.16 GIC MSI Frame Structure */ > + build_append_int_noprefix(table_data, 0xD, 1); /* Type */ > + build_append_int_noprefix(table_data, 24, 1); /* Length */ > + build_append_int_noprefix(table_data, 0, 2); /* Reserved */ > + build_append_int_noprefix(table_data, 0, 4); /* GIC MSI Frame ID */ > + /* Physical Base Address */ > + build_append_int_noprefix(table_data, memmap[VIRT_GIC_V2M].base, 8); > + build_append_int_noprefix(table_data, 1, 4); /* Flags */ > + /* SPI Count */ > + build_append_int_noprefix(table_data, NUM_GICV2M_SPIS, 2); > + build_append_int_noprefix(table_data, spi_base, 2); /* SPI Base */ > } > acpi_table_composed(linker, &table); > } >