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.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 D2BA2C07E99 for ; Fri, 9 Jul 2021 09:00:51 +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 6ED2B613D6 for ; Fri, 9 Jul 2021 09:00:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6ED2B613D6 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:47892 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1mNO-0007Zz-Jh for qemu-devel@archiver.kernel.org; Fri, 09 Jul 2021 05:00:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43952) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1mMD-0006as-2j for qemu-devel@nongnu.org; Fri, 09 Jul 2021 04:59:37 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:56992) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1mM7-0007PJ-Ov for qemu-devel@nongnu.org; Fri, 09 Jul 2021 04:59:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1625821170; 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=YtcW9OQwGxjszJdC7XhvCHdBC/rgjrIwHDtN2ERIIA0=; b=eiQ9jBrskSPJw/qZPcolvZUj1xLA88k+GM3O867s3UOwSo8Rnu7V7FIW2dYSHGx7oQFmBP lsTVMWTA0ew5a2Klr9ZNLM31urivsbhrLfHI1GI1hDF9rH2+8cPayUKPJJlfKNk/p0PdT2 jrvO5tmqOCoFnJy7NcmfxJ9BqvaB+RQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-421-YdC8zJlXP4i76abPRViljQ-1; Fri, 09 Jul 2021 04:59:28 -0400 X-MC-Unique: YdC8zJlXP4i76abPRViljQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7597A5074B; Fri, 9 Jul 2021 08:59:27 +0000 (UTC) Received: from localhost (unknown [10.43.2.75]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0A775E706; Fri, 9 Jul 2021 08:59:22 +0000 (UTC) Date: Fri, 9 Jul 2021 10:59:21 +0200 From: Igor Mammedov To: "Michael S. Tsirkin" Subject: Re: [PATCH v2 29/35] acpi: arm/virt: convert build_iort() to endian agnostic build_append_FOO() API Message-ID: <20210709105921.72951e60@redhat.com> In-Reply-To: <20210709031104-mutt-send-email-mst@kernel.org> References: <20210708154617.1538485-1-imammedo@redhat.com> <20210708154617.1538485-30-imammedo@redhat.com> <20210709031104-mutt-send-email-mst@kernel.org> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=imammedo@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=imammedo@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.45, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=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, qemu-devel@nongnu.org, shannon.zhaosl@gmail.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Fri, 9 Jul 2021 03:11:52 -0400 "Michael S. Tsirkin" wrote: > On Thu, Jul 08, 2021 at 11:46:11AM -0400, Igor Mammedov wrote: > > Signed-off-by: Igor Mammedov > > BTW is this actually a bugfix? Worth adding a Fixes tag maybe. I don't think I've made any fixes in this patch, maybe you are talking the next patch [30/35]? As for 30/35 it's not visible bugfix since both values were the same, that's probably why I haven't added any tags as tags would be pretty much useless there. When I stumbled on a bug during refactoring, I've tried to fix it in separate a patch or added TODO/FIXME comment, since that is not relevant to refactoring itself. > > > --- > > CC: drjones@redhat.com > > CC: peter.maydell@linaro.org > > CC: shannon.zhaosl@gmail.com > > CC: qemu-arm@nongnu.org > > I think these get dropped on git-am then not sure this is what you wanted. That was intention, to make git-send-email CC [at patch granularity] relevant people for review and drop CC list when patch is applied. > > --- > > include/hw/acpi/acpi-defs.h | 71 ------------------ > > hw/arm/virt-acpi-build.c | 143 +++++++++++++++++++----------------- > > 2 files changed, 77 insertions(+), 137 deletions(-) > > > > diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h > > index 195f90caf6..6f2f08a9de 100644 > > --- a/include/hw/acpi/acpi-defs.h > > +++ b/include/hw/acpi/acpi-defs.h > > @@ -188,75 +188,4 @@ struct AcpiGenericTimerTable { > > } QEMU_PACKED; > > typedef struct AcpiGenericTimerTable AcpiGenericTimerTable; > > > > -/* > > - * IORT node types > > - */ > > - > > -#define ACPI_IORT_NODE_HEADER_DEF /* Node format common fields */ \ > > - uint8_t type; \ > > - uint16_t length; \ > > - uint8_t revision; \ > > - uint32_t reserved; \ > > - uint32_t mapping_count; \ > > - uint32_t mapping_offset; > > - > > -/* Values for node Type above */ > > -enum { > > - ACPI_IORT_NODE_ITS_GROUP = 0x00, > > - ACPI_IORT_NODE_NAMED_COMPONENT = 0x01, > > - ACPI_IORT_NODE_PCI_ROOT_COMPLEX = 0x02, > > - ACPI_IORT_NODE_SMMU = 0x03, > > - ACPI_IORT_NODE_SMMU_V3 = 0x04 > > -}; > > - > > -struct AcpiIortIdMapping { > > - uint32_t input_base; > > - uint32_t id_count; > > - uint32_t output_base; > > - uint32_t output_reference; > > - uint32_t flags; > > -} QEMU_PACKED; > > -typedef struct AcpiIortIdMapping AcpiIortIdMapping; > > - > > -struct AcpiIortMemoryAccess { > > - uint32_t cache_coherency; > > - uint8_t hints; > > - uint16_t reserved; > > - uint8_t memory_flags; > > -} QEMU_PACKED; > > -typedef struct AcpiIortMemoryAccess AcpiIortMemoryAccess; > > - > > -struct AcpiIortItsGroup { > > - ACPI_IORT_NODE_HEADER_DEF > > - uint32_t its_count; > > - uint32_t identifiers[]; > > -} QEMU_PACKED; > > -typedef struct AcpiIortItsGroup AcpiIortItsGroup; > > - > > -#define ACPI_IORT_SMMU_V3_COHACC_OVERRIDE 1 > > - > > -struct AcpiIortSmmu3 { > > - ACPI_IORT_NODE_HEADER_DEF > > - uint64_t base_address; > > - uint32_t flags; > > - uint32_t reserved2; > > - uint64_t vatos_address; > > - uint32_t model; > > - uint32_t event_gsiv; > > - uint32_t pri_gsiv; > > - uint32_t gerr_gsiv; > > - uint32_t sync_gsiv; > > - AcpiIortIdMapping id_mapping_array[]; > > -} QEMU_PACKED; > > -typedef struct AcpiIortSmmu3 AcpiIortSmmu3; > > - > > -struct AcpiIortRC { > > - ACPI_IORT_NODE_HEADER_DEF > > - AcpiIortMemoryAccess memory_properties; > > - uint32_t ats_attribute; > > - uint32_t pci_segment_number; > > - AcpiIortIdMapping id_mapping_array[]; > > -} QEMU_PACKED; > > -typedef struct AcpiIortRC AcpiIortRC; > > - > > #endif > > diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c > > index ac5e07e43c..b88ea4b70a 100644 > > --- a/hw/arm/virt-acpi-build.c > > +++ b/hw/arm/virt-acpi-build.c > > @@ -239,6 +239,21 @@ static void acpi_dsdt_add_tpm(Aml *scope, VirtMachineState *vms) > > } > > #endif > > > > +#define ID_MAPPING_ENTRY_SIZE 20 > > +#define SMMU_V3_ENTRY_SIZE 60 > > +#define ROOT_COMPLEX_ENTRY_SIZE 32 > > +#define IORT_NODE_OFFSET 48 > > + > > +static void build_iort_id_mapping(GArray *table_data, uint32_t out_ref) > > +{ > > + /* Identity RID mapping covering the whole input RID range */ > > + build_append_int_noprefix(table_data, 0, 4); /* Input base */ > > + build_append_int_noprefix(table_data, 0xFFFF, 4); /* Number of IDs */ > > + build_append_int_noprefix(table_data, 0, 4); /* Output base */ > > + build_append_int_noprefix(table_data, out_ref, 4); /* Output Reference */ > > + build_append_int_noprefix(table_data, 0, 4); /* Flags */ > > +} > > + > > /* > > * Input Output Remapping Table (IORT) > > * Conforms to "IO Remapping Table System Software on ARM Platforms", > > @@ -247,92 +262,88 @@ static void acpi_dsdt_add_tpm(Aml *scope, VirtMachineState *vms) > > static void > > build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) > > { > > - int nb_nodes; > > - AcpiIortIdMapping *idmap; > > - AcpiIortItsGroup *its; > > - AcpiIortSmmu3 *smmu; > > - size_t node_size, iort_node_offset = 48, smmu_offset = 0; > > - AcpiIortRC *rc; > > + size_t node_size, smmu_offset = 0; > > AcpiTable table = { .sig = "IORT", .rev = 0, .oem_id = vms->oem_id, > > .oem_table_id = vms->oem_table_id }; > > > > - if (vms->iommu == VIRT_IOMMU_SMMUV3) { > > - nb_nodes = 3; /* RC, ITS, SMMUv3 */ > > - } else { > > - nb_nodes = 2; /* RC, ITS */ > > - } > > - > > /* Table 2 The IORT */ > > acpi_init_table(&table, table_data); > > /* Number of IORT Nodes */ > > - build_append_int_noprefix(table_data, nb_nodes, 4); > > + if (vms->iommu == VIRT_IOMMU_SMMUV3) { > > + build_append_int_noprefix(table_data, 3 /* RC, ITS, SMMUv3 */, 4); > > + } else { > > + build_append_int_noprefix(table_data, 2 /* RC, ITS */, 4); > > + } > > /* Offset to Array of IORT Nodes */ > > - build_append_int_noprefix(table_data, iort_node_offset, 4); > > + build_append_int_noprefix(table_data, IORT_NODE_OFFSET, 4); > > build_append_int_noprefix(table_data, 0, 4); /* Reserved */ > > > > - /* ITS group node */ > > - node_size = sizeof(*its) + sizeof(uint32_t); > > - its = acpi_data_push(table_data, node_size); > > - > > - its->type = ACPI_IORT_NODE_ITS_GROUP; > > - its->length = cpu_to_le16(node_size); > > - its->its_count = cpu_to_le32(1); > > - its->identifiers[0] = 0; /* MADT translation_id */ > > + /* 3.1.1.3 ITS group node */ > > + build_append_int_noprefix(table_data, 0 /* ITS Group */, 1); /* Type */ > > + node_size = 20 /* fixed header size */ + 4 /* 1 GIC ITS Identifier */; > > + build_append_int_noprefix(table_data, node_size, 2); /* Length */ > > + build_append_int_noprefix(table_data, 0, 1); /* Revision */ > > + build_append_int_noprefix(table_data, 0, 4); /* Reserved */ > > + build_append_int_noprefix(table_data, 0, 4); /* Number of ID mappings */ > > + build_append_int_noprefix(table_data, 0, 4); /* Reference to ID Array */ > > + build_append_int_noprefix(table_data, 1, 4); /* Number of ITSs */ > > + /* GIC ITS Identifier Array */ > > + build_append_int_noprefix(table_data, 0 /* MADT translation_id */, 4); > > > > if (vms->iommu == VIRT_IOMMU_SMMUV3) { > > int irq = vms->irqmap[VIRT_SMMU] + ARM_SPI_BASE; > > > > - /* SMMUv3 node */ > > - smmu_offset = iort_node_offset + node_size; > > - node_size = sizeof(*smmu) + sizeof(*idmap); > > - smmu = acpi_data_push(table_data, node_size); > > - > > - smmu->type = ACPI_IORT_NODE_SMMU_V3; > > - smmu->length = cpu_to_le16(node_size); > > - smmu->mapping_count = cpu_to_le32(1); > > - smmu->mapping_offset = cpu_to_le32(sizeof(*smmu)); > > - smmu->base_address = cpu_to_le64(vms->memmap[VIRT_SMMU].base); > > - smmu->flags = cpu_to_le32(ACPI_IORT_SMMU_V3_COHACC_OVERRIDE); > > - smmu->event_gsiv = cpu_to_le32(irq); > > - smmu->pri_gsiv = cpu_to_le32(irq + 1); > > - smmu->sync_gsiv = cpu_to_le32(irq + 2); > > - smmu->gerr_gsiv = cpu_to_le32(irq + 3); > > - > > - /* Identity RID mapping covering the whole input RID range */ > > - idmap = &smmu->id_mapping_array[0]; > > - idmap->input_base = 0; > > - idmap->id_count = cpu_to_le32(0xFFFF); > > - idmap->output_base = 0; > > - /* output IORT node is the ITS group node (the first node) */ > > - idmap->output_reference = cpu_to_le32(iort_node_offset); > > + smmu_offset = table_data->len - table.table_offset; > > + /* 3.1.1.2 SMMUv3 */ > > + build_append_int_noprefix(table_data, 4 /* SMMUv3 */, 1); /* Type */ > > + node_size = SMMU_V3_ENTRY_SIZE + ID_MAPPING_ENTRY_SIZE; > > + build_append_int_noprefix(table_data, node_size, 2); /* Length */ > > + build_append_int_noprefix(table_data, 0, 1); /* Revision */ > > + build_append_int_noprefix(table_data, 0, 4); /* Reserved */ > > + build_append_int_noprefix(table_data, 1, 4); /* Number of ID mappings */ > > + /* Reference to ID Array */ > > + build_append_int_noprefix(table_data, SMMU_V3_ENTRY_SIZE, 4); > > + /* Base address */ > > + build_append_int_noprefix(table_data, vms->memmap[VIRT_SMMU].base, 8); > > + /* Flags */ > > + build_append_int_noprefix(table_data, 1 /* COHACC OverrideNote */, 4); > > + build_append_int_noprefix(table_data, 0, 4); /* Reserved */ > > + build_append_int_noprefix(table_data, 0, 8); /* VATOS address */ > > + /* Model */ > > + build_append_int_noprefix(table_data, 0 /* Generic SMMU-v3 */, 4); > > + build_append_int_noprefix(table_data, irq, 4); /* Event */ > > + build_append_int_noprefix(table_data, irq + 1, 4); /* PRI */ > > + build_append_int_noprefix(table_data, irq + 3, 4); /* GERR */ > > + build_append_int_noprefix(table_data, irq + 2, 4); /* Sync */ > > + > > + build_iort_id_mapping(table_data, IORT_NODE_OFFSET); > > } > > > > - /* Root Complex Node */ > > - node_size = sizeof(*rc) + sizeof(*idmap); > > - rc = acpi_data_push(table_data, node_size); > > - > > - rc->type = ACPI_IORT_NODE_PCI_ROOT_COMPLEX; > > - rc->length = cpu_to_le16(node_size); > > - rc->mapping_count = cpu_to_le32(1); > > - rc->mapping_offset = cpu_to_le32(sizeof(*rc)); > > - > > + /* Table 16 Root Complex Node */ > > + build_append_int_noprefix(table_data, 2 /* Root complex */, 1); /* Type */ > > + node_size = ROOT_COMPLEX_ENTRY_SIZE + ID_MAPPING_ENTRY_SIZE; > > + build_append_int_noprefix(table_data, node_size, 2); /* Length */ > > + build_append_int_noprefix(table_data, 0, 1); /* Revision */ > > + build_append_int_noprefix(table_data, 0, 4); /* Reserved */ > > + build_append_int_noprefix(table_data, 1, 4); /* Number of ID mappings */ > > + /* Reference to ID Array */ > > + build_append_int_noprefix(table_data, ROOT_COMPLEX_ENTRY_SIZE, 4); > > /* fully coherent device */ > > - rc->memory_properties.cache_coherency = cpu_to_le32(1); > > - rc->memory_properties.memory_flags = 0x3; /* CCA = CPM = DCAS = 1 */ > > - rc->pci_segment_number = 0; /* MCFG pci_segment */ > > - > > - /* Identity RID mapping covering the whole input RID range */ > > - idmap = &rc->id_mapping_array[0]; > > - idmap->input_base = 0; > > - idmap->id_count = cpu_to_le32(0xFFFF); > > - idmap->output_base = 0; > > - > > + build_append_int_noprefix(table_data, > > + 1 | /* CCA: Cache Coherent Attribute, The device is fully coherent */ > > + (3ULL << 7 * 8) /* MAF: Memory Access Flags, CCA = CPM = DCAS = 1 */, > > + 8); > > + build_append_int_noprefix(table_data, 0, 4); /* ATS Attribute */ > > + /* MCFG pci_segment */ > > + build_append_int_noprefix(table_data, 0, 4); /* PCI Segment number */ > > + > > + /* Output Reference */ > > if (vms->iommu == VIRT_IOMMU_SMMUV3) { > > /* output IORT node is the smmuv3 node */ > > - idmap->output_reference = cpu_to_le32(smmu_offset); > > + build_iort_id_mapping(table_data, smmu_offset); > > } else { > > /* output IORT node is the ITS group node (the first node) */ > > - idmap->output_reference = cpu_to_le32(iort_node_offset); > > + build_iort_id_mapping(table_data, IORT_NODE_OFFSET); > > } > > > > acpi_table_composed(linker, &table); > > -- > > 2.27.0 >