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=-12.3 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,UNWANTED_LANGUAGE_BODY, USER_AGENT_SANE_2 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 64C55C4338F for ; Tue, 10 Aug 2021 10:53:18 +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 9F1EF60F11 for ; Tue, 10 Aug 2021 10:53:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 9F1EF60F11 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]:40584 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mDPNk-0003xC-KA for qemu-devel@archiver.kernel.org; Tue, 10 Aug 2021 06:53:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36214) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mDPMy-0002zo-R6 for qemu-devel@nongnu.org; Tue, 10 Aug 2021 06:52:28 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:36257) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mDPMv-00050R-8v for qemu-devel@nongnu.org; Tue, 10 Aug 2021 06:52:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1628592743; 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=jMzXcZwPo+PiRQDri1HYvLKMvjLU3OOpAQYPMIih+Q8=; b=c4uikgVm5kC8JfwqhGd8qclDHw3T9T1fueWFjvWLU8tGgxMXfxtvAjrOPPC3iYoZkhekPY iz35MAgRNs/lUM+O6F961Ho5BkH8BfBBGsR3oVR3ca71qUOBm/KAdKZlmj57lG/pMxY1iB UaSQSJHcia9x8c/Lsc3L77MHzU0p8YE= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-112-2tflu9LxNHK114mnx4Z-Rw-1; Tue, 10 Aug 2021 06:52:22 -0400 X-MC-Unique: 2tflu9LxNHK114mnx4Z-Rw-1 Received: by mail-wr1-f72.google.com with SMTP id d10-20020a056000114ab02901537f048363so6284398wrx.8 for ; Tue, 10 Aug 2021 03:52:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jMzXcZwPo+PiRQDri1HYvLKMvjLU3OOpAQYPMIih+Q8=; b=jC+GRlA51sCf9CWPZ1A+qXp1e1tbBamX92azDwNyDSGLXkVySSftz/d/7Hz5c3NkHa Q4WCBNaeTVZYfl1ddAB5z17QzEPDD5ugu1eLpmNqP037qzJR0nMUEEjYq9ESNYVp5oRZ fqeMOcVNHqG69Ch2HK5w/tNf0Xgdmr4ea7kLqRRbtFgculSmU92/B++CzGe54m+TdVpU ineK4yGLV9Cfnk4JIdr2F3X9jT4Uua7e3eF1LFj9ihI5tncmDNYFyc/ZrautF2vkqcbm 8ZE7gas3EqVpKCizPwRzzUEaejoXhyXfDVyskZ8iiOF/cxr3nuSRY5UPWNJH8cughaYk jMgw== X-Gm-Message-State: AOAM531gT0pJM3QXe/9pY83y92IU13NisCjcJ14wjDQgBWjueMw/0D9U k6zV8aKcwUXPqA2M3ctxlMC4ogOpHbfKF7SUXbvQwyMUzX38TCD4N4GGgkniuDNyqxi6HKcVVBL ZpqPyEu6fKJc0ogs= X-Received: by 2002:a1c:4c05:: with SMTP id z5mr3923141wmf.145.1628592741426; Tue, 10 Aug 2021 03:52:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxfvzPURnHY/MPI3hEwc0WQT3RAZNUUrd9JCGO+9gIG+M/UzkjH765aLdC1nIRQtC5hGc6WdA== X-Received: by 2002:a1c:4c05:: with SMTP id z5mr3923115wmf.145.1628592741159; Tue, 10 Aug 2021 03:52:21 -0700 (PDT) Received: from localhost (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id w9sm20220708wmc.19.2021.08.10.03.52.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 03:52:20 -0700 (PDT) Date: Tue, 10 Aug 2021 12:52:14 +0200 From: Igor Mammedov To: Eric Auger Subject: Re: [PATCH for-6.2] hw/arm/virt_acpi_build: Generate DBG2 table Message-ID: <20210810125214.7dadd76b@redhat.com> In-Reply-To: <20210810083057.99651-1-eric.auger@redhat.com> References: <20210810083057.99651-1-eric.auger@redhat.com> X-Mailer: Claws Mail 3.18.0 (GTK+ 2.24.33; x86_64-redhat-linux-gnu) MIME-Version: 1.0 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=170.10.133.124; envelope-from=imammedo@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.702, 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_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, gshan@redhat.com, mst@redhat.com, qemu-devel@nongnu.org, shannon.zhaosl@gmail.com, qemu-arm@nongnu.org, philmd@redhat.com, ardb@kernel.org, eric.auger.pro@gmail.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Tue, 10 Aug 2021 10:30:57 +0200 Eric Auger wrote: > ARM SBBR specification mandates DBG2 table (Debug Port Table 2). > this latter allows to describe one or more debug ports. > > Generate an DBG2 table featuring a single debug port, the PL011. > > The DBG2 specification can be found at: > https://docs.microsoft.com/en-us/windows-hardware/drivers/bringup/acpi-debug-port-table?redirectedfrom=MSDN > > Signed-off-by: Eric Auger using packed structures for composing ACPI tables is discouraged, pls use build_append_int_noprefix() API instead. You can look at build_amd_iommu() as an example. PS: Also note field comments format. /it should be verbatim copy of entry name from respective table in spec/ > > --- > > Tested by comparing the content with the table generated > by EDK2 along with the SBSA-REF machine (code generated by > DynamicTablesPkg/Library/Acpi/Arm/AcpiDbg2LibArm/Dbg2Generator.c). > > I reused the Generic Address Structure filled by QEMU in the SPCR, ie. > bit_width = 8 and byte access. While EDK2 sets bit_width = 32 and > dword access. Also the name exposed by acpica tools is different: > 'COM0' in my case where '\_SB.COM0' in SBSA-REF case? > --- > hw/arm/virt-acpi-build.c | 77 ++++++++++++++++++++++++++++++++++++- > include/hw/acpi/acpi-defs.h | 50 ++++++++++++++++++++++++ > 2 files changed, 126 insertions(+), 1 deletion(-) > > diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c > index 037cc1fd82..35f27b41df 100644 > --- a/hw/arm/virt-acpi-build.c > +++ b/hw/arm/virt-acpi-build.c > @@ -563,6 +563,78 @@ build_gtdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) > vms->oem_table_id); > } > > +#define ACPI_DBG2_PL011_UART_LENGTH 0x1000 > + > +/* DBG2 */ > +static void > +build_dbg2(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) > +{ > + int addr_offset, addrsize_offset, namespace_offset, namespace_length; > + const MemMapEntry *uart_memmap = &vms->memmap[VIRT_UART]; > + struct AcpiGenericAddress *base_address; > + int dbg2_start = table_data->len; > + AcpiDbg2Device *dbg2dev; > + char name[] = "COM0"; > + AcpiDbg2Table *dbg2; > + uint32_t *addr_size; > + uint8_t *namespace; > + > + dbg2 = acpi_data_push(table_data, sizeof *dbg2); > + dbg2->info_offset = sizeof *dbg2; > + dbg2->info_count = 1; > + > + /* debug device info structure */ > + > + dbg2dev = acpi_data_push(table_data, sizeof(AcpiDbg2Device)); > + > + dbg2dev->revision = 0; > + namespace_length = sizeof name; > + dbg2dev->length = sizeof *dbg2dev + sizeof(struct AcpiGenericAddress) + > + 4 + namespace_length; > + dbg2dev->register_count = 1; > + > + addr_offset = sizeof *dbg2dev; > + addrsize_offset = addr_offset + sizeof(struct AcpiGenericAddress); > + namespace_offset = addrsize_offset + 4; > + > + dbg2dev->namepath_length = cpu_to_le16(namespace_length); > + dbg2dev->namepath_offset = cpu_to_le16(namespace_offset); > + dbg2dev->oem_data_length = cpu_to_le16(0); > + dbg2dev->oem_data_offset = cpu_to_le16(0); /* No OEM data is present */ > + dbg2dev->port_type = cpu_to_le16(ACPI_DBG2_SERIAL_PORT); > + dbg2dev->port_subtype = cpu_to_le16(ACPI_DBG2_ARM_PL011); > + > + dbg2dev->base_address_offset = cpu_to_le16(addr_offset); > + dbg2dev->address_size_offset = cpu_to_le16(addrsize_offset); > + > + /* > + * variable length content: > + * BaseAddressRegister[1] > + * AddressSize[1] > + * NamespaceString[1] > + */ > + > + base_address = acpi_data_push(table_data, > + sizeof(struct AcpiGenericAddress)); > + > + base_address->space_id = AML_SYSTEM_MEMORY; > + base_address->bit_width = 8; > + base_address->bit_offset = 0; > + base_address->access_width = 1; > + base_address->address = cpu_to_le64(uart_memmap->base); > + > + addr_size = acpi_data_push(table_data, sizeof *addr_size); > + *addr_size = cpu_to_le32(ACPI_DBG2_PL011_UART_LENGTH); > + > + namespace = acpi_data_push(table_data, namespace_length); > + memcpy(namespace, name, namespace_length); > + > + build_header(linker, table_data, > + (void *)(table_data->data + dbg2_start), "DBG2", > + table_data->len - dbg2_start, 3, vms->oem_id, > + vms->oem_table_id); > +} > + > /* MADT */ > static void > build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) > @@ -790,7 +862,7 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables) > dsdt = tables_blob->len; > build_dsdt(tables_blob, tables->linker, vms); > > - /* FADT MADT GTDT MCFG SPCR pointed to by RSDT */ > + /* FADT MADT GTDT MCFG SPCR DBG2 pointed to by RSDT */ > acpi_add_table(table_offsets, tables_blob); > build_fadt_rev5(tables_blob, tables->linker, vms, dsdt); > > @@ -813,6 +885,9 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables) > acpi_add_table(table_offsets, tables_blob); > build_spcr(tables_blob, tables->linker, vms); > > + acpi_add_table(table_offsets, tables_blob); > + build_dbg2(tables_blob, tables->linker, vms); > + > if (vms->ras) { > build_ghes_error_table(tables->hardware_errors, tables->linker); > acpi_add_table(table_offsets, tables_blob); > diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h > index cf9f44299c..bdb2ebed2c 100644 > --- a/include/hw/acpi/acpi-defs.h > +++ b/include/hw/acpi/acpi-defs.h > @@ -618,4 +618,54 @@ struct AcpiIortRC { > } QEMU_PACKED; > typedef struct AcpiIortRC AcpiIortRC; > > +/* DBG2 */ > + > +/* Types for port_type field above */ > + > +#define ACPI_DBG2_SERIAL_PORT 0x8000 > +#define ACPI_DBG2_1394_PORT 0x8001 > +#define ACPI_DBG2_USB_PORT 0x8002 > +#define ACPI_DBG2_NET_PORT 0x8003 > + > +/* Subtypes for port_subtype field above */ > + > +#define ACPI_DBG2_16550_COMPATIBLE 0x0000 > +#define ACPI_DBG2_16550_SUBSET 0x0001 > +#define ACPI_DBG2_ARM_PL011 0x0003 > +#define ACPI_DBG2_ARM_SBSA_32BIT 0x000D > +#define ACPI_DBG2_ARM_SBSA_GENERIC 0x000E > +#define ACPI_DBG2_ARM_DCC 0x000F > +#define ACPI_DBG2_BCM2835 0x0010 > + > +#define ACPI_DBG2_1394_STANDARD 0x0000 > + > +#define ACPI_DBG2_USB_XHCI 0x0000 > +#define ACPI_DBG2_USB_EHCI 0x0001 > + > +/* Debug Device Information Subtable */ > + > +struct AcpiDbg2Device { > + uint8_t revision; > + uint16_t length; > + uint8_t register_count; /* Number of base_address registers */ > + uint16_t namepath_length; > + uint16_t namepath_offset; > + uint16_t oem_data_length; > + uint16_t oem_data_offset; > + uint16_t port_type; > + uint16_t port_subtype; > + uint8_t reserved[2]; > + uint16_t base_address_offset; > + uint16_t address_size_offset; > +} QEMU_PACKED; > +typedef struct AcpiDbg2Device AcpiDbg2Device; > + > +struct AcpiDbg2Table { > + ACPI_TABLE_HEADER_DEF /* ACPI common table header */ > + uint32_t info_offset; /* offset to the first debug struct */ > + uint32_t info_count; /* number of debug device info struct entries */ > + uint8_t dbg2_device_info[]; > +} QEMU_PACKED; > +typedef struct AcpiDbg2Table AcpiDbg2Table; > + > #endif