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=-14.5 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, 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 757E2C432BE for ; Thu, 2 Sep 2021 15:52:38 +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 0AF95603E9 for ; Thu, 2 Sep 2021 15:52:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 0AF95603E9 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]:56600 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mLp13-0004W4-5n for qemu-devel@archiver.kernel.org; Thu, 02 Sep 2021 11:52:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55292) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLoyb-0002AC-1j for qemu-devel@nongnu.org; Thu, 02 Sep 2021 11:50:05 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:37237) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLoyX-0003K9-O4 for qemu-devel@nongnu.org; Thu, 02 Sep 2021 11:50:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630597800; 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=zfH8SyTJ8O8EKUloFW2XjBlIIzOxLPdSKQyAuV5NCbQ=; b=P5SEt/CL3nahJ4gqyd7fyvb1l8LZaf1/yNe2kz4s2VENXBcNsl+QPtoJ8aSJgilkJMuF5N 43QMmDs8LPAjQ+GRl1y1x2lGCio/nw+6HX8li7IliJyqPvXFgM4bmHSLR7nZrJ3bYhaeQC hExhY2uWbBsjFRBXzvM3N5j6QF37PuQ= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-335-98BNu8G7MianHbmok_9pig-1; Thu, 02 Sep 2021 11:49:58 -0400 X-MC-Unique: 98BNu8G7MianHbmok_9pig-1 Received: by mail-wm1-f69.google.com with SMTP id a201-20020a1c7fd2000000b002e748bf0544so1219153wmd.2 for ; Thu, 02 Sep 2021 08:49:57 -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=zfH8SyTJ8O8EKUloFW2XjBlIIzOxLPdSKQyAuV5NCbQ=; b=jobdJvGYPj0NfDtgNk3lWQYmZ2DYO4JDqkE9/fzIGz1jIDX6JglhaAmCkhyM0CqOfQ iyR1eZwK7XYl42NZNO/87EizKiSERN8D/1jc5o7ybPvr0UX52JenI+t3UeUw43ka9lPc /SNlPbyyNLAjttwV0PiVo9ljR/tMuqlvJlMjHFvxdmQX0ooMhT1kzj+1X4lTwX4brNGM NUtj45UmJGqXqHQYopatwTqIMIbnkg0GdBbqu9H/cMfmSE7WQygla74IEmnUVmP4zgXc hK1cESmsz1+PsRmsIcMKDJbKnh9MCW7kvsPTICUb5vqotdsjh9EyMAg8Baj6k4F2Q8KY CJQQ== X-Gm-Message-State: AOAM530ieVE9GolZU5dtw7pQ9oGFke6plR+RAI/Mo7nyU3BQ+pSI1qzf Urq7Id7TE5FKL4ynnJrfDgRXu/HI2Z9fXooVRqyWw+plCWXX/pbuWEyyNV0vTtxe2vgSJnAtLFC xGqKL2MtB5r4oRs0= X-Received: by 2002:a05:600c:4ece:: with SMTP id g14mr3899463wmq.6.1630597796983; Thu, 02 Sep 2021 08:49:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzbJHMKCfVMQGSvwEvmkX+IiQSJOdclzzAhy5KRimLx4DtGzVXblbySzD5aBtoLpNrcyiv99g== X-Received: by 2002:a05:600c:4ece:: with SMTP id g14mr3899449wmq.6.1630597796780; Thu, 02 Sep 2021 08:49:56 -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 r12sm2320512wrv.96.2021.09.02.08.49.55 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 02 Sep 2021 08:49:56 -0700 (PDT) Subject: Re: [PATCH v2 31/35] acpi: arm/virt: build_spcr: use acpi_init_table()/acpi_table_composed() instead of build_header() To: Igor Mammedov , qemu-devel@nongnu.org References: <20210708154617.1538485-1-imammedo@redhat.com> <20210708154617.1538485-32-imammedo@redhat.com> From: Eric Auger Message-ID: <9c3ae446-3ed4-7a49-721a-95ad3e6d66cf@redhat.com> Date: Thu, 2 Sep 2021 17:49:55 +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-32-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=216.205.24.124; envelope-from=eauger@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -53 X-Spam_score: -5.4 X-Spam_bar: ----- X-Spam_report: (-5.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.39, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-2.225, 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: > it replaces error-prone pointer arithmetic for build_header() API, > with 2 calls to start and finish table creation, > which hides offsets magic from API user. > > while at it, replace packed structure with endian agnostic > build_append_FOO() API. > > 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 | 32 ----------------- > hw/arm/virt-acpi-build.c | 68 ++++++++++++++++++++++--------------- > 2 files changed, 41 insertions(+), 59 deletions(-) > > diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h > index 6f2f08a9de..012c4ffb3a 100644 > --- a/include/hw/acpi/acpi-defs.h > +++ b/include/hw/acpi/acpi-defs.h > @@ -117,38 +117,6 @@ typedef struct AcpiFadtData { > #define ACPI_FADT_ARM_PSCI_COMPLIANT (1 << 0) > #define ACPI_FADT_ARM_PSCI_USE_HVC (1 << 1) > > -/* > - * Serial Port Console Redirection Table (SPCR), Rev. 1.02 > - * > - * For .interface_type see Debug Port Table 2 (DBG2) serial port > - * subtypes in Table 3, Rev. May 22, 2012 > - */ > -struct AcpiSerialPortConsoleRedirection { > - ACPI_TABLE_HEADER_DEF > - uint8_t interface_type; > - uint8_t reserved1[3]; > - struct AcpiGenericAddress base_address; > - uint8_t interrupt_types; > - uint8_t irq; > - uint32_t gsi; > - uint8_t baud; > - uint8_t parity; > - uint8_t stopbits; > - uint8_t flowctrl; > - uint8_t term_type; > - uint8_t reserved2; > - uint16_t pci_device_id; > - uint16_t pci_vendor_id; > - uint8_t pci_bus; > - uint8_t pci_slot; > - uint8_t pci_func; > - uint32_t pci_flags; > - uint8_t pci_seg; > - uint32_t reserved3; > -} QEMU_PACKED; > -typedef struct AcpiSerialPortConsoleRedirection > - AcpiSerialPortConsoleRedirection; > - > /* > * ACPI 1.0 Firmware ACPI Control Structure (FACS) > */ > diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c > index a07540affb..e8553dcae5 100644 > --- a/hw/arm/virt-acpi-build.c > +++ b/hw/arm/virt-acpi-build.c > @@ -349,39 +349,53 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) > acpi_table_composed(linker, &table); > } > > +/* > + * Serial Port Console Redirection Table (SPCR) > + * Rev: 1.07 > + */ was /* * Serial Port Console Redirection Table (SPCR), Rev. 1.02 */ By the way https://uefi.org/acpi/specs does not list 1.02 nor 1.07 https://docs.microsoft.com/en-us/windows-hardware/drivers/serports/serial-port-console-redirection-table ? > static void > build_spcr(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) > { > - AcpiSerialPortConsoleRedirection *spcr; > - const MemMapEntry *uart_memmap = &vms->memmap[VIRT_UART]; > - int irq = vms->irqmap[VIRT_UART] + ARM_SPI_BASE; > - int spcr_start = table_data->len; > - > - spcr = acpi_data_push(table_data, sizeof(*spcr)); > - > - spcr->interface_type = 0x3; /* ARM PL011 UART */ > - > - spcr->base_address.space_id = AML_AS_SYSTEM_MEMORY; > - spcr->base_address.bit_width = 8; > - spcr->base_address.bit_offset = 0; > - spcr->base_address.access_width = 1; > - spcr->base_address.address = cpu_to_le64(uart_memmap->base); > - > - spcr->interrupt_types = (1 << 3); /* Bit[3] ARMH GIC interrupt */ > - spcr->gsi = cpu_to_le32(irq); /* Global System Interrupt */ > + AcpiTable table = { .sig = "SPCR", .rev = 2, .oem_id = vms->oem_id, > + .oem_table_id = vms->oem_table_id }; > > - spcr->baud = 3; /* Baud Rate: 3 = 9600 */ > - spcr->parity = 0; /* No Parity */ > - spcr->stopbits = 1; /* 1 Stop bit */ > - spcr->flowctrl = (1 << 1); /* Bit[1] = RTS/CTS hardware flow control */ > - spcr->term_type = 0; /* Terminal Type: 0 = VT100 */ > + acpi_init_table(&table, table_data); > > - spcr->pci_device_id = 0xffff; /* PCI Device ID: not a PCI device */ > - spcr->pci_vendor_id = 0xffff; /* PCI Vendor ID: not a PCI device */ > + /* Interface Type */ > + build_append_int_noprefix(table_data, 3, 1); /* ARM PL011 UART */ > + build_append_int_noprefix(table_data, 0, 3); /* Reserved */ > + /* Base Address */ > + build_append_gas(table_data, AML_AS_SYSTEM_MEMORY, 8, 0, 1, > + vms->memmap[VIRT_UART].base); > + /* Interrupt Type */ > + build_append_int_noprefix(table_data, > + (1 << 3) /* Bit[3] ARMH GIC interrupt */, 1); > + build_append_int_noprefix(table_data, 0, 1); /* IRQ */ > + /* Global System Interrupt */ > + build_append_int_noprefix(table_data, > + vms->irqmap[VIRT_UART] + ARM_SPI_BASE, 4); > + build_append_int_noprefix(table_data, 3 /* 9600 */, 1); /* Baud Rate */ > + build_append_int_noprefix(table_data, 0 /* No Parity */, 1); /* Parity */ > + /* Stop Bits */ > + build_append_int_noprefix(table_data, 1 /* 1 Stop bit */, 1); > + /* Flow Control */ > + build_append_int_noprefix(table_data, > + (1 << 1) /* RTS/CTS hardware flow control */, 1); > + /* Terminal Type */ > + build_append_int_noprefix(table_data, 0 /* VT100 */, 1); > + build_append_int_noprefix(table_data, 0, 1); /* Language */ reserved2 -> language in 1.07? but that's fine maybe just mention it in the commit msg? > + /* PCI Device ID */ > + build_append_int_noprefix(table_data, 0xffff /* not a PCI device*/, 2); > + /* PCI Vendor ID */ > + build_append_int_noprefix(table_data, 0xffff /* not a PCI device*/, 2); > + build_append_int_noprefix(table_data, 0, 1); /* PCI Bus Number */ > + build_append_int_noprefix(table_data, 0, 1); /* PCI Device Number */ > + build_append_int_noprefix(table_data, 0, 1); /* PCI Function Number */ > + build_append_int_noprefix(table_data, 0, 4); /* PCI Flags */ > + build_append_int_noprefix(table_data, 0, 1); /* PCI Segment */ > + build_append_int_noprefix(table_data, 0, 4); /* Reserved */ > > - build_header(linker, table_data, (void *)(table_data->data + spcr_start), > - "SPCR", table_data->len - spcr_start, 2, vms->oem_id, > - vms->oem_table_id); > + acpi_table_composed(linker, &table); > } > > /* > Reviewed-by: Eric Auger Eric