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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B438BC433EF for ; Thu, 7 Oct 2021 11:10:54 +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 530DD610C7 for ; Thu, 7 Oct 2021 11:10:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 530DD610C7 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]:55342 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mYRIb-0002PK-Ip for qemu-devel@archiver.kernel.org; Thu, 07 Oct 2021 07:10:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57628) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYRGS-0007yf-Tc for qemu-devel@nongnu.org; Thu, 07 Oct 2021 07:08:40 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:33212) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYRGL-0001XM-Ga for qemu-devel@nongnu.org; Thu, 07 Oct 2021 07:08:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633604912; 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=37jVCLtiWIcTOaLes31gpJA4yIbvxPRqQeRkOSGMNK4=; b=BlyInefoGyn6zf2gLzu0YWeOK4BrqUtiap7UVbn+C/9rU574wLaTEF7H96S1bQhsBnHq5G 0JDnged17kVsdoUMtSWuK3Iv8zfb/UrOfoYP0I+qLqq2S7cmzYdb5Sslu2D2V9iBzZDGPQ 0aV0rZNRDBEv3g/7o1LCJtoPx+KXu9Q= 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-541-bFHzBrSPMPeBlbs0OQ9sXQ-1; Thu, 07 Oct 2021 07:08:31 -0400 X-MC-Unique: bFHzBrSPMPeBlbs0OQ9sXQ-1 Received: by mail-wr1-f72.google.com with SMTP id k16-20020a5d6290000000b00160753b430fso4415055wru.11 for ; Thu, 07 Oct 2021 04:08:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=37jVCLtiWIcTOaLes31gpJA4yIbvxPRqQeRkOSGMNK4=; b=edDwZMPK4nd2gawsXGhmJYB5HegzMDj9Qfijtd//wq0hH/EePTTiGE2LMl/4Eofrgt mZXIdChJd6ThTlKwP9v5OQiTzXNd5m3/XBsMlOY4Fi2ySPkg6QYCZ7LV1yF132YxKxSq Bu9k3f2C8qjBMlZu7P4PydytsTfDIS1GDClXFyYDG/152cXnjazfzVJCV5vydINRX42O oRU0Y5GXgvGmect6LiQbr+tueS2rqXuCreeotJqWc423hwRjFVsiI/aJxJXu/bkygXP8 RsRitqgfyBsjEogj5Jv2yCwyFVUqVEJFyZFtU8EytUa0O/IpbPwr7wzkexJSXK9EGL1s KYpA== X-Gm-Message-State: AOAM530tuuKCLBrlg+EiWq3+tysMi+0NNne/IjSvjgqQqYwpMBLHx5+D L0UI28CK2u+hATXdUMOwesGHqZuJunsO756ySSg38/BTOWELxk519k/qRPlZB0oNpkzLEo2gTS6 QxpQq4wSv5+lchbY= X-Received: by 2002:adf:9084:: with SMTP id i4mr4571986wri.304.1633604910825; Thu, 07 Oct 2021 04:08:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwPzOuGxgWehyJwABEILgRXVYr/f3a3cE8kxPKWrp41xbpudevBjVZXZEQLKJeX0U2lEDvpVA== X-Received: by 2002:adf:9084:: with SMTP id i4mr4571953wri.304.1633604910552; Thu, 07 Oct 2021 04:08:30 -0700 (PDT) Received: from localhost (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id 36sm21823832wrc.92.2021.10.07.04.08.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 04:08:30 -0700 (PDT) Date: Thu, 7 Oct 2021 13:08:29 +0200 From: Igor Mammedov To: Eric Auger Subject: Re: [PATCH v4 2/3] hw/arm/virt_acpi_build: Generate DBG2 table Message-ID: <20211007130829.52bf119c@redhat.com> In-Reply-To: <20211007072922.655330-3-eric.auger@redhat.com> References: <20211007072922.655330-1-eric.auger@redhat.com> <20211007072922.655330-3-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=216.205.24.124; envelope-from=imammedo@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.05, 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=unavailable 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 Thu, 7 Oct 2021 09:29:21 +0200 Eric Auger wrote: > ARM SBBR specification mandates DBG2 table (Debug Port Table 2) > since v1.0 (ARM DEN0044F 8.3.1.7 DBG2). > > The DBG2 table 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 > "Microsoft Debug Port Table 2 (DBG2)" > https://docs.microsoft.com/en-us/windows-hardware/drivers/bringup/acpi-debug-port-table?redirectedfrom=MSDN > > Signed-off-by: Eric Auger > Acked-by: Michael S. Tsirkin Reviewed-by: Igor Mammedov > > --- > > v3 -> v4: > - Change the revision in the header (0), + vs comments, > s/0x1000/vms->memmap[VIRT_UART].size > - Added Michael's A-b > > v2 -> v3: > Took into account all comments from Igor on v2: > mostly style adjustment, revision references > > v1 -> v2: > - rebased on Igor's refactoring > --- > hw/arm/virt-acpi-build.c | 63 +++++++++++++++++++++++++++++++++++++++- > 1 file changed, 62 insertions(+), 1 deletion(-) > > diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c > index 6cec97352b..dd17a48c00 100644 > --- a/hw/arm/virt-acpi-build.c > +++ b/hw/arm/virt-acpi-build.c > @@ -616,6 +616,64 @@ build_gtdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) > acpi_table_end(linker, &table); > } > > +/* Debug Port Table 2 (DBG2) */ > +static void > +build_dbg2(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) > +{ > + AcpiTable table = { .sig = "DBG2", .rev = 0, .oem_id = vms->oem_id, > + .oem_table_id = vms->oem_table_id }; > + int dbg2devicelength; > + const char name[] = "COM0"; > + const int namespace_length = sizeof(name); > + > + acpi_table_begin(&table, table_data); > + > + dbg2devicelength = 22 + /* BaseAddressRegister[] offset */ > + 12 + /* BaseAddressRegister[] */ > + 4 + /* AddressSize[] */ > + namespace_length /* NamespaceString[] */; > + > + /* OffsetDbgDeviceInfo */ > + build_append_int_noprefix(table_data, 44, 4); > + /* NumberDbgDeviceInfo */ > + build_append_int_noprefix(table_data, 1, 4); > + > + /* Table 2. Debug Device Information structure format */ > + build_append_int_noprefix(table_data, 0, 1); /* Revision */ > + build_append_int_noprefix(table_data, dbg2devicelength, 2); /* Length */ > + /* NumberofGenericAddressRegisters */ > + build_append_int_noprefix(table_data, 1, 1); > + /* NameSpaceStringLength */ > + build_append_int_noprefix(table_data, namespace_length, 2); > + build_append_int_noprefix(table_data, 38, 2); /* NameSpaceStringOffset */ > + build_append_int_noprefix(table_data, 0, 2); /* OemDataLength */ > + /* OemDataOffset (0 means no OEM data) */ > + build_append_int_noprefix(table_data, 0, 2); > + > + /* Port Type */ > + build_append_int_noprefix(table_data, 0x8000 /* Serial */, 2); > + /* Port Subtype */ > + build_append_int_noprefix(table_data, 0x3 /* ARM PL011 UART */, 2); > + build_append_int_noprefix(table_data, 0, 2); /* Reserved */ > + /* BaseAddressRegisterOffset */ > + build_append_int_noprefix(table_data, 22, 2); > + /* AddressSizeOffset */ > + build_append_int_noprefix(table_data, 34, 2); > + > + /* BaseAddressRegister[] */ > + build_append_gas(table_data, AML_AS_SYSTEM_MEMORY, 8, 0, 1, > + vms->memmap[VIRT_UART].base); > + > + /* AddressSize[] */ > + build_append_int_noprefix(table_data, > + vms->memmap[VIRT_UART].size, 4); > + > + /* NamespaceString[] */ > + g_array_append_vals(table_data, name, namespace_length); > + > + acpi_table_end(linker, &table); > +}; > + > /* > * ACPI spec, Revision 5.1 Errata A > * 5.2.12 Multiple APIC Description Table (MADT) > @@ -875,7 +933,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); > > @@ -898,6 +956,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);