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 5B911C433F5 for ; Tue, 28 Sep 2021 17:58:15 +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 B67066120C for ; Tue, 28 Sep 2021 17:58:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org B67066120C 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]:40234 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVHMr-0004yr-OZ for qemu-devel@archiver.kernel.org; Tue, 28 Sep 2021 13:58:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55522) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVHLm-0003vw-OV for qemu-devel@nongnu.org; Tue, 28 Sep 2021 13:57:06 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:41035) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVHLj-0006SW-4n for qemu-devel@nongnu.org; Tue, 28 Sep 2021 13:57:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632851821; 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=6olJ3Up6dvLMGwXFluEBLW+GsUxd5kkmN42dYrE/IGU=; b=hDPf4xKRQ17r31jzSlt8FoGaRdR8iWQNKJ3ucv6Uo81JjqnvwZpL20Bgt8c1rXPX/g/QTJ +n5vSLwIvuv0rTjK3jMO9u1yoR6uoi6xDPtG5G881ZwNmisQV8NYPCkAGS41a4koEftuW2 CJB1n7pPhcclgDXCaR9R902jP01UlFI= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-438--1pXwTumPheXp2MpjZbZSw-1; Tue, 28 Sep 2021 13:57:00 -0400 X-MC-Unique: -1pXwTumPheXp2MpjZbZSw-1 Received: by mail-wm1-f71.google.com with SMTP id r66-20020a1c4445000000b0030cf0c97157so2404405wma.1 for ; Tue, 28 Sep 2021 10:57:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=6olJ3Up6dvLMGwXFluEBLW+GsUxd5kkmN42dYrE/IGU=; b=RJYvMF8vRhte4CNEXRLjAEkNDy/Q35H8nVl8iswjHgR/HrLvbtkcjsRcGfKOtj0DQ6 aeaI7zySrIVIQYufTKzkPNXJHVt8m4Of56kRYDE6dXhRJoVuallECa+UkcyCPcIfTlYC dvfSPFzYOfK7kPyf9ivgdLyxrO/OaTHh7vtxzmpA2nSg6Ht9YNDn7yN0J6YYCLCGjK9Z BfK+6eFUDOzkie8eWLAG1HDOYlm9u51J1WADQQ+UaKrlek0qEj4bWzwjtIK07bPp/OM/ tsxsmAkDcpX1u2t2QYeM8kXqOTM9eHwLnQc03RaKWTbrP4GGrHr2XVFIfIMutqWUqAYN mQTw== X-Gm-Message-State: AOAM531QfbaHXZa6F+Kx/eu78ubD6x0Js+fSdhyth7iuyTjlg64L20gt e97iuLYEYtKa4zqPlxKUFmQpmkEFMTuvc3SQ2iHDPLnNtcHcf7b0LNqILM/t90kZsGWGQaqUY7F bmw7WPbNiiS6r3rA= X-Received: by 2002:a7b:c151:: with SMTP id z17mr5931028wmi.178.1632851819225; Tue, 28 Sep 2021 10:56:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxhkNkwXvGD5+NkLWSs8BRSzL5Qc39Y3MPwb9hATr/HLPZP7FOtODCxQG8Dt7BkJbo1yIBFXQ== X-Received: by 2002:a7b:c151:: with SMTP id z17mr5931009wmi.178.1632851818997; Tue, 28 Sep 2021 10:56:58 -0700 (PDT) Received: from [192.168.1.36] (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id u5sm21789251wrg.57.2021.09.28.10.56.57 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 28 Sep 2021 10:56:58 -0700 (PDT) Message-ID: <9e20c38f-4d93-0658-c309-499c8976adc9@redhat.com> Date: Tue, 28 Sep 2021 19:56:56 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.1.0 Subject: Re: [PATCH 2/3] hw/arm/virt-acpi-build: IORT upgrade up to revision E.b To: Eric Auger , eric.auger.pro@gmail.com, imammedo@redhat.com, jean-philippe@linaro.org, peter.maydell@linaro.org, shannon.zhaosl@gmail.com, qemu-arm@nongnu.org, qemu-devel@nongnu.org, drjones@redhat.com References: <20210928172133.79665-1-eric.auger@redhat.com> <20210928172133.79665-3-eric.auger@redhat.com> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= In-Reply-To: <20210928172133.79665-3-eric.auger@redhat.com> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=philmd@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.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-2.562, 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: gshan@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Hi Eric, On 9/28/21 19:21, Eric Auger wrote: > Upgrade the IORT table from B to E.b specification > revision (ARM DEN 0049E.b). > > Signed-off-by: Eric Auger > --- > hw/arm/virt-acpi-build.c | 47 ++++++++++++++++++++++++---------------- > 1 file changed, 28 insertions(+), 19 deletions(-) > - /* 3.1.1.3 ITS group node */ > + /* Table 12 ITS Group Format */ > 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, 3, 1); /* Revision */ Why 3? Shouldn't it be 1? > + build_append_int_noprefix(table_data, 0, 4); /* Identifier */ > 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 */ > @@ -374,19 +375,19 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) > int irq = vms->irqmap[VIRT_SMMU] + ARM_SPI_BASE; > > smmu_offset = table_data->len - table.table_offset; > - /* 3.1.1.2 SMMUv3 */ > + /* Table 9 SMMUv3 Format */ > 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, 3, 1); /* Revision */ And here 3 -> 4? > + build_append_int_noprefix(table_data, 1, 4); /* Identifier */ > 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, 1 /* COHACC Override */, 4); > build_append_int_noprefix(table_data, 0, 4); /* Reserved */ > build_append_int_noprefix(table_data, 0, 8); /* VATOS address */ > /* Model */ > @@ -395,35 +396,43 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) > 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_append_int_noprefix(table_data, 0, 4); /* Proximity domain */ > + /* DeviceID mapping index (ignored since interrupts are GSIV based) */ > + build_append_int_noprefix(table_data, 0, 4); > > /* output IORT node is the ITS group node (the first node) */ > build_iort_id_mapping(table_data, 0, 0xFFFF, IORT_NODE_OFFSET); > } Also, could the node identifier be a variable we increment?